nix: update wlroots & fix updater

This commit is contained in:
Mihai Fufezan 2022-12-24 02:20:02 +02:00
parent f7ce3c27ea
commit d87d2dac0b
No known key found for this signature in database
GPG Key ID: 5899325F2F120900
2 changed files with 10 additions and 8 deletions

View File

@ -34,11 +34,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1671359686, "lastModified": 1671722432,
"narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", "rev": "652e92b8064949a11bc193b90b74cb727f2a1405",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1669925104, "lastModified": 1671723353,
"narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", "narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c8eb24d30e18c165728b8788a10716611c3b633d", "rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

View File

@ -1,7 +1,9 @@
#!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#moreutils nixpkgs#jq -c bash #!/usr/bin/env -S nix shell nixpkgs#gawk nixpkgs#git nixpkgs#moreutils nixpkgs#jq nixpkgs#ripgrep -c bash
set -ex
# get wlroots revision from submodule # get wlroots revision from submodule
SUB_REV=$(git submodule status | 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=$(jq < flake.lock '.nodes.wlroots.locked.rev' -r)