From 79c31698b872823af1730b2f58f4f356110b109f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 1 Dec 2017 10:05:13 -0500
Subject: [PATCH] Carnix update

---
 nix/default.nix       | 2 +-
 nix/ofborg-carnix.nix | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index ee6c1e2..78eaa06 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -21,7 +21,7 @@ in import (hostpkgs.stdenv.mkDerivation {
       # with master merged in so it applies cleanly.
       url = "https://github.com/NixOS/nixpkgs/compare/master...grahamc:P-E-Meunier-mkRustCrate-rebased.patch";
       name = "mkRustCrate-rebased.patch";
-      sha256 = "1gji1lp948pr5ymcc6s8b0pvd5z42h5bjb3bihf51dpb9cjl6x2j";
+      sha256 = "09808bwcd3d5j2mnlzxq60g53rd07af7in1yfmpxvmi30sw4hi9b";
     })
 
   ];
diff --git a/nix/ofborg-carnix.nix b/nix/ofborg-carnix.nix
index 6deaf89..060fe44 100644
--- a/nix/ofborg-carnix.nix
+++ b/nix/ofborg-carnix.nix
@@ -1,4 +1,5 @@
-{ buildPlatform, buildRustCrate, fetchgit, ... }:
+# Generated by carnix 0.4.14: carnix ./../ofborg/Cargo.lock --output ./ofborg-carnix.nix
+{ buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
     advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
@@ -820,7 +821,7 @@ rec {
   };
   native_tls_0_1_4 = native_tls_0_1_4_ {
     dependencies = (if !(kernel == "windows" || kernel == "darwin") then [ openssl_0_9_20 ] else [])
-      ++ (if kernel == "darwin" then [ security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_5 ] else [])
+      ++ (if kernel == "darwin" then [ (security_framework_0_1_16.override { features = [ "OSX_10_8" ]; }) security_framework_sys_0_1_16 tempdir_0_3_5 ] else [])
       ++ (if kernel == "windows" then [ schannel_0_1_8 ] else []);
   };
   num_traits_0_1_40 = num_traits_0_1_40_ {};
@@ -874,10 +875,10 @@ rec {
     features = [ "std" ];
   };
   serde_derive_1_0_19 = serde_derive_1_0_19_ {
-    dependencies = [ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ];
+    dependencies = [ quote_0_3_15 serde_derive_internals_0_17_0 (syn_0_11_11.override { features = [ "visit" ]; }) ];
   };
   serde_derive_internals_0_17_0 = serde_derive_internals_0_17_0_ {
-    dependencies = [ syn_0_11_11 synom_0_11_3 ];
+    dependencies = [ (syn_0_11_11.override { features = [ "parsing" ]; }) synom_0_11_3 ];
   };
   serde_json_1_0_6 = serde_json_1_0_6_ {
     dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_19 ];