aboutsummaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-12-23 23:20:48 +0100
committerGitHub <noreply@github.com>2022-12-23 23:20:48 +0100
commit3dbf9b5af5950b615ec685c1f4155b1c8698bb78 (patch)
treeafa43f5461b240e4bbdcee788a8afa8640a2b312 /flake.nix
parent14f7dae3e4eb0c34192d0077383a7f2a2d630129 (diff)
parent1c40182b12d5fd462c891b597e1a3f9b912502d5 (diff)
Merge pull request #7367 from lheckemann/nixpkgs-22.11
Bump nixpkgs to 22.11
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix14
1 files changed, 5 insertions, 9 deletions
diff --git a/flake.nix b/flake.nix
index 4ba3f04b0..652695989 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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