cargo: fix LibreSSL compatibility

NixOS · Mar 21, 2017 · 07fbef0 · 07fbef0
1 parent 9c92613
commit 07fbef0
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 0 deletions.
diff --git a/pkgs/development/compilers/rust/cargo-libressl.patch b/pkgs/development/compilers/rust/cargo-libressl.patch
@@ -0,0 +1,95 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 00e9d28..b22e9c1 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -23,7 +23,7 @@ dependencies = [
+  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-serialize 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -119,7 +119,7 @@ dependencies = [
+  "curl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+@@ -131,7 +131,7 @@ dependencies = [
+  "gcc 0.3.39 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -206,7 +206,7 @@ dependencies = [
+  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libgit2-sys 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+@@ -275,7 +275,7 @@ dependencies = [
+  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libssh2-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+@@ -287,7 +287,7 @@ dependencies = [
+  "cmake 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+@@ -427,13 +427,13 @@ dependencies = [
+
+ [[package]]
+ name = "openssl"
+-version = "0.9.1"
++version = "0.9.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+ [[package]]
+@@ -443,7 +443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+
+ [[package]]
+ name = "openssl-sys"
+-version = "0.9.1"
++version = "0.9.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -666,9 +666,9 @@ dependencies = [
+ "checksum num-rational 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "54ff603b8334a72fbb27fe66948aac0abaaa40231b3cecd189e76162f6f38aaf"
+ "checksum num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a16a42856a256b39c6d3484f097f6713e14feacd9bfb02290917904fae46c81c"
+ "checksum num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad"
+-"checksum openssl 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb2a714828f5528e4a24a07c296539216f412364844d61fe1161f94558455d4"
++"checksum openssl 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6574ee213eef2c839252c5d2ca11090516287085bec625d3bbaca654757eb655"
+ "checksum openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919"
+-"checksum openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95e9fb08acc32509fac299d6e5f4932e1e055bb70d764282c3ed8beaa87ab0e9"
++"checksum openssl-sys 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5e23374cdaca202b655937ff6d1ad6887edc391d9ff371f3f48350c3e9fad001"
+ "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa"
+ "checksum psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478"
+ "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5"
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
@@ -29,6 +29,10 @@ rec {
     srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya";
     depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq";
 
+    patches = [
+      ./cargo-libressl.patch
+    ];
+
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
   };