From bc05f44e6d419096a507e902a6962800f252f66f Mon Sep 17 00:00:00 2001 From: cristianoliveira Date: Wed, 30 Oct 2024 12:16:05 +0100 Subject: [PATCH] chore(nix): make sure to bump to latest version (cherry picked from commit 39bb3de1a58bc105147b036253fad3b029afa348) --- nix/package-local.nix | 4 ++-- nix/package-nightly.nix | 6 +++--- scripts/git-hooks-checks | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/nix/package-local.nix b/nix/package-local.nix index cf81de68..f40d6273 100644 --- a/nix/package-local.nix +++ b/nix/package-local.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage { pname = "funzzy"; - version = "c9a662e"; + version = "e52cc80"; ## build with local source src = ../.; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { # allowBuiltinFetchGit = true; # }; - cargoHash = "sha256-R32136FXsqTRHKoaxHe7X7UWvMnlG6Z79TcOZpFVyNU="; + cargoHash = "sha256-ymwPGKyHIYhoSpGS9WQMEXkKGvDcgV5sn5PaOP98YP4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/nix/package-nightly.nix b/nix/package-nightly.nix index a1605a70..7043cf54 100644 --- a/nix/package-nightly.nix +++ b/nix/package-nightly.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "funzzy"; - version = "47eb77e"; + version = "aa3ba1f"; src = fetchFromGitHub { owner = "cristianoliveira"; repo = "funzzy"; rev = "${version}"; - hash = "sha256-3EHZvgHlM3ldX6SEyqGf6MZIrDFOLXbKTZnJNczT570="; + hash = "sha256-LA2nw4Ip1/FUS/wZ7uNCb/b09wiAIqdIton56Y7Pf3o="; }; - cargoHash = "sha256-7Yql5D+g+xOSX3hQTlV1gGBBSfXFIRSkt3MyRp/bgII="; + cargoHash = "sha256-KlA0SpbM3q/70odGZ9udFieHo/SHaOKxh/2ryEJ1G24="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/scripts/git-hooks-checks b/scripts/git-hooks-checks index ab1c0f4d..9330c038 100755 --- a/scripts/git-hooks-checks +++ b/scripts/git-hooks-checks @@ -9,15 +9,13 @@ echo "Checking nix builds" make ci-run-on-push -## If Cargo.lock has changed, generate nix releases -if git diff --exit-code Cargo.lock; then - echo "Cargo.lock has not changed" -else +## If Cargo.lock has changed, generate nix releases in the latest commit +if git diff --name-only HEAD~1 HEAD | grep -q Cargo; then echo "Cargo.lock has changed" make nix-bump-local make nix-bump-nightly - echo "Please commit the changes" + echo "INFO: Nix update to the latest hash. Please commit the changes" exit 1 fi @@ -34,7 +32,7 @@ else echo "Cargo.toml version is different from git tag" make nix-bump-default - echo "Please commit the changes" + echo "INFO: Nix update to the latest hash. Please commit the changes" exit 1 fi