summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2017-12-26 18:03:12 -0600
committerWill Dietz <w@wdtz.org>2018-01-13 09:33:14 -0600
commitc4e9e4a4d696bfe5225c9360a4a8616136cf9ec1 (patch)
tree65b63bfb984bdca7da7a5d5f9533b41a64668301
parentefc17cbd2189b24163e89a28b8cd24f7bbd31045 (diff)
downloadnixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.tar
nixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.tar.gz
nixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.tar.bz2
nixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.tar.lz
nixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.tar.xz
nixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.tar.zst
nixpkgs-c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1.zip
boehm-gc, libatomic_ops: 7.6.0 -> 7.6.2
These should be the same version.
-rw-r--r--pkgs/development/libraries/boehm-gc/default.nix16
-rw-r--r--pkgs/development/libraries/libatomic_ops/default.nix4
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 421d7072397..35ea5471dbe 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -3,11 +3,15 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "boehm-gc-7.6.0";
+  name = "boehm-gc-${version}";
+  version = "7.6.2";
 
   src = fetchurl {
-    url = http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz;
-    sha256 = "143x7g0d0k6250ai6m2x3l4y352mzizi4wbgrmahxscv2aqjhjm1";
+    urls = [
+      "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
+      "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
+    ];
+    sha256 = "07nli9hgdzc09qzw169sn7gchkrn5kqgyniv2rspcy1xaq2j04dx";
   };
 
   buildInputs = [ libatomic_ops ];
@@ -25,12 +29,6 @@ stdenv.mkDerivation rec {
   # Don't run the native `strip' when cross-compiling.
   dontStrip = hostPlatform != buildPlatform;
 
-  postInstall =
-    ''
-      mkdir -p $out/share/doc
-      mv $out/share/gc $out/share/doc/gc
-    '';
-
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index eedc0993d73..3aae754be40 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "libatomic_ops-${version}";
-  version = "7.6.0";
+  version = "7.6.2";
 
   src = fetchurl {
     urls = [
       "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
       "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
     ];
-    sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f";
+    sha256 ="1rif2hjscq5mh639nsnjhb90c01gnmy1sbmj6x6hsn1xmpnj95r1";
   };
 
   nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];