From 0942f79dda06f86faecd831bf571d5066f34c590 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Nov 2023 14:24:00 +0100 Subject: abc-verifier: add Luflosi as maintainer --- pkgs/applications/science/logic/abc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 1d4a11bfb3f..1c2a54386cd 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice Luflosi ]; mainProgram = "abc"; platforms = platforms.unix; }; -- cgit 1.4.1 From 9882bdee1eab1fc5d78eb357c4e4858fdf8a4996 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Nov 2023 14:28:11 +0100 Subject: abc-verifier: cleanup - Move each function argument into its own line - Use `finalAttrs` instead of the `rec` keyword to properly handle overriding - Run the `preInstall` and `postInstall` hooks in the `installPhase` - Use `install` instead of `mkdir -p` and `mv` to be more concise --- pkgs/applications/science/logic/abc/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 1c2a54386cd..03e1ce07d8f 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, fetchFromGitHub -, readline, cmake +{ lib +, stdenv +, fetchFromGitHub +, readline +, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abc-verifier"; version = "unstable-2023-09-13"; @@ -16,10 +19,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - installPhase = "mkdir -p $out/bin && mv abc $out/bin"; + installPhase = '' + runHook preInstall + install -Dm755 'abc' "$out/bin/abc" + runHook postInstall + ''; # needed by yosys - passthru.rev = src.rev; + passthru.rev = finalAttrs.src.rev; meta = with lib; { description = "A tool for squential logic synthesis and formal verification"; @@ -29,4 +36,4 @@ stdenv.mkDerivation rec { mainProgram = "abc"; platforms = platforms.unix; }; -} +}) -- cgit 1.4.1 From 783a01c64eb94ed3efb19b240be1b91c6fce3440 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Nov 2023 14:39:58 +0100 Subject: abc-verifier: unstable-2023-09-13 -> unstable-2023-10-13 --- pkgs/applications/science/logic/abc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 03e1ce07d8f..1685bb7aba3 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abc-verifier"; - version = "unstable-2023-09-13"; + version = "unstable-2023-10-13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "daad9ede0137dc58487a0abc126253e671a85b14"; - hash = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ="; + rev = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43"; + hash = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE="; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1