diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2022-08-30 09:39:09 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2022-08-30 12:40:16 +0300 |
| commit | 992773b898176baeb4934e90718ed3c61f7e4674 (patch) | |
| tree | 9a1ed5a9304214766b19f6a682dfe014f336fbf2 | |
| parent | 5b76ccbfc320b305e7500cbd56e034ed6ba233a3 (diff) | |
| download | nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.tar nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.tar.gz nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.tar.bz2 nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.tar.lz nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.tar.xz nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.tar.zst nixpkgs-992773b898176baeb4934e90718ed3c61f7e4674.zip | |
boehmgc: 8.0.6 -> 8.2.2
https://github.com/ivmai/bdwgc/releases/tag/v8.2.2 Drop mcfgthread.patch (upstreamed).
| -rw-r--r-- | pkgs/development/libraries/boehm-gc/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/boehm-gc/mcfgthread.patch | 11 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1e74ddfc721..2e1c0010f51 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true , nixVersions @@ -10,22 +10,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; - version = "8.0.6"; + version = "8.2.2"; src = fetchurl { urls = [ - "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" + # "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${finalAttrs.version}/gc-${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-O0kUq8n6dlk1lnc+TaZx1+1NU5Dj1G+/Ll8VXhIb6hE="; + sha256 = "sha256-8wEHvLBi4JIKeQ//+lbZUSNIVGhZNkwjoUviZLOINqA="; }; outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - # boehm-gc whitelists GCC threading models - patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; - configureFlags = [ "--enable-cplusplus" "--with-libatomic-ops=none" @@ -33,8 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMmap "--enable-mmap" ++ lib.optional enableLargeConfig "--enable-large-config"; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boehm-gc/mcfgthread.patch b/pkgs/development/libraries/boehm-gc/mcfgthread.patch deleted file mode 100644 index c4aa996aebd..00000000000 --- a/pkgs/development/libraries/boehm-gc/mcfgthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -277,7 +277,7 @@ case "$THREADS" in - ;; - esac - ;; -- win32) -+ win32 | mcf) - AC_DEFINE(GC_THREADS) - use_parallel_mark=$enable_parallel_mark - if test "${enable_parallel_mark}" != no \ |