about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-04-04 23:05:25 +0200
committerFlorian Klink <flokli@flokli.de>2020-04-04 23:22:09 +0200
commit1eae7fb887413d9cc50b292eade8b9c9a03c73bd (patch)
tree122630b39ce526215e171e34d0cc8f9f7badf1b8
parent90e09e1f0f003960f3feb28f67873774df8b0921 (diff)
downloadnixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.tar
nixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.tar.gz
nixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.tar.bz2
nixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.tar.lz
nixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.tar.xz
nixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.tar.zst
nixlib-1eae7fb887413d9cc50b292eade8b9c9a03c73bd.zip
Revert "Revert "rust-cbindgen: 0.13.1 -> 0.13.2""
This reverts commit 09dde57e93d010b786eed4796d53f34a6c6e3891.

Apparently, the rust-cbindgen bump wasn't the cause for the firefox
build error reported in https://github.com/NixOS/nixpkgs/pull/83247
(we could reproduce the build error even after
09dde57e93d010b786eed4796d53f34a6c6e3891 applied).

For some reason it must have succeeded on hydra, as it's in the cache,
tricking us in believing 76458f89f47b1b8b2db1e6272f56d3919ce682d0 broke
it initially.

So the build seems flaky of some sort - we haven't yet determined
whether it's luck, compiling with the right CPUs or something else. :-/

There's still some investigation to be done
(https://github.com/NixOS/nixpkgs/issues/84283), but no need to keep an
ineffective revert around.
-rw-r--r--pkgs/development/tools/rust/cbindgen/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 34d744807463..87e8e081a931 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-cbindgen";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "eqrion";
     repo = "cbindgen";
     rev = "v${version}";
-    sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0";
+    sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam";
   };
 
-  cargoSha256 = "13fbahdih5whll09pfgyb1bjag1f0d0xfwgm2s342bs1krxsrbh3";
+  cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A project for generating C bindings from Rust code";
-    homepage = https://github.com/eqrion/cbindgen;
+    homepage = "https://github.com/eqrion/cbindgen";
     license = licenses.mpl20;
     maintainers = with maintainers; [ jtojnar andir ];
   };