Skip to content

Commit 77ca080

Browse files
committed
python310: drop
Reaches end of life before NixOS 26.05 and therefore has to leave early.
1 parent b122cf0 commit 77ca080

18 files changed

Lines changed: 8 additions & 530 deletions

File tree

doc/languages-frameworks/python.section.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ sets are
5050

5151
* `pkgs.python27Packages`
5252
* `pkgs.python3Packages`
53-
* `pkgs.python310Packages`
5453
* `pkgs.python311Packages`
5554
* `pkgs.python312Packages`
5655
* `pkgs.python313Packages`
@@ -897,7 +896,7 @@ on NixOS.
897896
# ...
898897
899898
environment.systemPackages = with pkgs; [
900-
(python310.withPackages (
899+
(python314.withPackages (
901900
ps: with ps; [
902901
numpy
903902
toolz
@@ -1683,7 +1682,7 @@ with import <nixpkgs> { };
16831682
});
16841683
};
16851684
in
1686-
pkgs.python310.override { inherit packageOverrides; };
1685+
pkgs.python313.override { inherit packageOverrides; };
16871686
16881687
in
16891688
python.withPackages (ps: [ ps.pandas ])
@@ -1707,7 +1706,7 @@ with import <nixpkgs> { };
17071706
let
17081707
packageOverrides = self: super: { scipy = super.scipy_0_17; };
17091708
in
1710-
(pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
1709+
(pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])
17111710
).env
17121711
```
17131712

@@ -1723,13 +1722,13 @@ let
17231722
newpkgs = import pkgs.path {
17241723
overlays = [
17251724
(self: super: {
1726-
python310 =
1725+
python313 =
17271726
let
17281727
packageOverrides = python-self: python-super: {
17291728
numpy = python-super.numpy_1_18;
17301729
};
17311730
in
1732-
super.python310.override { inherit packageOverrides; };
1731+
super.python313.override { inherit packageOverrides; };
17331732
})
17341733
];
17351734
};

nixos/modules/services/security/pass-secret-service.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ in
1212
enable = lib.mkEnableOption "pass secret service";
1313

1414
package = lib.mkPackageOption pkgs "pass-secret-service" {
15-
example = "pass-secret-service.override { python3 = pkgs.python310 }";
15+
example = "pass-secret-service.override { python3 = pkgs.python315 }";
1616
};
1717
};
1818

pkgs/applications/science/math/caffe/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ stdenv.mkDerivation rec {
175175
homepage = "http://caffe.berkeleyvision.org/";
176176
maintainers = [ ];
177177
broken =
178-
(pythonSupport && (python.isPy310))
179-
|| !(leveldbSupport -> (leveldb != null && snappy != null))
178+
!(leveldbSupport -> (leveldb != null && snappy != null))
180179
|| !(pythonSupport -> (python != null && numpy != null));
181180
license = lib.licenses.bsd2;
182181
platforms = lib.platforms.linux ++ lib.platforms.darwin;

pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch

Lines changed: 0 additions & 52 deletions
This file was deleted.

pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch

Lines changed: 0 additions & 248 deletions
This file was deleted.

0 commit comments

Comments
 (0)