From 02aa44936d3f0c35bb137385220e4009cff59f6f Mon Sep 17 00:00:00 2001 From: Fishhh Date: Sun, 25 Jun 2023 14:53:33 +0200 Subject: [PATCH] [nix] Add supported python versions --- flake.lock | 6 +++--- flake.nix | 2 +- nix/module/worker.nix | 2 +- nix/module/workersd.nix | 2 +- nix/package.nix | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 04e672c..f3f1099 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1685816707, - "narHash": "sha256-rvcjyhVXvtnLpLS4k7UJGNQPLrzLAFWfICfTofRXIJw=", + "lastModified": 1687695527, + "narHash": "sha256-+ySQP5G88pQcAyE3Q+c4uf45dHkAX2V6AmhF0NZAbh8=", "owner": "Stowarzyszenie-Talent", "repo": "filetracker", - "rev": "62dad844ffd632fa4008e9574dfcef6f308611a7", + "rev": "d1e0680464e997f73fe4a69cf5995447ed0b4bec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 01c23ac..1eb25f9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ }) ]; - sioworkers = with final.python38Packages; toPythonApplication sioworkers; + sioworkers = with final.python310Packages; toPythonApplication sioworkers; }; nixosModules.default = { diff --git a/nix/module/worker.nix b/nix/module/worker.nix index 6898fa2..5663083 100644 --- a/nix/module/worker.nix +++ b/nix/module/worker.nix @@ -5,7 +5,7 @@ enable = lib.mkEnableOption "sioworker"; package = lib.mkPackageOption pkgs "sioworkers" { - default = [ "python38Packages" "sioworkers" ]; + default = [ "python310Packages" "sioworkers" ]; }; filetrackerUrl = lib.mkOption { diff --git a/nix/module/workersd.nix b/nix/module/workersd.nix index 0c7211a..05e2ad5 100644 --- a/nix/module/workersd.nix +++ b/nix/module/workersd.nix @@ -5,7 +5,7 @@ enable = lib.mkEnableOption "sioworkersd"; package = lib.mkPackageOption pkgs "sioworkers" { - default = [ "python38Packages" "sioworkers" ]; + default = [ "python310Packages" "sioworkers" ]; }; taskMemoryLimit = lib.mkOption { diff --git a/nix/package.nix b/nix/package.nix index 59961c0..cc76841 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -2,6 +2,8 @@ , stdenv , lib , buildPythonPackage +, pythonAtLeast +, pythonOlder , six , filetracker @@ -21,6 +23,7 @@ buildPythonPackage { pname = "sioworkers"; version = "1.0"; + disabled = pythonAtLeast "3.11" || pythonOlder "3.9"; src = builtins.path { path = ./..;