From ff81b74833768d3b5b77f688237d1fdea876e64e Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 5 Oct 2016 14:49:22 +0200 Subject: accountsservice: 0.6.42 -> 0.6.43 the patch for nixbld is not needed anymore since accountsservice now excludes all users with shell set to nologin. Previously this was only done for users in range 500 - minimum_uid (1000). --- .../Add-nixbld-to-user-blacklist.patch | 27 ---------------------- .../libraries/accountsservice/default.nix | 5 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch b/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch deleted file mode 100644 index f5d9e5695026..000000000000 --- a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001 -From: Alexander Ried -Date: Wed, 1 Jun 2016 12:49:48 +0200 -Subject: [PATCH] Add nixbld* to user blacklist - ---- - src/user-classify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/user-classify.c b/src/user-classify.c -index 69e6809..0e152b6 100644 ---- a/src/user-classify.c -+++ b/src/user-classify.c -@@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username) - return TRUE; - } - -+ if (g_str_has_prefix (username, "nixbld")) { -+ return TRUE; -+ } -+ - return FALSE; - } - --- -2.7.4 - diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 2dc6b57c339f..1a49913727d8 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.42"; + version = "0.6.43"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75"; + sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./no-create-dirs.patch - ./Add-nixbld-to-user-blacklist.patch ./Disable-methods-that-change-files-in-etc.patch ]; -- cgit 1.4.1 From db2e9b274c392b904ed51c2f7d8ac6420c70995b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 5 Oct 2016 18:34:14 -0400 Subject: openjpeg: 2.1.1 -> 2.1.2 for CVE-2016-7163 --- pkgs/development/libraries/openjpeg/2.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index d59ceb9f7a9d..00cd4103c8f7 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.1.1"; + version = "2.1.2"; branch = "2.1"; - revision = "v2.1.1"; - sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601"; + revision = "v2.1.2"; + sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h"; }) -- cgit 1.4.1 From 387fc044752e288ce4815f39956660bf185ab771 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 5 Oct 2016 19:27:39 -0400 Subject: c-ares: 1.10.0 -> 1.12.0 for CVE-2016-5180 --- pkgs/development/libraries/c-ares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index eb68a7b9a910..482cf9fdfadd 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "c-ares-1.10.0"; + name = "c-ares-1.12.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; + sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 0dd13814519dcad8dbf2fd48937784a2c45f4a68 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 5 Oct 2016 06:59:10 -0400 Subject: jasper: 1.900.1 -> 1.900.2 --- pkgs/development/libraries/jasper/default.nix | 32 +++++---------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index c9fa9b10f938..e2061df88f09 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,37 +1,17 @@ -{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.1"; + name = "jasper-1.900.2"; src = fetchurl { - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; - sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; + url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; + sha256 = "0bkibjhq3js2ldxa2f9pss84lcx4f5d3v0qis3ifi11ciy7a6c9a"; }; patches = [ - ./jasper-CVE-2016-1867.diff ./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff - ./jasper-CVE-2014-8138.diff - ./jasper-CVE-2014-8157.diff - ./jasper-CVE-2014-8158.diff - ./jasper-CVE-2014-9029.diff - (fetchpatch { # CVE-2016-2116 - url = "https://github.com/mdadams/jasper/commit/142245b9bbb33274a7c620aa7a8f85bc00b2d68e.patch"; - sha256 = "06dkplqfb3swmdfqb9i2m6r13q0ivn538xfvinxz0agandxyc9yr"; - }) - (fetchpatch { # CVE-2016-1577 - url = "https://github.com/mdadams/jasper/commit/74ea22a7a4fe186e0a0124df25e19739b77c4a29.patch"; - sha256 = "1xgvhfhv8r77z0a07ick2w3217mypnkaqjwzxbk1g1ym8lsy5r13"; - }) - (fetchpatch { # CVE-2015-5221 - url = "https://github.com/mdadams/jasper/commit/df5d2867e8004e51e18b89865bc4aa69229227b3.patch"; - sha256 = "0qsiymm59dkj843dbi43ijqdyy3rrzf193ndm9ynj3cfhqghi10l"; - }) - (fetchpatch { # CVE-2008-3522 - url = "https://github.com/mdadams/jasper/commit/d678ccd27b8a062e3bfd4c80d8ce2676a8166a27.patch"; - sha256 = "0dapf8h4s3zijbgd8vmap3blpnc78h7jqm5ydv8j0krrs5dv5672"; - }) + (fetchpatch { # CVE-2016-2089 url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch"; sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf"; @@ -43,7 +23,7 @@ stdenv.mkDerivation rec { ]; # newer reconf to recognize a multiout flag - nativeBuildInputs = [ unzip autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; -- cgit 1.4.1 From 1a10a377ec3ca74cb3029a3f8fd14b28591e23b9 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 6 Oct 2016 02:01:46 -0400 Subject: pcl: fix problem finding OpenGL on darwin --- pkgs/development/libraries/pcl/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 42a8d00eec01..b9762e284e68 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private +, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: stdenv.mkDerivation rec { @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { libpng vtk qt4 libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; + "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" + ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85e1336deb45..874f78fa0235 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8616,7 +8616,7 @@ in pcl = callPackage ../development/libraries/pcl { vtk = vtkWithQt4; inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) Cocoa AGL; + inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; pcre = callPackage ../development/libraries/pcre { }; -- cgit 1.4.1 From 874411c0e31bcd86afdd9657882cab5dcd6f36ea Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 6 Oct 2016 18:18:18 -0400 Subject: cpp-netlib: propagate asio. See cpp-netlib/cpp-netlib#629 --- pkgs/development/libraries/cpp-netlib/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 5b824e3c5753..ecc730597c31 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, openssl }: +{ stdenv, fetchurl, cmake, boost, openssl, asio }: stdenv.mkDerivation rec { name = "cpp-netlib-${version}"; @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake boost openssl ]; + # This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629 + propagatedBuildInputs = [ asio ]; + cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; -- cgit 1.4.1 From 70a464465937057b6cd92acd00dad8e74bf53772 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 8 Oct 2016 07:15:11 +0200 Subject: libmbim: 1.12.2 -> 1.14.0 (#19304) --- pkgs/development/libraries/libmbim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index aa5d858d82cf..c40e54e09cb6 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.12.2"; + name = "libmbim-1.14.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; + url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; + sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa"; }; outputs = [ "out" "dev" "doc" ]; -- cgit 1.4.1 From 0d47c06b4a37b0e03cd820039f4d9221648fb10f Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 8 Oct 2016 07:15:38 +0200 Subject: libqmi: 1.12.6 -> 1.16.0 (#19305) --- pkgs/development/libraries/libqmi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index cfce5e0fd713..d0b46722ff35 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python }: stdenv.mkDerivation rec { - name = "libqmi-1.12.6"; + name = "libqmi-1.16.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; + url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; + sha256 = "0amshs06qc8zy8jz3r2yksqhhbamll7f893ll4zlvgr3zm3vpdks"; }; outputs = [ "out" "dev" "devdoc" ]; -- cgit 1.4.1 From de79db8c99bc7aaeda13f8c800d5d8a780774368 Mon Sep 17 00:00:00 2001 From: Benno Fünfstück Date: Mon, 3 Oct 2016 12:51:16 +0200 Subject: capstone: use Makefile build (for pkg-config files) The cmake based build system did not install the pkg-config files for capstone, which made builds depending on capstone harder to write as they cannot automatically find the location of the capstone library. --- pkgs/development/libraries/capstone/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 80f858254ffb..97a975232602 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cmake }: +{ stdenv, fetchurl, bash }: stdenv.mkDerivation rec { name = "capstone-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; }; - buildInputs = [ cmake ]; + configurePhase = '' patchShebangs make.sh ''; + buildPhase = '' ./make.sh ''; + installPhase = '' env PREFIX=$out ./make.sh install ''; + enableParallelBuilding = true; meta = { -- cgit 1.4.1 From 717ff85b14074c1a01b6ce7275e6dc727094a05a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 9 Oct 2016 16:17:26 +0200 Subject: libnfnetlink: use sha256 hash --- pkgs/development/libraries/libnfnetlink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index c47076014c43..be60612a4ff2 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; - md5 = "98927583d2016a9fb1936fed992e2c5e"; + sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; meta = { -- cgit 1.4.1 From 011f3d700d853b9e5061493853e57ac378f1c1a7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 9 Oct 2016 20:08:26 +0200 Subject: libgee_0_8: init at 0.8.6 some vala packages require this specific version --- pkgs/development/libraries/libgee/0.8.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libgee/0.8.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix new file mode 100644 index 000000000000..84d9fbb47bfa --- /dev/null +++ b/pkgs/development/libraries/libgee/0.8.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +let + ver_maj = "0.8"; + ver_min = "6"; +in +stdenv.mkDerivation rec { + name = "libgee-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + homepage = "http://live.gnome.org/Libgee"; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03e69e9ae732..f3c370f1d3c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7646,6 +7646,8 @@ in libgee_0_6 = callPackage ../development/libraries/libgee/0.6.nix { }; + libgee_0_8 = callPackage ../development/libraries/libgee/0.8.nix { }; + libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; -- cgit 1.4.1 From 3fb2993cb3d1dbd78a45d201b9ad747836f21015 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 9 Oct 2016 21:26:53 +0200 Subject: maintainers: rename lukasepple according to github account name --- lib/maintainers.nix | 2 +- pkgs/development/libraries/libgee/0.8.nix | 2 +- pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix | 2 +- pkgs/tools/backup/rdup/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c4644f0c2e0d..f5c8d505cc02 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -240,7 +240,7 @@ lucas8 = "Luc Chabassier "; ludo = "Ludovic Courtès "; luispedro = "Luis Pedro Coelho "; - lukasepple = "Lukas Epple "; + sternenseemann = "Lukas Epple "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; madjar = "Georges Dubus "; diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix index 84d9fbb47bfa..aba06d861078 100644 --- a/pkgs/development/libraries/libgee/0.8.nix +++ b/pkgs/development/libraries/libgee/0.8.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.linux; homepage = "http://live.gnome.org/Libgee"; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index bfcef1d9c1aa..c87023bf336d 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Firmware for Intel 2200BG cards"; homepage = http://ipw2200.sourceforge.net/firmware.php; license = stdenv.lib.licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ lukasepple ]; + maintainers = with maintainers; [ sternenseemann ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix index 8ca07e2c8235..33e3c77db887 100644 --- a/pkgs/tools/backup/rdup/default.nix +++ b/pkgs/tools/backup/rdup/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/miekg/rdup"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ lukasepple ]; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; }; } -- cgit 1.4.1 From 08011fa2af20b3993cf868c791de3b1dae46f733 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Wed, 10 Aug 2016 22:43:13 +0200 Subject: quickder: init at 1.0-RC1 --- pkgs/development/libraries/quickder/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/quickder/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix new file mode 100644 index 000000000000..2ee3a61aacfc --- /dev/null +++ b/pkgs/development/libraries/quickder/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchurl, hexio, python, which, asn2quickder, bash }: + +stdenv.mkDerivation rec { + pname = "quickder"; + name = "${pname}-${version}"; + version = "1.0-RC1"; + + src = fetchFromGitHub { + sha256 = "05gw5dqkw3l8kwwm0044zpxhcp7sxicx9wxbfyr49c91403p870w"; + rev = "version-${version}"; + owner = "vanrein"; + repo = "quick-der"; + }; + + buildInputs = [ which asn2quickder bash ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace 'lib tool test rfc' 'lib test rfc' + substituteInPlace ./rfc/Makefile \ + --replace 'ASN2QUICKDER_CMD = ' 'ASN2QUICKDER_CMD = ${asn2quickder}/bin/asn2quickder #' + ''; + + installFlags = "ASN2QUICKDER_DIR=${asn2quickder}/bin ASN2QUICKDER_CMD=${asn2quickder}/bin/asn2quickder"; + installPhase = '' + mkdir -p $out/lib $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "Quick (and Easy) DER, a Library for parsing ASN.1"; + homepage = https://github.com/vanrein/quick-der; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 856910628647..d99a313dc08f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8884,6 +8884,8 @@ in quesoglc = callPackage ../development/libraries/quesoglc { }; + quickder = callPackage ../development/libraries/quickder {}; + quicksynergy = callPackage ../applications/misc/quicksynergy { }; qwt = callPackage ../development/libraries/qwt {}; -- cgit 1.4.1 From 3e8af1ec908c2641ae756a152fe0532aa923e98b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 10 Oct 2016 19:05:34 +0200 Subject: libcaca: fix missing darwin inputs --- pkgs/development/libraries/libcaca/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 5ff3157272ee..04e1af2326b6 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }: +{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]; + propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] + ++ stdenv.lib.optional stdenv.isDarwin libXext; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b411cca4a6c..59891d353012 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7477,7 +7477,7 @@ in libburn = callPackage ../development/libraries/libburn { }; libcaca = callPackage ../development/libraries/libcaca { - inherit (xlibs) libX11; + inherit (xlibs) libX11 libXext; }; libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { -- cgit 1.4.1 From da9c6a7744f3e0aad6677357bffb30cd7fe7d92c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 10 Oct 2016 13:37:05 -0500 Subject: gpgme: fix build on i686-linux --- pkgs/development/libraries/gpgme/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 551d18d17f19..8acc773a46c8 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gpgStorePath}/bin" ]; + NIX_CFLAGS_COMPILE = + with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + meta = with stdenv.lib; { homepage = "http://www.gnupg.org/related_software/gpgme"; description = "Library for making GnuPG easier to use"; -- cgit 1.4.1 From 6cfccecebe517f9d972dd7cc5669dfe363585947 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Mon, 10 Oct 2016 22:08:19 +0100 Subject: jansson: 2.8 -> 2.9 --- pkgs/development/libraries/jansson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index a24005487bee..5a3085ba7285 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.8"; + name = "jansson-2.9"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "0v7v82mv7x44rpcxmrpnmb8hqimx67qwsp2cz9mv3y0f37iykwnf"; + sha256 = "19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From ecb596b898bcf3992ab3b90fa0b301153801f810 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 10 Oct 2016 20:27:07 -0400 Subject: uri: init at 2016-09-04 --- pkgs/development/libraries/uri/default.nix | 36 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/uri/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix new file mode 100644 index 000000000000..61ac651256a2 --- /dev/null +++ b/pkgs/development/libraries/uri/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen }: + +stdenv.mkDerivation { + name = "uri-2016-09-04"; + + src = fetchFromGitHub { + owner = "cpp-netlib"; + repo = "uri"; + rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c"; + sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d"; + }; + + buildInputs = [ cmake doxygen ]; + + cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + + postBuild = '' + make doc + ''; + + # https://github.com/cpp-netlib/uri/issues/90 + postInstall = '' + mv $out/include $out/include2 + mv $out/include2/include $out/ + rmdir $out/include2 + mkdir -p $out/share/doc + mv html $out/share/doc/uri + ''; + + meta = { + description = "C++ URI library"; + homepage = http://cpp-netlib.org; + license = stdenv.lib.licenses.boost; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e7e2a37a6a3..35307c947f09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6660,6 +6660,7 @@ in cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; -- cgit 1.4.1 From dfc94720b88e7f2358fb08aae47881a00546dd94 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Oct 2016 15:07:29 +0200 Subject: libunistring: Don't propagate glibc On Linux, libiconv is an alias of glibc. Propagating glibc breaks using GCC 6 as an override (not sure why). So let's not do that. --- pkgs/development/libraries/libunistring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 7f32f37a704d..ad6d99473555 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; - propagatedBuildInputs = [ libiconv ]; + buildInputs = [ libiconv ]; configureFlags = [ "--with-libiconv-prefix=${libiconv}" -- cgit 1.4.1 From 733c706c91a83698ddd6c050dddf1d814bbd60bc Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 28 Sep 2016 23:36:25 +0200 Subject: webkitgtk214x: reenable needed fix was disabled for testing but somehow made it into my pr. From #19081. --- pkgs/development/libraries/webkitgtk/2.14.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix index fca358ed4305..7439d72151dd 100644 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - #NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; nativeBuildInputs = [ cmake perl python ruby bison gperf sqlite -- cgit 1.4.1