hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 16:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

CI: update scripts

Browse source
This commit is contained in:
Mihai Fufezan 2023-07-19 19:18:13 +03:00 committed by Mihai Fufezan
parent 91e3c654d3
commit a58b70ca07
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -5,7 +5,11 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
wlroots = { wlroots = {
url = "gitlab:wlroots/wlroots?host=gitlab.freedesktop.org"; type = "gitlab";
host = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e";
flake = false; flake = false;
}; };

6
nix/update-inputs.sh
View file

@ -12,14 +12,8 @@ NEW_VER=$(nix eval --raw github:nixos/nixpkgs/nixos-unstable#mesa.version)
if [ "$CRT_VER" != "$NEW_VER" ]; then if [ "$CRT_VER" != "$NEW_VER" ]; then
echo "Updating Mesa $CRT_VER -> $NEW_VER and flake inputs" echo "Updating Mesa $CRT_VER -> $NEW_VER and flake inputs"
# keep wlroots rev, as we don't want to update it
WLR_REV=$(nix flake metadata --json | jq -r '.locks.nodes.wlroots.locked.rev')
# update inputs to latest versions # update inputs to latest versions
nix flake update nix flake update
# hold back wlroots (nix/update-wlroots.nix handles updating that)
nix flake lock --override-input wlroots "gitlab:wlroots/wlroots/$WLR_REV?host=gitlab.freedesktop.org"
else else
echo "nixpkgs is up to date!" echo "nixpkgs is up to date!"
fi fi

12
nix/update-wlroots.sh
View file

@ -1,17 +1,17 @@
#!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#gnused nixpkgs#jq nixpkgs#ripgrep -c bash #!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#gnused nixpkgs#ripgrep -c bash
# get wlroots revision from submodule # get wlroots revision from submodule
SUB_REV=$(git submodule status | rg wlroots | awk '{ print substr($1,2)}') SUB_REV=$(git submodule status | rg wlroots | awk '{ print substr($1,2) }')
# and from lockfile # and from lockfile
CRT_REV=$(jq <flake.lock '.nodes.wlroots.locked.rev' -r) CRT_REV=$(rg rev flake.nix | awk '{ print substr($3, 2, 40) }')
if [ "$SUB_REV" != "$CRT_REV" ]; then if [ "$SUB_REV" != "$CRT_REV" ]; then
echo "Updating wlroots..." echo "Updating wlroots..."
# update wlroots to submodule revision # update wlroots to submodule revision
nix flake lock --override-input wlroots "gitlab:wlroots/wlroots/$SUB_REV?host=gitlab.freedesktop.org" sed -Ei "s/\w{40}/$SUB_REV/g" flake.nix subprojects/wlroots.wrap
nix flake lock
# fix revision in wlroots.wrap echo "wlroots: $CRT_REV -> $SUB_REV"
sed -Ei "s/[a-z0-9]{40}/$SUB_REV/g" subprojects/wlroots.wrap
else else
echo "wlroots is up to date!" echo "wlroots is up to date!"
fi fi