From 02a839bffc2544ab2764d3573b24c2ffd763d233 Mon Sep 17 00:00:00 2001 From: Massimo Zaniboni Date: Thu, 22 Dec 2016 00:01:04 +0100 Subject: [PATCH 1/4] pythonPackages.sphinxcontrib_newsfeed: init at 0.1.4 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cc49d53c70..f2ae3e4ecab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24571,6 +24571,22 @@ in { }; }); + sphinxcontrib_newsfeed = buildPythonPackage (rec { + name = "sphinxcontrib-newsfeed-${version}"; + version = "0.1.4"; + src = pkgs.fetchurl { + url = "mirror://pypi/s/sphinxcontrib-newsfeed/${name}.tar.gz"; + sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; + }; + + propagatedBuildInputs = with self; [sphinx]; + + meta = { + description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; + homepage = http://bitbucket.org/prometheus/sphinxcontrib-newsfeed; + license = licenses.bsd2; + }; + }); sphinxcontrib_plantuml = buildPythonPackage (rec { name = "sphinxcontrib-plantuml-0.7"; From 087c244c067a1bc881874bda8fd7b4dac2331fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 30 Dec 2016 16:18:18 +0100 Subject: [PATCH 2/4] fix #21521 --- .../libraries/libpaper/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 7bc4b316673..a423727b913 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -9,6 +9,25 @@ stdenv.mkDerivation rec { sha256 = "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"; }; + # The configure script of libpaper is buggy: it uses AC_SUBST on a headerfile + # to compile sysconfdir into the library. Autoconf however defines sysconfdir + # as "${prefix}/etc", which is not expanded by AC_SUBST so libpaper will look + # for config files in (literally, without expansion) '${prefix}/etc'. Manually + # setting sysconfdir fixes this issue. + preConfigure = '' + configureFlagsArray+=( + "--sysconfdir=$out/etc" + ) + ''; + + # Set the default paper to letter (this is what libpaper uses as default as well, + # if you call getdefaultpapername()). + # The user can still override this with the PAPERCONF environment variable. + postInstall = '' + mkdir -p $out/etc + echo letter > $out/etc/papersize + ''; + meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; From ea14a143572cc98f54ffa2a31510a2ce52f102ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 30 Dec 2016 16:54:41 +0100 Subject: [PATCH 3/4] man-db: make apropos search and not just behave like whatis Before this fix, apropos behaved exactly like whatis and looked for an exact match. Now, it actually provides the apropos-functionality of searching. --- pkgs/tools/misc/man-db/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 9c1dabc7584..8685b89d6d0 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -29,8 +29,11 @@ stdenv.mkDerivation rec { ]; postInstall = '' - for i in "$out/bin/"*; do - wrapProgram "$i" --prefix PATH : "${groff}/bin" + # apropos/whatis uses program name to decide whether to act like apropos or whatis + # (multi-call binary). `apropos` is actually just a symlink to whatis. So we need to + # make sure that we don't wrap symlinks (since that changes argv[0] to the -wrapped name) + find "$out/bin" -type f | while read file; do + wrapProgram "$file" --prefix PATH : "${groff}/bin" done ''; From cab497ee6da35745ac8f5dc8f5d4c10ce73ea3d4 Mon Sep 17 00:00:00 2001 From: Dhananjay Balan Date: Fri, 30 Dec 2016 18:13:10 +0100 Subject: [PATCH 4/4] unbound 1.5.6 > 1.6.0 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- pkgs/tools/networking/unbound/python.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 4362dc57e68..83d3d88729d 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.5.10"; + version = "1.6.0"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "11lli8jgq4n917gcx6nw728g1hqc2lszwlxa5mdb78m2ri7qp6x3"; + sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 5d7096ab168..911afdd18bb 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "pyunbound"; name = "${pname}-${version}"; - version = "1.5.9"; + version = "1.6.0"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990"; + sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb"; }; buildInputs = [ openssl expat libevent swig python ];