mirror of
https://github.com/kittywitch/konawall-py.git
synced 2026-02-09 04:19:19 -08:00
feat: move to python3.11
This commit is contained in:
parent
734bc56e7d
commit
936050d035
4 changed files with 11 additions and 11 deletions
12
flake.lock
generated
12
flake.lock
generated
|
|
@ -5,11 +5,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -20,11 +20,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699099776,
|
"lastModified": 1720542800,
|
||||||
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
|
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
|
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
packages = rec {
|
packages = rec {
|
||||||
konawall-py = pkgs.python3.pkgs.callPackage ./package.nix {};
|
konawall-py = pkgs.python311.pkgs.callPackage ./package.nix {};
|
||||||
default = konawall-py;
|
default = konawall-py;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
python312Packages,
|
python311Packages,
|
||||||
psmisc,
|
psmisc,
|
||||||
gobject-introspection,
|
gobject-introspection,
|
||||||
gtk3,
|
gtk3,
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
|
pyproject = builtins.fromTOML (builtins.readFile ./pyproject.toml);
|
||||||
poetryBlock = pyproject.tool.poetry;
|
poetryBlock = pyproject.tool.poetry;
|
||||||
dependencyReplacements = {
|
dependencyReplacements = {
|
||||||
wxpython = python312Packages.wxPython_4_2;
|
wxpython = python311Packages.wxPython_4_2;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
|
@ -29,7 +29,7 @@ in
|
||||||
|
|
||||||
propagatedBuildInputs = let
|
propagatedBuildInputs = let
|
||||||
dependencyNames = (lib.attrNames poetryBlock.dependencies) ++ ["setuptools" "pygobject3" "pystray" "dbus-python"];
|
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
|
in
|
||||||
dependencies ++ [
|
dependencies ++ [
|
||||||
psmisc
|
psmisc
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ packages = [
|
||||||
gui = "konawall.gui:main"
|
gui = "konawall.gui:main"
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.12"
|
python = "^3.11"
|
||||||
pillow = "^10.0.1"
|
pillow = "^10.0.1"
|
||||||
screeninfo = "^0.8.1"
|
screeninfo = "^0.8.1"
|
||||||
requests = "^2.31.0"
|
requests = "^2.31.0"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue