From d87d2dac0b1385a4ab944df293bc48877564106c Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 24 Dec 2022 02:20:02 +0200 Subject: [PATCH] nix: update wlroots & fix updater --- flake.lock | 12 ++++++------ nix/update-inputs.sh | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 6598a82b..5bc74e66 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671359686, - "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", + "lastModified": 1671722432, + "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "rev": "652e92b8064949a11bc193b90b74cb727f2a1405", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1669925104, - "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", + "lastModified": 1671723353, + "narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=", "owner": "wlroots", "repo": "wlroots", - "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", + "rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6", "type": "gitlab" }, "original": { diff --git a/nix/update-inputs.sh b/nix/update-inputs.sh index 8c238222..91a835c2 100755 --- a/nix/update-inputs.sh +++ b/nix/update-inputs.sh @@ -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 -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 CRT_REV=$(jq < flake.lock '.nodes.wlroots.locked.rev' -r)