From 936050d035788198b9c7d7e44b3acceb3d18e35a Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sat, 13 Jul 2024 10:55:07 -0700 Subject: [PATCH] feat: move to python3.11 --- flake.lock | 12 ++++++------ flake.nix | 2 +- package.nix | 6 +++--- pyproject.toml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index d90ffc9..9eadad2 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bd6fc83..71a9741 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ pkgs = nixpkgs.legacyPackages.${system}; in { packages = rec { - konawall-py = pkgs.python3.pkgs.callPackage ./package.nix {}; + konawall-py = pkgs.python311.pkgs.callPackage ./package.nix {}; default = konawall-py; }; }); diff --git a/package.nix b/package.nix index fd6b1ee..f99afe6 100644 --- a/package.nix +++ b/package.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - python312Packages, + python311Packages, psmisc, gobject-introspection, gtk3, @@ -11,7 +11,7 @@ pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml); poetryBlock = pyproject.tool.poetry; dependencyReplacements = { - wxpython = python312Packages.wxPython_4_2; + wxpython = python311Packages.wxPython_4_2; }; in buildPythonPackage rec { @@ -29,7 +29,7 @@ in propagatedBuildInputs = let dependencyNames = (lib.attrNames poetryBlock.dependencies) ++ ["setuptools" "pygobject3" "pystray" "dbus-python"]; - dependencies = map (name: python312Packages.${name} or dependencyReplacements.${name}) dependencyNames; + dependencies = map (name: python311Packages.${name} or dependencyReplacements.${name}) dependencyNames; in dependencies ++ [ psmisc diff --git a/pyproject.toml b/pyproject.toml index cb5ca1d..a8c373f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ packages = [ gui = "konawall.gui:main" [tool.poetry.dependencies] -python = "^3.12" +python = "^3.11" pillow = "^10.0.1" screeninfo = "^0.8.1" requests = "^2.31.0"