merge main #11

Merged
Zacharias-Brohn merged 10 commits from main into settingsWindow 2026-02-23 18:16:25 +01:00
2 changed files with 10 additions and 9 deletions
Showing only changes of commit 0cefee8e4f - Show all commits
Generated
+7 -7
View File
@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770197578, "lastModified": 1771369470,
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769593411, "lastModified": 1770693276,
"narHash": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=", "narHash": "sha256-ngXnN5YXu+f45+QGYNN/VEBMQmcBCYGRCqwaK8cxY1s=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a", "rev": "dacfa9de829ac7cb173825f593236bf2c21f637e",
"revCount": 732, "revCount": 735,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
+3 -2
View File
@@ -1,5 +1,6 @@
{ {
python3, python3,
installShellFiles,
}: }:
python3.pkgs.buildPythonApplication { python3.pkgs.buildPythonApplication {
pname = "zshell-cli"; pname = "zshell-cli";
@@ -17,9 +18,9 @@ python3.pkgs.buildPythonApplication {
pillow pillow
]; ];
pythonImportsCheck = [ "zshell" ]; pythonImportsCheck = ["zshell"];
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [installShellFiles];
SETUPTOOLS_SCM_PRETEND_VERSION = 1; SETUPTOOLS_SCM_PRETEND_VERSION = 1;
} }