Skip to content

Commit 5b74152

Browse files
authored
Merge pull request #72 from cachix/bump-flake
deps: switch to 24.11
2 parents 68d20f1 + fc1a57b commit 5b74152

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
description = "All Python versions packages in Nix.";
33

44
inputs = {
5-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
66
flake-compat.url = "github:edolstra/flake-compat";
77
flake-compat.flake = false;
88
};
99

1010
nixConfig = {
11-
substituters = "https://cache.nixos.org https://nixpkgs-python.cachix.org";
11+
extra-substituters = "https://nixpkgs-python.cachix.org";
1212
extra-trusted-public-keys = "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU=";
1313
};
1414

@@ -161,7 +161,7 @@
161161
{ condition = version: versionInBetween version "3.7" "3.0";
162162
override = pkg: pkg.overrideAttrs (old: {
163163
prePatch = ''
164-
substituteInPlace Lib/subprocess.py --replace '"/bin/sh"' "'/bin/sh'"
164+
substituteInPlace Lib/subprocess.py --replace-fail '"/bin/sh"' "'/bin/sh'"
165165
'' + old.prePatch;
166166
});
167167
}
@@ -173,6 +173,12 @@
173173
''+ old.postInstall;
174174
});
175175
}
176+
# The patch for CVE-2025-0938 is available for 3.9+
177+
# https://www.cve.org/CVERecord?id=CVE-2025-0938
178+
# https://github.com/python/cpython/pull/129418
179+
{ condition = version: versionInBetween version "3.12" "2";
180+
override = filterOutPatch "CVE-2025-0938.patch";
181+
}
176182
];
177183
callPackage = pkgs.newScope {
178184
inherit python;

0 commit comments

Comments
 (0)