1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00

Merge pull request #7367 from lheckemann/nixpkgs-22.11

Bump nixpkgs to 22.11
This commit is contained in:
Eelco Dolstra 2022-12-23 23:20:48 +01:00 committed by GitHub
commit 3dbf9b5af5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 90 deletions

View file

@ -1,7 +1,7 @@
{
description = "The purely functional package manager";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05-small";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small";
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
@ -108,7 +108,7 @@
++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];
buildDeps =
[ (curl.override { patchNetrcRegression = true; })
[ curl
bzip2 xz brotli editline
openssl sqlite
libarchive
@ -127,13 +127,9 @@
});
propagatedDeps =
[ ((boehmgc.override {
[ (boehmgc.override {
enableLargeConfig = true;
}).overrideAttrs(o: {
patches = (o.patches or []) ++ [
./boehmgc-coroutine-sp-fallback.diff
];
}))
})
nlohmann_json
];
};
@ -364,7 +360,7 @@
buildInputs =
[ nix
(curl.override { patchNetrcRegression = true; })
curl
bzip2
xz
pkgs.perl