Fix workaround for konawall-py lockfile

This commit is contained in:
Kat Inskip 2023-11-15 11:13:11 -08:00
parent bc61d82487
commit 9b475d6b33
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
2 changed files with 3 additions and 40 deletions

6
flake.lock generated
View file

@ -218,11 +218,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699822607, "lastModified": 1700075394,
"narHash": "sha256-sr1Dm+A5vc54zWLehp1IQujP8oL3y0kMWyiYCFBAe/Q=", "narHash": "sha256-LKPbXdmQNM+NtxVYEd0SFb7gti0p3l9WDjDsDbccjUQ=",
"owner": "kittywitch", "owner": "kittywitch",
"repo": "konawall-py", "repo": "konawall-py",
"rev": "4a18fa633718d243da65fbf8d4bd4a5227b55d44", "rev": "bfb74c7acacaff5024ba2b107bd8775e516f84db",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -24,37 +24,6 @@ in {
launchd.agents.konawall = { launchd.agents.konawall = {
enable = true; enable = true;
config = let 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 <kat@inskip.me>"
]
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" '' konawallInitialize = pkgs.writeScriptBin "konawall-initialize" ''
#!/usr/bin/env bash #!/usr/bin/env bash
set -xeuo pipefail set -xeuo pipefail
@ -64,13 +33,7 @@ in {
${pkgs.coreutils}/bin/cp -r --no-preserve=mode,ownership "${inputs.konawall-py.outPath}" "$tmpDir/konawall" ${pkgs.coreutils}/bin/cp -r --no-preserve=mode,ownership "${inputs.konawall-py.outPath}" "$tmpDir/konawall"
# change directory to the copy # change directory to the copy
cd $tmpDir/konawall cd $tmpDir/konawall
# overwrite the pyproject.toml with the one that we want
# use a EOF heredoc to avoid escaping the quotes
cat <<EOF > pyproject.toml
${replacementPyProject}
EOF
# install the dependencies # install the dependencies
${pkgs.poetry}/bin/poetry lock --no-update
${pkgs.poetry}/bin/poetry install ${pkgs.poetry}/bin/poetry install
# run the package # run the package
${pkgs.poetry}/bin/poetry run gui ${pkgs.poetry}/bin/poetry run gui