diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-11 18:01:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-11 18:01:21 +0000 |
| commit | 99d681c4e77909a41df6f5166d9d9330e24d31cf (patch) | |
| tree | 4694ee2a923b967f4303afff83ad86c1a7cc7ba7 /pkgs/applications/science | |
| parent | cea45d387a03c0448dcc69fd1847bb4a40c14730 (diff) | |
| parent | 99fed31f9da9265b6b608955610e4b72247e0dad (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/primecount/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/science/math/primesieve/default.nix | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix index a5ecd42a8e497..8fd2644ba1108 100644 --- a/pkgs/applications/science/math/primecount/default.nix +++ b/pkgs/applications/science/math/primecount/default.nix @@ -7,18 +7,22 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.4"; + version = "7.6"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-ZKrTeeDJgVy+6Q0twFW9+bQulUmOL1dxznYK9nWd07Y="; + hash = "sha256-x9sXLuHd3nfVM6sL/5yAzIoTVkf1LIUnbhx2WlD/OS8="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ primesieve ]; + buildInputs = [ + primesieve + ]; cmakeFlags = [ "-DBUILD_LIBPRIMESIEVE=ON" @@ -30,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/kimwalisch/primecount"; + changelog = "https://github.com/kimwalisch/primecount/blob/v${version}/ChangeLog"; description = "Fast prime counting function implementations"; longDescription = '' primecount is a command-line program and C/C++ library that counts the diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix index e43538e9babc9..3aab036fb02ad 100644 --- a/pkgs/applications/science/math/primesieve/default.nix +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -6,19 +6,20 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "8.0"; + version = "11.0"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - hash = "sha256-sqHNQXWeo+Iktq3gyiDLblBq/9QNlUQDvi1oHcZ2XYM="; + hash = "sha256-mYekOfjeGwQzWi3pBXnmRMTV7nghEvHsD+tR7vrTFRY="; }; nativeBuildInputs = [ cmake ]; meta = with lib; { homepage = "https://primesieve.org/"; + changelog = "https://github.com/kimwalisch/primesieve/blob/v${version}/ChangeLog"; description = "Fast C/C++ prime number generator"; longDescription = '' primesieve is a command-line program and C/C++ library for quickly |