1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00

Merge remote-tracking branch 'origin/master' into lazy-trees

This commit is contained in:
Eelco Dolstra 2023-01-11 13:26:20 +01:00
commit 29dff7e24e
108 changed files with 2107 additions and 1363 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
@ -132,13 +132,9 @@
});
propagatedDeps =
[ ((boehmgc.override {
[ (boehmgc.override {
enableLargeConfig = true;
}).overrideAttrs(o: {
patches = (o.patches or []) ++ [
./boehmgc-coroutine-sp-fallback.diff
];
}))
})
nlohmann_json
];
};
@ -369,7 +365,7 @@
buildInputs =
[ nix
(curl.override { patchNetrcRegression = true; })
curl
bzip2
xz
pkgs.perl