diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-13 18:01:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-13 18:01:01 +0000 |
| commit | 38910351b753e23a1731fd95fa99765d3a21dcc5 (patch) | |
| tree | 15e8593de114ff77b686aae0c64e715c2d7a35ae /pkgs/development/libraries | |
| parent | 72b55bcbef7f62f171abf4f3babf13586c68d184 (diff) | |
| parent | 2a72d02169a111961ea40e1f29e4b73dd85731b4 (diff) | |
| download | nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.tar nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.tar.gz nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.tar.bz2 nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.tar.lz nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.tar.xz nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.tar.zst nixpkgs-38910351b753e23a1731fd95fa99765d3a21dcc5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/cimg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/elpa/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/zchunk/default.nix | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 47e9ffa925a..4a482c9da45 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; + hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 76152996a1d..2a71b82af3c 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.001"; + version = "2021.11.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; + sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; }; patches = [ diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index c2ddda7a6c5..c639eb7b30e 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.16"; + version = "1.2.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o="; + hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; }; nativeBuildInputs = [ @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # does not find argp-standalone }; } |