From 9502f3f4ac5b6a8c5543954c6c67b6c18c753e85 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:25:58 -0300 Subject: [PATCH 1/4] stress: replace `rec` with `finalAttrs` --- pkgs/by-name/st/stress/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index 6aee23949676..0c89c2522720 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stress"; version = "1.0.7"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "stress"; }; -} +}) From d93057e49f2b7fcb65681edf90b851ba87d3423a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:27:05 -0300 Subject: [PATCH 2/4] stress: remove `with lib` from meta --- pkgs/by-name/st/stress/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index 0c89c2522720..ff4f75e071fe 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - meta = with lib; { + meta = { description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; mainProgram = "stress"; }; }) From 743e15e45f44172c3b7d5c79605d486798d8860b Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:27:37 -0300 Subject: [PATCH 3/4] stress: hardcode source repository --- pkgs/by-name/st/stress/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index ff4f75e071fe..13aa17217819 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; - repo = finalAttrs.pname; + repo = "stress"; rev = finalAttrs.version; hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg="; }; From 4bd83c8f3fe70a5e3fd837ef4cf04a3079914e44 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:29:09 -0300 Subject: [PATCH 4/4] stress: replace `rev` with `tag` in `fetchFromGitHub` --- pkgs/by-name/st/stress/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index 13aa17217819..a61ba45c7b12 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = "stress"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg="; };