From 79721c691f1d0a6c45e108de9416bbe155f4c2f2 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Wed, 30 Apr 2025 15:31:35 +0200 Subject: [PATCH 1/3] foot: add `passthru.updateScript` updates foot itself and subpackage --- pkgs/by-name/fo/foot/package.nix | 3 +++ pkgs/by-name/fo/foot/update.sh | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100755 pkgs/by-name/fo/foot/update.sh diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 34d21354f255..a796a807b96c 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -200,6 +200,9 @@ stdenv.mkDerivation { "themes" ]; + passthru = { inherit stimulusGenerator; }; + passthru.updateScript = ./update.sh; + passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv; diff --git a/pkgs/by-name/fo/foot/update.sh b/pkgs/by-name/fo/foot/update.sh new file mode 100755 index 000000000000..2af7c8398d19 --- /dev/null +++ b/pkgs/by-name/fo/foot/update.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash +#!nix-shell -p nix-update + +nix-update foot +nix-update --version=skip foot.stimulusGenerator From 699c9444857729da85237bc1736aec785d8cc7ee Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Wed, 30 Apr 2025 15:59:07 +0200 Subject: [PATCH 2/3] foot: use tag over rev in fetcher --- pkgs/by-name/fo/foot/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index a796a807b96c..5d4a9a6a87a8 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -103,8 +103,8 @@ stdenv.mkDerivation { domain = "codeberg.org"; owner = "dnkl"; repo = "foot"; - rev = version; hash = "sha256-OCDFfOEyE8CrgisswSfPXH1rNoaM1C1ztm9R77P0MOk="; + tag = version; }; separateDebugInfo = true; From 0aa88a9e315d2ad1cf599ea599da75e7b7dcdd46 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Wed, 30 Apr 2025 15:59:33 +0200 Subject: [PATCH 3/3] foot: update 1.22.0 -> 1.22.2 --- pkgs/by-name/fo/foot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 5d4a9a6a87a8..987028a8d096 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.22.0"; + version = "1.22.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -103,8 +103,8 @@ stdenv.mkDerivation { domain = "codeberg.org"; owner = "dnkl"; repo = "foot"; - hash = "sha256-OCDFfOEyE8CrgisswSfPXH1rNoaM1C1ztm9R77P0MOk="; tag = version; + hash = "sha256-eX9nSAl2pHbJU8g80q3RifDlFh00LSi8GvYU4+rlIsA="; }; separateDebugInfo = true;