From d488388cfcd660c3439aaaf5c31008b6bcdf3d1d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 May 2022 10:56:13 -0300 Subject: [PATCH] primesieve: 7.8 -> 7.9 --- .../science/math/primesieve/default.nix | 36 +++++++++++++++++++ .../science/math/primesieve/default.nix | 23 ------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/science/math/primesieve/default.nix delete mode 100644 pkgs/development/libraries/science/math/primesieve/default.nix diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix new file mode 100644 index 000000000000..c57e2d71f1ee --- /dev/null +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "primesieve"; + version = "7.9"; + + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primesieve"; + rev = "v${version}"; + hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://primesieve.org/"; + description = "Fast C/C++ prime number generator"; + longDescription = '' + primesieve is a command-line program and C/C++ library for quickly + generating prime numbers. It is very cache efficient, it detects your + CPU's L1 & L2 cache sizes and allocates its main data structures + accordingly. It is also multi-threaded by default, it uses all available + CPU cores whenever possible i.e. if sequential ordering is not + required. primesieve can generate primes and prime k-tuplets up to 264. + ''; + license = licenses.bsd2; + maintainers = teams.sage.members ++ + (with maintainers; [ abbradar AndersonTorres ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix deleted file mode 100644 index 0cf263218a3b..000000000000 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "primesieve"; - version = "7.8"; - - nativeBuildInputs = [ cmake ]; - - src = fetchFromGitHub { - owner = "kimwalisch"; - repo = "primesieve"; - rev = "v${version}"; - sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI="; - }; - - meta = with lib; { - description = "Fast C/C++ prime number generator"; - homepage = "https://primesieve.org/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a86ab8e64ed7..1351c11fdfc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20115,7 +20115,7 @@ with pkgs; primecount = callPackage ../development/libraries/science/math/primecount { }; - primesieve = callPackage ../development/libraries/science/math/primesieve { }; + primesieve = callPackage ../applications/science/math/primesieve { }; prison = callPackage ../development/libraries/prison { };