diff options
Diffstat (limited to 'pkgs/tools/package-management')
4 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 4a460adfd0ff..4800a6641bd0 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-NbADp017wL6h+Owg/GISidoXEq0seWaa98/Hyyq6pYc="; + sha256 = "sha256-gO7Yf60eabvAdPDSzxvxeEMsvc6ixy1iQ6/o7WWlE2Q="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/pkgs/tools/package-management/libcomps/default.nix b/pkgs/tools/package-management/libcomps/default.nix index 89c2982497df..2a1136034d21 100644 --- a/pkgs/tools/package-management/libcomps/default.nix +++ b/pkgs/tools/package-management/libcomps/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libcomps"; - version = "0.1.20"; + version = "0.1.21"; outputs = [ "out" "dev" "py" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "libcomps"; rev = version; - hash = "sha256-IX4du1+G7lwWrGnllydnBDap2aqK5pzos1Mdyu4MzOU="; + hash = "sha256-2ZxU1g5HDWnSxTabnmfyQwz1ZCXK+7kJXLofeFBiwn0="; }; patches = [ diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index d0840d206b67..19080e22ed3d 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -42,6 +42,7 @@ in , docbook5 , editline , flex +, git , gnutar , gtest , gzip @@ -54,6 +55,7 @@ in , libxml2 , libxslt , lowdown +, man , mdbook , mdbook-linkcheck , nlohmann_json @@ -142,6 +144,11 @@ self = stdenv.mkDerivation { aws-sdk-cpp ]; + installCheckInputs = lib.optionals atLeast221 [ + git + man + ]; + propagatedBuildInputs = [ boehmgc ] ++ lib.optionals (atLeast27) [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 92c988ea5d08..f5f2b81f6532 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -263,6 +263,11 @@ in lib.makeExtensible (self: ({ hash = "sha256-bfFe38BkoQws7om4gBtBWoNTLkt9piMXdLLoHYl+vBQ="; }; + nix_2_21 = common { + version = "2.21.0"; + hash = "sha256-9b9qJ+7rGjLKbIswMf0/2pgUWH/xOlYLk7P4WYNcGDs="; + }; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available @@ -282,7 +287,7 @@ in lib.makeExtensible (self: ({ stable = addFallbackPathsCheck self.nix_2_18; - unstable = self.nix_2_20; + unstable = self.nix_2_21; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; |