diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-01-13 16:12:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-13 16:12:38 +0000 |
commit | 302dfcd7d900fac165f54682462fbb97a7ab9c81 (patch) | |
tree | 65b63bfb984bdca7da7a5d5f9533b41a64668301 | |
parent | efc17cbd2189b24163e89a28b8cd24f7bbd31045 (diff) | |
parent | c4e9e4a4d696bfe5225c9360a4a8616136cf9ec1 (diff) | |
download | nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.tar nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.tar.gz nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.tar.bz2 nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.tar.lz nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.tar.xz nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.tar.zst nixlib-302dfcd7d900fac165f54682462fbb97a7ab9c81.zip |
Merge pull request #33810 from dtzWill/update/boehmgc
boehm-gc, libatomic_ops: 7.6.0 -> 7.6.2
-rw-r--r-- | pkgs/development/libraries/boehm-gc/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/libatomic_ops/default.nix | 4 |
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 421d7072397b..35ea5471dbeb 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 eedc0993d736..3aae754be405 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 ]; |