From db641c704f69c936614739d0a7d0b532ef2dbf82 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 15 May 2024 01:01:25 +0200 Subject: [PATCH 1/2] spade: add updateScript --- pkgs/by-name/sp/spade/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index 9248568deae2..00ec70d1c543 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -2,6 +2,9 @@ , rustPlatform , fetchFromGitLab , stdenv +, nix-update +, writeScript +, git }: rustPlatform.buildRustPackage rec { @@ -25,6 +28,18 @@ rustPlatform.buildRustPackage rec { }; }; + # rust + gitlab is a rare combo + passthru.updateScript = [ + (writeScript "update-spade" '' + VERSION="$( + ${lib.getExe git} ls-remote --tags --sort -version:refname ${lib.escapeShellArg src.gitRepoUrl} \ + | cut -f2 | grep ^refs/tags/v | cut -d/ -f3- | cut -c2- \ + | sort --version-sort --reverse | head -n1 + )" + exec ${lib.getExe nix-update} --version "$VERSION" "$@" + '') + ]; + meta = with lib; { description = "A better hardware description language"; homepage = "https://gitlab.com/spade-lang/spade"; From bc708f0a9b50f21e24da60673b64ea59519ed634 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 15 May 2024 01:02:52 +0200 Subject: [PATCH 2/2] spade: 0.7.0 -> 0.8.0 Changelog: https://gitlab.com/spade-lang/spade/-/blob/v0.8.0/CHANGELOG.md --- pkgs/by-name/sp/spade/Cargo.lock | 32 +++++++++++++++---------------- pkgs/by-name/sp/spade/package.nix | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock index 0a236b50a51d..f97ada67faba 100644 --- a/pkgs/by-name/sp/spade/Cargo.lock +++ b/pkgs/by-name/sp/spade/Cargo.lock @@ -980,7 +980,7 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "spade" -version = "0.7.0" +version = "0.8.0" dependencies = [ "atty", "clap", @@ -1014,7 +1014,7 @@ dependencies = [ [[package]] name = "spade-ast" -version = "0.7.0" +version = "0.8.0" dependencies = [ "num", "spade-common", @@ -1022,7 +1022,7 @@ dependencies = [ [[package]] name = "spade-ast-lowering" -version = "0.7.0" +version = "0.8.0" dependencies = [ "itertools", "local-impl", @@ -1040,7 +1040,7 @@ dependencies = [ [[package]] name = "spade-common" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1066,7 +1066,7 @@ dependencies = [ [[package]] name = "spade-diagnostics" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1084,7 +1084,7 @@ dependencies = [ [[package]] name = "spade-hir" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1102,7 +1102,7 @@ dependencies = [ [[package]] name = "spade-hir-lowering" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "spade-macros" -version = "0.7.0" +version = "0.8.0" dependencies = [ "proc-macro2", "quote", @@ -1138,7 +1138,7 @@ dependencies = [ [[package]] name = "spade-mir" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1159,7 +1159,7 @@ dependencies = [ [[package]] name = "spade-parser" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan", "colored", @@ -1177,7 +1177,7 @@ dependencies = [ [[package]] name = "spade-python" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1206,7 +1206,7 @@ dependencies = [ [[package]] name = "spade-simulation-ext" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1234,7 +1234,7 @@ dependencies = [ [[package]] name = "spade-tests" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1262,7 +1262,7 @@ dependencies = [ [[package]] name = "spade-typeinference" -version = "0.7.0" +version = "0.8.0" dependencies = [ "assert_matches", "codespan", @@ -1285,7 +1285,7 @@ dependencies = [ [[package]] name = "spade-types" -version = "0.7.0" +version = "0.8.0" dependencies = [ "num", "serde", @@ -1294,7 +1294,7 @@ dependencies = [ [[package]] name = "spade-wordlength-inference" -version = "0.7.0" +version = "0.8.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index 00ec70d1c543..2781a6440de9 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-oJfOgWobjt+DAVdP465E8iLMJCdqhs0vzJJFgRqVAP8="; + hash = "sha256-J3AdXuN1WLKFED9YeBly68umPlx05Wl+mhT2YbBsJVk="; # only needed for vatch, which contains test data fetchSubmodules = true; };