Skip to content

Commit

Permalink
chore(nix): make sure to bump to latest version
Browse files Browse the repository at this point in the history
(cherry picked from commit 39bb3de1a58bc105147b036253fad3b029afa348)
  • Loading branch information
cristianoliveira committed Oct 30, 2024
1 parent aa3ba1f commit bc05f44
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions nix/package-local.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

rustPlatform.buildRustPackage {
pname = "funzzy";
version = "c9a662e";
version = "e52cc80";

## build with local source
src = ../.;
Expand All @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
# allowBuiltinFetchGit = true;
# };

cargoHash = "sha256-R32136FXsqTRHKoaxHe7X7UWvMnlG6Z79TcOZpFVyNU=";
cargoHash = "sha256-ymwPGKyHIYhoSpGS9WQMEXkKGvDcgV5sn5PaOP98YP4=";

buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
Expand Down
6 changes: 3 additions & 3 deletions nix/package-nightly.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions scripts/git-hooks-checks
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit bc05f44

Please sign in to comment.