From 6ec7f3a32fb4c7f9ecbfded496ba8e191bf69985 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 18 Nov 2024 22:17:47 +0530 Subject: [PATCH 1/2] viddy: fix update script Signed-off-by: phanirithvij --- pkgs/by-name/vi/viddy/update.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/vi/viddy/update.sh b/pkgs/by-name/vi/viddy/update.sh index ae1586d7e00d..cae2ff9ac2a6 100755 --- a/pkgs/by-name/vi/viddy/update.sh +++ b/pkgs/by-name/vi/viddy/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nix-update curl coreutils jq common-updater-scripts nix-prefetch +#!nix-shell -i bash -p bash nix-update curl coreutils jq +# shellcheck shell=bash # adapted from pkgs/by-name/ya/yazi-unwrapped/update.sh @@ -28,17 +29,12 @@ if [[ "$oldVersion" == "$latestVersion" ]]; then exit 0 fi -echo "Updating viddy" +echo "Updating viddy $oldVersion -> $latestVersion" -# Version -update-source-version viddy "${latestVersion}" +# nix-prefetch broken due to ninja finalAttrs.src.rev +nix-update viddy --version "$latestVersion" -pushd "$SCRIPT_DIR" # Build date -sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' package.nix +sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' "$SCRIPT_DIR/package.nix" + -# Hashes -# https://github.com/msteen/nix-prefetch/issues/51 -cargoHash=$(nix-prefetch --option extra-experimental-features flakes "{ sha256 }: (import $NIXPKGS_DIR {}).viddy.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") -sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' package.nix -popd From 458173b1f71a0ca4ee9658746118506883a35763 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 18 Nov 2024 22:07:40 +0530 Subject: [PATCH 2/2] viddy: 1.2.0 -> 1.2.1 Signed-off-by: phanirithvij --- pkgs/by-name/vi/viddy/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix index 9436e2a8d5f4..901afe1da275 100644 --- a/pkgs/by-name/vi/viddy/package.nix +++ b/pkgs/by-name/vi/viddy/package.nix @@ -6,31 +6,31 @@ rustPlatform.buildRustPackage rec { pname = "viddy"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "sachaos"; repo = "viddy"; rev = "v${version}"; - hash = "sha256-r+zgZutBwNRLYNltdSaIB5lS4qHAhI5XL3iFF+FVd64="; + hash = "sha256-lk992sI5kXo5Q8+rgBCKo/knV3/6uPs83Zj27JQcR6M="; }; - cargoHash = "sha256-rEz3GFfqtSzZa0r4Nwbu3gEf7GhsOkfawaFaNplD/tE="; + cargoHash = "sha256-9xXUlsRGKw0rvIYAr4pMDh6oD/ZjBYPaL0g6dCC5sCo="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; - env.VERGEN_BUILD_DATE = "2024-10-13"; # managed via the update script + env.VERGEN_BUILD_DATE = "2024-11-16"; # managed via the update script env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; passthru.updateScript.command = [ ./update.sh ]; - meta = with lib; { + meta = { description = "Modern watch command, time machine and pager etc."; changelog = "https://github.com/sachaos/viddy/releases"; homepage = "https://github.com/sachaos/viddy"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ j-hui phanirithvij ];