diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-01 16:28:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-01 16:28:48 +0200 |
commit | f74759450bc7d30fd6578bcf0ec5d9b39caad43c (patch) | |
tree | 91ad9c87f9ee8b3bbf502db227f1d5aad75fb4b6 /pkgs/development/libraries | |
parent | ea4121d225e6b3a7bebad1f6686d952a3e5f0e13 (diff) | |
parent | 92031d6e01bd494a6e92d7dee08e7633256657c4 (diff) | |
download | nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.gz nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.bz2 nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.lz nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.xz nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.tar.zst nixpkgs-f74759450bc7d30fd6578bcf0ec5d9b39caad43c.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/afflib/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/allegro/5.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libite/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libqalculate/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mbedtls/1.3.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mbedtls/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/openh264/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/x264/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/x265/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/zziplib/default.nix | 7 |
11 files changed, 37 insertions, 31 deletions
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 8b7dddf0e15..7c697d3e60c 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,19 +3,18 @@ }: stdenv.mkDerivation rec { - version = "3.7.15"; + version = "3.7.16"; name = "afflib-${version}"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw"; + sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6"; }; buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ]; - meta = { homepage = http://afflib.sourceforge.net/; description = "Advanced forensic format library"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 7efccfad243..f1402e4ad9e 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto , xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { name = "allegro-${version}"; - version = "5.2.1.1"; + version = "5.2.2.0"; - src = fetchurl { - url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; - sha256 = "0waalic7lyaf6i33nikmkc29bndci5c5090c4ra2vmy67cqdzndm"; + src = fetchFromGitHub { + owner = "liballeg"; + repo = "allegro5"; + rev = version; + sha256 = "1sf0dr0ahrzsy6gzzpvys9d7d9w0grayhak4cyymjv7w857hf51m"; }; buildInputs = [ diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index f791f3a8d6e..81f878daaaa 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -11,13 +11,14 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}heimdal-2015-09-13"; + name = "${type}heimdal-${version}"; + version = "7.4.0"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "c81572ab5dcee3062e715b9e25ca7a20f6ec456b"; - sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s"; + rev = "heimdal-${version}"; + sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 72b4469058c..479deb7593d 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libite-${version}"; - version = "1.8.3"; + version = "1.9.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j"; + sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index abc0eb4a228..2e748d26689 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "0.9.10"; + version = "1.0.0a"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi"; + sha256 = "12igmd1rn6zwrsg0mmn5pwy2bqj2gmc08iry0vcdxgzi7jc9x7ix"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index e89fabb9fb3..764d50190b9 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-1.3.19"; + name = "mbedtls-1.3.20"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar"; + sha256 = "0vv69c1c5rr7jcwwivx06fbfixgig90pjznh2c6cn841hgwm9z00"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index c5eab3f74b5..b4500c8f6d6 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.4.2"; + name = "mbedtls-2.5.1"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh"; + sha256 = "1qny1amp54vn84wp0aaj8zvblad60zcp73pdwgnykn7h0q004bri"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 8232af3e789..0a0b4c8d549 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchFromGitHub, nasm }: stdenv.mkDerivation rec { - name = "openh264-1.5.0"; + name = "openh264-${version}"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/cisco/openh264/archive/v1.5.0.tar.gz"; - sha256 = "1d97dh5hzmy46jamfw03flvcz8md1hxp6y5n0b787h8ks7apn1wq"; + src = fetchFromGitHub { + owner = "cisco"; + repo = "openh264"; + rev = "v${version}"; + sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a"; }; buildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index bf32969836c..06ed123c735 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "20160615-2245"; + version = "20170731-2245"; name = "x264-${version}"; src = fetchurl { url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "0w5l77gm8bsmafzimzyc5s27kcw79r6nai3bpccqy0spyxhjsdc2"; + sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; }; patchPhase = '' diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index c485cb6a05a..29d7ddf1fdc 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "1.9"; + version = "2.5"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy"; + sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 20070d8f717..98215aa0c74 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, perl, python2, zip, xmlto, zlib }: stdenv.mkDerivation rec { - name = "zziplib-0.13.58"; + name = "zziplib-${version}"; + version = "0.13.66"; src = fetchurl { - url = "mirror://sourceforge/zziplib/${name}.tar.bz2"; - sha256 = "13j9f6i8rx0qd5m96iwrcha78h34qpfk5qzi7cv098pms6gq022m"; + url = "mirror://sourceforge/zziplib/zziplib13/${version}/${name}.tar.gz"; + sha256 = "0zdx0s19slzv79xplnr6jx0xjb01dd71jzpscf6vlj6k9ry8rcar"; }; patchPhase = '' |