Unverified Commit 500ef827 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

python310: drop (#490538)

parents 91e18d3c 8ea6bde8

doc/languages-frameworks/python.section.md

+5 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ sets are 


* `pkgs.python27Packages`

* `pkgs.python3Packages`

* `pkgs.python310Packages`

* `pkgs.python311Packages`

* `pkgs.python312Packages`

* `pkgs.python313Packages`
@@ -897,7 +896,7 @@ on NixOS. 
  # ...



  environment.systemPackages = with pkgs; [

    (python310.withPackages (

    (python314.withPackages (

      ps: with ps; [

        numpy

        toolz
@@ -1683,7 +1682,7 @@ with import <nixpkgs> { }; 
          });

        };

      in

      pkgs.python310.override { inherit packageOverrides; };

      pkgs.python313.override { inherit packageOverrides; };



  in

  python.withPackages (ps: [ ps.pandas ])
@@ -1707,7 +1706,7 @@ with import <nixpkgs> { }; 
  let

    packageOverrides = self: super: { scipy = super.scipy_0_17; };

  in

  (pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])

  (pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ])

).env

```
@@ -1723,13 +1722,13 @@ let 
  newpkgs = import pkgs.path {

    overlays = [

      (self: super: {

        python310 =

        python313 =

          let

            packageOverrides = python-self: python-super: {

              numpy = python-super.numpy_1_18;

            };

          in

          super.python310.override { inherit packageOverrides; };

          super.python313.override { inherit packageOverrides; };

      })

    ];

  };

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ in 
    enable = lib.mkEnableOption "pass secret service";



    package = lib.mkPackageOption pkgs "pass-secret-service" {

      example = "pass-secret-service.override { python3 = pkgs.python310 }";

      example = "pass-secret-service.override { python3 = pkgs.python315 }";

    };

  };

pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix

+20 −24
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ 
let

  version = "3.2.2";



  dependencies =

    with python3.pkgs;

    [

  dependencies = with python3.pkgs; [

    pyembroidery

    inkex

    wxpython
@@ -29,9 +27,7 @@ let 
    scipy

    diskcache

    flask-cors

    ]

    # Inkstitch uses the builtin tomllib instead when Python >=3.11

    ++ lib.optional (pythonOlder "3.11") tomli;

  ];

  pyEnv = python3.withPackages (_: dependencies);

in

python3.pkgs.buildPythonApplication {

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

+1 −2
Original line number Diff line number Diff line
@@ -175,8 +175,7 @@ stdenv.mkDerivation rec { 
    homepage = "http://caffe.berkeleyvision.org/";

    maintainers = [ ];

    broken =

      (pythonSupport && (python.isPy310))

      || !(leveldbSupport -> (leveldb != null && snappy != null))

      !(leveldbSupport -> (leveldb != null && snappy != null))

      || !(pythonSupport -> (python != null && numpy != null));

    license = lib.licenses.bsd2;

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

pkgs/by-name/au/autosuspend/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { 
  version = "9.0.1";

  pyproject = true;



  disabled = python3.pythonOlder "3.11";



  src = fetchFromGitHub {

    owner = "languitar";

    repo = "autosuspend";