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') diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 1d4a11bfb3f2..1c2a54386cde 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 e24783fe6faeff5d04f9bf4608fbb41bc99b08bb Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Nov 2023 14:26:20 +0100 Subject: yosys: add Luflosi as maintainer --- pkgs/development/compilers/yosys/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 0ea755f7348b..73fbb209b1ba 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -150,6 +150,6 @@ in stdenv.mkDerivation rec { homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ shell thoughtpolice emily ]; + maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; }; } -- 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') diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 1c2a54386cde..03e1ce07d8f1 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 e947b23190f5793c06f42b59865638a68b170552 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Nov 2023 14:39:42 +0100 Subject: yosys: use finalAttrs --- pkgs/development/compilers/yosys/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 73fbb209b1ba..3761090c3e43 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -69,14 +69,14 @@ let } // (yosys-symbiflow); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; version = "0.34"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/${pname}-${version}"; + rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g="; }; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile \ - --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { fi if ! grep -q "YOSYS_VER := $version" Makefile; then - echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${version}), failing." + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (allegedly ${finalAttrs.version}), failing." exit 1 fi ''; @@ -152,4 +152,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; }; -} +}) -- 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') diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 03e1ce07d8f1..1685bb7aba33 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 From 46478168d230fa48d623b44802747c8cda1f1a21 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 8 Nov 2023 14:40:25 +0100 Subject: yosys: 0.34 -> 0.35 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.35 --- pkgs/development/compilers/yosys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 3761090c3e43..6d086d57b017 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-GHDsMBj7DRb9ffESgzd1HzDAA6Cyft5PomidvIMzn9g="; + hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ="; }; enableParallelBuilding = true; -- cgit 1.4.1