diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 18:00:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-09 18:00:56 +0000 |
commit | e112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (patch) | |
tree | cfbfa6683968f4f673f45c5ca8b4d6b43bcef225 /pkgs/tools/package-management | |
parent | c17ba56fe923f649d8802777c586f61f8b8c4ad0 (diff) | |
parent | ab5d8762780613cc7f99132ba29f8e6ef950178e (diff) | |
download | nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.gz nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.bz2 nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.lz nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.xz nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.zst nixlib-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/clib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 229c63ab7744..4ecd812ddc2a 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "2.8.3"; + version = "2.8.5"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "sha256-Ld6u+F25SOyYr+JWXVmn5G8grQ39eN8EY7j77WNycEE="; + sha256 = "sha256-znvqxZWkQndxE6s36c77whUPc1UokrofTApFSIKFOtM="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1aab6b3353ea..0b80cd531d43 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -203,7 +203,7 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_17; + stable = self.nix_2_18; unstable = self.nix_2_18; } // lib.optionalAttrs config.allowAliases { |