aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMihai Fufezan <[email protected]>2023-04-10 14:53:50 +0300
committerMihai Fufezan <[email protected]>2023-04-10 14:53:50 +0300
commit7faead75bd57b5d52572a6a46c9c38336b282fda (patch)
tree8953464588d0cdb9040b36b4c9b62bfe6e1fbfc2
parenta1b1480c21a3ca7c35fd5ab99c966322f64b2f3b (diff)
downloadHyprland-7faead75bd57b5d52572a6a46c9c38336b282fda.tar.gz
Hyprland-7faead75bd57b5d52572a6a46c9c38336b282fda.zip
nix: update xdph
workflows/nix-update: update all inputs
-rw-r--r--flake.lock6
-rwxr-xr-xnix/update-inputs.sh10
2 files changed, 8 insertions, 8 deletions
diff --git a/flake.lock b/flake.lock
index 451cbba5..f36be8b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -72,11 +72,11 @@
]
},
"locked": {
- "lastModified": 1681066882,
- "narHash": "sha256-8szxuwDOQcYyS8TZokGpIJYzaTwBQ9pmmcCkeuX2YV8=",
+ "lastModified": 1681127512,
+ "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "e48165c5637260cf2a88494a112269922dee58de",
+ "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97",
"type": "github"
},
"original": {
diff --git a/nix/update-inputs.sh b/nix/update-inputs.sh
index 91a835c2..f4b63f9c 100755
--- a/nix/update-inputs.sh
+++ b/nix/update-inputs.sh
@@ -5,17 +5,17 @@ set -ex
# get wlroots revision from submodule
SUB_REV=$(git submodule status | rg wlroots | awk '{ print substr($1,2)}')
# and from lockfile
-CRT_REV=$(jq < flake.lock '.nodes.wlroots.locked.rev' -r)
+CRT_REV=$(jq <flake.lock '.nodes.wlroots.locked.rev' -r)
-if [ $SUB_REV != $CRT_REV ]; then
- # update nixpkgs to latest version
- nix flake lock --update-input nixpkgs
+if [ "$SUB_REV" != "$CRT_REV" ]; then
+ # update inputs to latest versions
+ nix flake update
# update wlroots to submodule revision
nix flake lock --override-input wlroots "gitlab:wlroots/wlroots/$SUB_REV?host=gitlab.freedesktop.org"
# remove "dirty" mark from lockfile
- jq < flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock
+ jq <flake.lock 'del(.nodes.wlroots.original.rev)' | sponge flake.lock
else
echo "wlroots is up to date!"
fi