From 42168aba0dcacab0f21ea289426bd6f189e5e97a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 12:27:10 -0300 Subject: [PATCH 1/7] primesieve: nixfmt-rfc-style --- pkgs/by-name/pr/primesieve/package.nix | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index b5e2da37022d..e89a61e2a820 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -1,8 +1,9 @@ -{ lib -, cmake -, fetchFromGitHub -, stdenv -, primecount +{ + lib, + cmake, + fetchFromGitHub, + stdenv, + primecount, }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +17,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M="; }; - outputs = [ "out" "dev" "lib" "man" ]; + outputs = [ + "out" + "dev" + "lib" + "man" + ]; nativeBuildInputs = [ cmake ]; @@ -42,8 +48,12 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/kimwalisch/primesieve/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; mainProgram = "primesieve"; - maintainers = lib.teams.sage.members ++ - (with lib.maintainers; [ abbradar AndersonTorres ]); + maintainers = + lib.teams.sage.members + ++ (with lib.maintainers; [ + abbradar + AndersonTorres + ]); platforms = lib.platforms.unix; }; }) From b43d984e04bf154427a5747af2da66918269056d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 12:31:01 -0300 Subject: [PATCH 2/7] primesieve: updateScript --- pkgs/by-name/pr/primesieve/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index e89a61e2a820..89032f34910a 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -2,6 +2,7 @@ lib, cmake, fetchFromGitHub, + gitUpdater, stdenv, primecount, }: @@ -32,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { inherit primecount; # dependent }; + updateScript = gitUpdater { rev-prefix = "v"; }; }; meta = { From edaa1e6b492f6fc3b75a8441e666ff504dceb8db Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 12:26:55 -0300 Subject: [PATCH 3/7] primecount: nixfmt-rfc-style --- pkgs/by-name/pr/primecount/package.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix index d2b117138e73..251452f2f3b5 100644 --- a/pkgs/by-name/pr/primecount/package.nix +++ b/pkgs/by-name/pr/primecount/package.nix @@ -1,8 +1,9 @@ -{ lib -, cmake -, fetchFromGitHub -, primesieve -, stdenv +{ + lib, + cmake, + fetchFromGitHub, + primesieve, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -16,15 +17,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VjsJjG2pSnDMVg3lY3cmpdnASeqClPjHUGY5wqupf2w="; }; - outputs = [ "out" "dev" "lib" "man" ]; - - nativeBuildInputs = [ - cmake + outputs = [ + "out" + "dev" + "lib" + "man" ]; - buildInputs = [ - primesieve - ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ primesieve ]; strictDeps = true; From 7e62438a95cf2adf12d535ad6675566b7f23049d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 12:31:24 -0300 Subject: [PATCH 4/7] primecount: updateScript + tests --- pkgs/by-name/pr/primecount/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix index 251452f2f3b5..db337c8902db 100644 --- a/pkgs/by-name/pr/primecount/package.nix +++ b/pkgs/by-name/pr/primecount/package.nix @@ -2,6 +2,7 @@ lib, cmake, fetchFromGitHub, + gitUpdater, primesieve, stdenv, }: @@ -38,6 +39,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_TESTS" true) ]; + passthru = { + tests = { + inherit primesieve; # dependency + }; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + meta = { homepage = "https://github.com/kimwalisch/primecount"; description = "Fast prime counting function implementations"; From 0cbd10a948988a22f544cf783a486a80637b2149 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 13:35:42 -0300 Subject: [PATCH 5/7] primesieve: remove extra maintainers AndersonTorres and abbradar Because abbradar is retired. --- pkgs/by-name/pr/primesieve/package.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index 89032f34910a..e9e1d647cd83 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -50,12 +50,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/kimwalisch/primesieve/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; mainProgram = "primesieve"; - maintainers = - lib.teams.sage.members - ++ (with lib.maintainers; [ - abbradar - AndersonTorres - ]); + maintainers = lib.teams.sage.members; platforms = lib.platforms.unix; }; }) From e300b2ba660ea9589c34a139eee564514c3b22e5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 12:37:58 -0300 Subject: [PATCH 6/7] primecount: 7.13 -> 7.14 --- pkgs/by-name/pr/primecount/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix index db337c8902db..7a66f379965f 100644 --- a/pkgs/by-name/pr/primecount/package.nix +++ b/pkgs/by-name/pr/primecount/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primecount"; - version = "7.13"; + version = "7.14"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${finalAttrs.version}"; - hash = "sha256-VjsJjG2pSnDMVg3lY3cmpdnASeqClPjHUGY5wqupf2w="; + hash = "sha256-N4eENwYuf8ZR1JQyFtoWl6H3ITpGZVaOMEU3gx0f9yQ="; }; outputs = [ From 2977a6a5b1486f6cbd801837a3e370ef52d0421f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 2 Aug 2024 12:38:29 -0300 Subject: [PATCH 7/7] primesieve: 12.3 -> 12.4 --- pkgs/by-name/pr/primesieve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index e9e1d647cd83..16b7bfe8801c 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primesieve"; - version = "12.3"; + version = "12.4"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M="; + hash = "sha256-3iVQsksnyw9KFBTYsmyZ6YxYICVq1GzOzemDBpqpU3M="; }; outputs = [