Merge pull request #292127 from atorres1985-contrib/boehmgc

boehmgc: migrate to by-name
This commit is contained in:
Weijia Wang 2024-03-08 20:19:53 +01:00 committed by GitHub
commit 66b5ec6e7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions

View File

@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = nixVersions; passthru.tests = nixVersions;
meta = with lib; { meta = {
homepage = "https://hboehm.info/gc/"; homepage = "https://hboehm.info/gc/";
description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
longDescription = '' longDescription = ''
@ -76,10 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
Alternatively, the garbage collector may be used as a leak detector for Alternatively, the garbage collector may be used as a leak detector for
C or C++ programs, though that is not its primary goal. C or C++ programs, though that is not its primary goal.
''; '';
# non-copyleft, X11-style license
changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog"; changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog";
license = "https://hboehm.info/gc/license.txt"; license = "https://hboehm.info/gc/license.txt"; # non-copyleft, X11-style license
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = platforms.all; platforms = lib.platforms.all;
}; };
}) })

View File

@ -20478,9 +20478,6 @@ with pkgs;
then pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries then pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries
else callPackage ../os-specific/linux/bionic-prebuilt { }; else callPackage ../os-specific/linux/bionic-prebuilt { };
boehmgc = callPackage ../development/libraries/boehm-gc { };
boolstuff = callPackage ../development/libraries/boolstuff { }; boolstuff = callPackage ../development/libraries/boolstuff { };
inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })