From b471c7e91105ad3c306c08b22b9a3b846d760143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sun, 8 Sep 2024 06:40:54 +0200 Subject: [PATCH 1/2] amber-lang: 0.3.3-alpha -> 0.3.5-alpha MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/am/amber-lang/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index 1ab8c493eebb..41cdc981d361 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "amber-lang"; - version = "0.3.3-alpha"; + version = "0.3.5-alpha"; src = fetchFromGitHub { - owner = "Ph0enixKM"; - repo = "Amber"; + owner = "amber-lang"; + repo = "amber"; rev = version; - hash = "sha256-Al1zTwQufuVGSlttf02s5uI3cyCNDShhzMT3l9Ctv3Y="; + hash = "sha256-wf0JNWNliDGNvlbWoatPqDKmVaBzHeCKOvJWuE9PnpQ="; }; - cargoHash = "sha256-HbkIkCVy2YI+nP5t01frXBhlp/rCsB6DwLL53AHJ4vE="; + cargoHash = "sha256-6T4WcQkCMR8W67w0uhhN8W0FlLsrTUMa3/xRXDtW4Es="; preConfigure = '' substituteInPlace src/compiler.rs \ @@ -36,6 +36,11 @@ rustPlatform.buildRustPackage rec { util-linux ]; + checkFlags = [ + "--skip=tests::extra::download" + "--skip=tests::formatter::all_exist" + ]; + postInstall = '' wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [ bc ]}" ''; From 0dc30d7f8f300bbd31737315a93257fbce12cc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sun, 8 Sep 2024 06:49:38 +0200 Subject: [PATCH 2/2] amber-lang: add `passthru.updateScript` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/am/amber-lang/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index 41cdc981d361..69f41081cc91 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -7,6 +7,7 @@ makeWrapper, runCommand, amber-lang, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -45,10 +46,13 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [ bc ]}" ''; - passthru.tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' - diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World') - touch $out - ''; + passthru = { + updateScript = nix-update-script { }; + tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' + diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World') + touch $out + ''; + }; meta = with lib; { description = "Programming language compiled to bash";