From 9b475d6b334ead394b368c0030adfbcd4d5974ef Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 15 Nov 2023 11:13:11 -0800 Subject: [PATCH] Fix workaround for konawall-py lockfile --- flake.lock | 6 ++--- home/environments/darwin/konawall.nix | 37 --------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index dc5eab95..107e29da 100644 --- a/flake.lock +++ b/flake.lock @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1699822607, - "narHash": "sha256-sr1Dm+A5vc54zWLehp1IQujP8oL3y0kMWyiYCFBAe/Q=", + "lastModified": 1700075394, + "narHash": "sha256-LKPbXdmQNM+NtxVYEd0SFb7gti0p3l9WDjDsDbccjUQ=", "owner": "kittywitch", "repo": "konawall-py", - "rev": "4a18fa633718d243da65fbf8d4bd4a5227b55d44", + "rev": "bfb74c7acacaff5024ba2b107bd8775e516f84db", "type": "github" }, "original": { diff --git a/home/environments/darwin/konawall.nix b/home/environments/darwin/konawall.nix index 180ac0b7..ef6145da 100644 --- a/home/environments/darwin/konawall.nix +++ b/home/environments/darwin/konawall.nix @@ -24,37 +24,6 @@ in { launchd.agents.konawall = { enable = true; config = let - replacementPyProject = '' - [tool.poetry] - name = "konawall" - version = "0.1.0" - license = "MIT" - description = "A hopefully cross-platform service for fetching wallpapers and setting them" - authors = [ - "Kat Inskip " - ] - readme = "README.MD" - packages = [ - {include = "konawall"} - ] - - [tool.poetry.scripts] - gui = "konawall.gui:main" - - [tool.poetry.dependencies] - python = "^3.11" - pillow = "^10.0.1" - screeninfo = "^0.8.1" - requests = "^2.31.0" - termcolor = "^2.3.0" - wxpython = "^4.2.1" - humanfriendly = "^10.0" - xdg-base-dirs = "^6.0.1" - - [build-system] - requires = [ "poetry-core" ] - build-backend = "poetry.core.masonry.api" - ''; konawallInitialize = pkgs.writeScriptBin "konawall-initialize" '' #!/usr/bin/env bash set -xeuo pipefail @@ -64,13 +33,7 @@ in { ${pkgs.coreutils}/bin/cp -r --no-preserve=mode,ownership "${inputs.konawall-py.outPath}" "$tmpDir/konawall" # change directory to the copy cd $tmpDir/konawall - # overwrite the pyproject.toml with the one that we want - # use a EOF heredoc to avoid escaping the quotes - cat < pyproject.toml - ${replacementPyProject} - EOF # install the dependencies - ${pkgs.poetry}/bin/poetry lock --no-update ${pkgs.poetry}/bin/poetry install # run the package ${pkgs.poetry}/bin/poetry run gui