From 82fe6937dc1aaef2743b1383738361bbf03554e3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 15:00:05 -0300 Subject: [PATCH 1/2] boehmgc: migrate to by-name --- .../boehm-gc/default.nix => by-name/bo/boehmgc/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 deletions(-) rename pkgs/{development/libraries/boehm-gc/default.nix => by-name/bo/boehmgc/package.nix} (100%) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/by-name/bo/boehmgc/package.nix similarity index 100% rename from pkgs/development/libraries/boehm-gc/default.nix rename to pkgs/by-name/bo/boehmgc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4afdec98f3..dae70c939747 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20511,9 +20511,6 @@ with pkgs; then pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries else callPackage ../os-specific/linux/bionic-prebuilt { }; - - boehmgc = callPackage ../development/libraries/boehm-gc { }; - boolstuff = callPackage ../development/libraries/boolstuff { }; inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) From b11d7881e3cdbd9fc14a8b06f1b61b309781279a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 14:58:20 -0300 Subject: [PATCH 2/2] boehmgc: get rid of nested with --- pkgs/by-name/bo/boehmgc/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index 6da88ee8258f..4402b3af57bf 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = nixVersions; - meta = with lib; { + meta = { homepage = "https://hboehm.info/gc/"; description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; longDescription = '' @@ -76,10 +76,9 @@ stdenv.mkDerivation (finalAttrs: { Alternatively, the garbage collector may be used as a leak detector for 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"; - license = "https://hboehm.info/gc/license.txt"; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = "https://hboehm.info/gc/license.txt"; # non-copyleft, X11-style license + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; })