diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-22 13:20:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-22 13:20:37 +0200 |
| commit | 48110c12956cdccc9aab638a489d2c96511fc41a (patch) | |
| tree | 74e47861fc508c9f3ec7012c3fe5268572d5f6f2 /pkgs/development/libraries | |
| parent | 93a277ca60c024453982a0393f227e35f1374faf (diff) | |
| parent | db0da282c374e0cf7ec9309cbb36bf7b5b5d8e54 (diff) | |
| download | nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.gz nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.bz2 nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.lz nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.xz nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.zst nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.zip | |
Merge staging into master
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gsl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libpfm/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libsixel/default.nix | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index cb2c3f15da82..f62883529fc9 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, m4, cxx ? true -, buildPackages +{ stdenv, fetchurl, m4, cxx ? !hostPlatform.useAndroidPrebuilt +, buildPackages, hostPlatform , withStatic ? false }: let inherit (stdenv.lib) optional optionalString; in diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index f1eed726eb2b..4f952359f711 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.4"; + name = "gsl-2.5"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd"; + sha256 = "1395y9hlhqadn5g9j8q22224fds5sd92jxi9czfavjj24myasq04"; }; patches = [ diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index a74d838e2eb6..593bb567df7d 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.9.0"; + version = "4.10.0"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"; + sha256 = "0bldxhcrpav04hi256fmf907gxhyck24j1p998v48zbhm6aykw94"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; maintainers = [ maintainers.pierron ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 9d4b62eb97ab..bad5e7c59622 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - version = "1.7.3"; + version = "1.8.1"; name = "libsixel-${version}"; src = fetchFromGitHub { repo = "libsixel"; rev = "v${version}"; owner = "saitoha"; - sha256 = "1hzmypzzigmxl07vgc52wp4dgxkhya3gfk4yzaaxc8s630r6ixs8"; + sha256 = "0cbhvd1yk0q08nxva5bga7bpp8yxjfdfnqicvip4l6k28mzz7pmf"; }; meta = with stdenv.lib; { |