From 1ed3ca23baa78588aadd18fb35fb46ac547d480d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 13 Sep 2017 15:26:40 +0200 Subject: texinfo: 6.3 -> 6.5 See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00011.html and http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00007.html for release informations. --- pkgs/development/tools/misc/texinfo/6.3.nix | 54 ----------------------------- pkgs/development/tools/misc/texinfo/6.5.nix | 54 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/tools/misc/texinfo/6.3.nix create mode 100644 pkgs/development/tools/misc/texinfo/6.5.nix (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/texinfo/6.3.nix b/pkgs/development/tools/misc/texinfo/6.3.nix deleted file mode 100644 index 704611e315a3..000000000000 --- a/pkgs/development/tools/misc/texinfo/6.3.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "texinfo-6.3"; - - src = fetchurl { - url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "0fpr9kdjjl6nj2pc50k2zr7134hvqz8bi8pfqa7131a9lpzz6v14"; - }; - - buildInputs = [ perl xz ] - ++ optionals stdenv.isSunOS [ libiconv gawk ] - ++ optional interactive ncurses - ++ optional doCheck procps; # for tests - - configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; - - # FIXME needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "stackprotector" ]; - - preInstall = '' - installFlags="TEXMF=$out/texmf-dist"; - installTargets="install install-tex"; - ''; - - doCheck = interactive # simplify bootstrapping - && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; - - meta = with stdenv.lib; { - homepage = http://www.gnu.org/software/texinfo/; - description = "The GNU documentation system"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; - - longDescription = '' - Texinfo is the official documentation format of the GNU project. - It was invented by Richard Stallman and Bob Chassell many years - ago, loosely based on Brian Reid's Scribe and other formatting - languages of the time. It is used by many non-GNU projects as - well. - - Texinfo uses a single source file to produce output in a number - of formats, both online and printed (dvi, html, info, pdf, xml, - etc.). This means that instead of writing different documents - for online information and another for a printed manual, you - need write only one document. And when the work is revised, you - need revise only that one document. The Texinfo system is - well-integrated with GNU Emacs. - ''; - }; -} diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix new file mode 100644 index 000000000000..b48e74c413b3 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/6.5.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "texinfo-6.5"; + + src = fetchurl { + url = "mirror://gnu/texinfo/${name}.tar.xz"; + sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; + }; + + buildInputs = [ perl xz ] + ++ optionals stdenv.isSunOS [ libiconv gawk ] + ++ optional interactive ncurses + ++ optional doCheck procps; # for tests + + configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + + # FIXME needs gcc 4.9 in bootstrap tools + hardeningDisable = [ "stackprotector" ]; + + preInstall = '' + installFlags="TEXMF=$out/texmf-dist"; + installTargets="install install-tex"; + ''; + + doCheck = interactive # simplify bootstrapping + && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/; + + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/texinfo/; + description = "The GNU documentation system"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; + + longDescription = '' + Texinfo is the official documentation format of the GNU project. + It was invented by Richard Stallman and Bob Chassell many years + ago, loosely based on Brian Reid's Scribe and other formatting + languages of the time. It is used by many non-GNU projects as + well. + + Texinfo uses a single source file to produce output in a number + of formats, both online and printed (dvi, html, info, pdf, xml, + etc.). This means that instead of writing different documents + for online information and another for a printed manual, you + need write only one document. And when the work is revised, you + need revise only that one document. The Texinfo system is + well-integrated with GNU Emacs. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777672c65c63..abd553637db8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7447,7 +7447,7 @@ with pkgs; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.3.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } -- cgit 1.4.1 From 604ca931827df78cd6d603f0771eb72c73aed86c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 15 Sep 2017 17:26:49 +0000 Subject: libxml2: 2.9.4 -> 2.9.5 --- pkgs/development/libraries/libxml2/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 370572956726..28b6faa436aa 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,22 +10,13 @@ let in stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"; + sha256 = "0f6d5nkvcfx8yqis2dwrnv6qaj0nhiifz49y657vmrwwxvnc2ca0"; }; - patches = [ - (fetchpatch { - # Contains fixes for CVE-2016-{4658,5131} and other bugs. - name = "misc.patch"; - url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4"; - sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5"; - }) - ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; -- cgit 1.4.1 From 90059701a836b0d0dbc676e2d1ce417cc5a25bd2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Sep 2017 09:57:33 +0200 Subject: python27: 2.7.13 -> 2.7.14 The enosys patch is not needed anymore since the patch is included in this maintenance release. --- .../interpreters/python/cpython/2.7/default.nix | 6 ++---- .../python/cpython/2.7/glibc-2.25-enosys.patch | 15 --------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch (limited to 'pkgs') diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5f0d8d0655c2..0d5f1e7e4ca3 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -29,7 +29,7 @@ with stdenv.lib; let majorVersion = "2.7"; - minorVersion = "13"; + minorVersion = "14"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -38,7 +38,7 @@ let src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0cgpk3zk0fgpji59pb4zy9nzljr70qzgv1vpz5hq5xw2d2c47m9m"; + sha256 = "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi"; }; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -67,8 +67,6 @@ let # libuuid, slowing down program startup a lot). ./no-ldconfig.patch - ./glibc-2.25-enosys.patch - ] ++ optionals hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch b/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch deleted file mode 100644 index 31da78e35f1c..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.python.org/issue29157 -https://github.com/python/cpython/commit/01bdbad3e951 -diff --git a/Python/random.c b/Python/random.c -index 2f83b5d..0b775ec 100644 ---- a/Python/random.c -+++ b/Python/random.c -@@ -98,7 +98,7 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) - - /* Issue #25003: Don't use getentropy() on Solaris (available since - * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ --#elif defined(HAVE_GETENTROPY) && !defined(sun) -+#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux) - #define PY_GETENTROPY 1 - - /* Fill buffer with size pseudo-random bytes generated by getentropy(). -- cgit 1.4.1 From 4ca45f229b69e6e74c315a0c3e003a5917cc62a8 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 17 Sep 2017 09:03:37 +0200 Subject: set-source-date-epoch-to-latest.sh: shut up a warning > bash: warning: command substitution: ignored null byte in input /cc #28227. Also break the overlong line. --- pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh index 6bf9a65b35af..84e40cd0514f 100644 --- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh +++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh @@ -4,7 +4,8 @@ updateSourceDateEpoch() { # Get the last modification time of all regular files, sort them, # and get the most recent. Maybe we should use # https://github.com/0-wiz-0/findnewest here. - local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' | sort -n --zero-terminated | tail -n1 --zero-terminated)) + local -a res=($(find "$path" -type f -not -newer "$NIX_BUILD_TOP/.." -printf '%T@ %p\0' \ + | sort -n --zero-terminated | tail -n1 --zero-terminated | head -c -1)) local time="${res[0]//\.[0-9]*/}" # remove the fraction part local newestFile="${res[1]}" -- cgit 1.4.1 From bebdd7ac61ba0cd245cb8cfe852001b5d413c57e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Sep 2017 10:48:29 +0200 Subject: python.pkgs.subprocess32: 3.2.6 -> 3.2.7 --- .../python-modules/subprocess32/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +--------------- 2 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/subprocess32/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix new file mode 100644 index 000000000000..cb7a6fe2e868 --- /dev/null +++ b/pkgs/development/python-modules/subprocess32/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, isPyPy +, bash +, python +}: + +buildPythonPackage rec { + pname = "subprocess32"; + version = "3.2.7"; + name = "${pname}-${version}"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1e450a4a4c53bf197ad6402c564b9f7a53539385918ef8f12bdf430a61036590"; + }; + + buildInputs = [ bash ]; + + preConfigure = '' + substituteInPlace test_subprocess32.py \ + --replace '/usr/' '${bash}/' + ''; + + doCheck = !isPyPy; + checkPhase = '' + ${python.interpreter} test_subprocess32.py + ''; + + meta = { + homepage = https://pypi.python.org/pypi/subprocess32; + description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; + maintainers = with lib.maintainers; [ garbas ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d16a39d2650..ae0083dd1a46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20782,33 +20782,7 @@ in { }; }; - subprocess32 = buildPythonPackage rec { - name = "subprocess32-3.2.6"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/subprocess32/${name}.tar.gz"; - sha256 = "ddf4d46ed2be2c7e7372dfd00c464cabb6b3e29ca4113d85e26f82b3d2c220f6"; - }; - - buildInputs = [ pkgs.bash ]; - - preConfigure = '' - substituteInPlace test_subprocess32.py \ - --replace '/usr/' '${pkgs.bash}/' - ''; - - doCheck = !isPyPy; - checkPhase = '' - ${python.interpreter} test_subprocess32.py - ''; - - meta = { - homepage = https://pypi.python.org/pypi/subprocess32; - description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; - maintainers = with maintainers; [ garbas ]; - }; - }; + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; spark_parser = buildPythonPackage (rec { name = "${pname}-${version}"; -- cgit 1.4.1 From 96d15eaddb17e0bb9097a04cfe9d1afbe46a1de5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 17 Sep 2017 11:08:12 +0200 Subject: python27: support test/support In the maintenance release bump in 90059701a836b0d0dbc676e2d1ce417cc5a25bd2 a certain change to /test/ was backported from Python 3: - bpo-30207: To simplify backports from Python 3, the test.test_support module was converted into a package and renamed to test.support. The test.script_helper module was moved into the test.support package. Names test.test_support and test.script_helper are left as aliases to test.support and test.support.script_helper. --- pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0d5f1e7e4ca3..4ac827db7cb6 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -163,7 +163,8 @@ in stdenv.mkDerivation { # functionality to 2.x from 3.x for item in $out/lib/python${majorVersion}/test/*; do if [[ "$item" != */test_support.py* - && "$item" != */regrtest.py* ]]; then + && "$item" != */test/support + && "$item" != */test/regrtest.py* ]]; then rm -rf "$item" else echo $item -- cgit 1.4.1 From c88fa59559317dba2ca31c0f98a1adfe42f35016 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 17 Sep 2017 20:22:14 +0200 Subject: perl-XML-LibXML: update and avoid failing tests The test failures were caused by #29431: libxml-2.9.4 -> 2.9.5 --- pkgs/top-level/perl-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 627c585ea8b6..2d995c0f7000 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15662,14 +15662,19 @@ let self = _self // overrides; _self = with self; { }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-2.0122"; + name = "XML-LibXML-2.0129"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0llgkgifcw7zz7r7f2jiqryi5axymmd3fwzp4aa5gk6j37w66xkn"; + sha256 = "0rmk6vysfgcn8434wyydd56midgshly37wx7c50ch038l2djd82w"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; propagatedBuildInputs = [ XMLSAX ]; + + # https://rt.cpan.org/Public/Bug/Display.html?id=122958 + preCheck = '' + rm t/32xpc_variables.t t/48_reader_undef_warning_on_empty_str_rt106830.t + ''; }; XMLLibXMLSimple = buildPerlPackage { -- cgit 1.4.1 From 49fc06ed0aaf73cd6c72ef0d59dd0105a29dc488 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sun, 20 Aug 2017 17:40:43 -0700 Subject: audit: Remove openldap dependency The openldap dependency is only used for the audisp z/OS plugin. This is not useful on Linux, so always disable this. --- pkgs/os-specific/linux/audit/default.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index e433deff90c6..725c788dd1ac 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, openldap -, enablePython ? false, python ? null +{ + stdenv, fetchurl, + enablePython ? false, python ? null, }: assert enablePython -> python != null; @@ -12,25 +13,19 @@ stdenv.mkDerivation rec { sha256 = "1vvqw5xgirap0jdmajw7l3pq563aycvy3hlqvj3k2cac8i4jbqlq"; }; - outputs = [ "bin" "dev" "out" "man" "plugins" ]; + outputs = [ "bin" "dev" "out" "man" ]; - buildInputs = [ openldap ] - ++ stdenv.lib.optional enablePython python; + buildInputs = stdenv.lib.optional enablePython python; - configureFlags = '' - ${if enablePython then "--with-python" else "--without-python"} - ''; + configureFlags = [ + # z/OS plugin is not useful on Linux, + # and pulls in an extra openldap dependency otherwise + "--disable-zos-remote" + (if enablePython then "--with-python" else "--without-python") + ]; enableParallelBuilding = true; - postInstall = - '' - # Move the z/OS plugin to a separate output to prevent an - # openldap runtime dependency in audit.bin. - mkdir -p $plugins/bin - mv $bin/sbin/audispd-zos-remote $plugins/bin/ - ''; - meta = { description = "Audit Library"; homepage = http://people.redhat.com/sgrubb/audit/; -- cgit 1.4.1 From 5ae74455302260a38ab46eea7f96eff43de7392f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 19 Sep 2017 01:41:01 -0400 Subject: coreutils: remove conflicting _FORTIFY_SOURCE definition Originally this was introduced in 055e646b ('coreutils: Guard against compiler not supporting __builtin_stpncpy_chk') four years ago. Right now this doesn't seem to serve any purpose and it conflicts with the hardening flags: :2:9: warning: '_FORTIFY_SOURCE' macro redefined [-Wmacro-redefined] #define _FORTIFY_SOURCE 2 ^ :1:9: note: previous definition is here #define _FORTIFY_SOURCE 0 ^ 1 warning generated. --- pkgs/tools/misc/coreutils/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c3f4863fe6f5..9a422a96d703 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -76,8 +76,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; - makeFlags = optionalString hostPlatform.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. preInstall = optionalString (hostPlatform != buildPlatform) '' -- cgit 1.4.1 From 3170d8608db5ce30a7ea6a439bb99227b0779a5f Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 19 Sep 2017 11:54:40 +0100 Subject: gdbm: add symlinks for compatibility some tools check this location to distinguish between gdbm and ndbm --- pkgs/development/libraries/gdbm/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 86d9bd649881..c6313dec90ce 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -25,6 +25,17 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-libgdbm-compat" ]; + postInstall = '' + # create symlinks for compatibility + install -dm755 $out/include/gdbm + ( + cd $out/include/gdbm + ln -s ../gdbm.h gdbm.h + ln -s ../ndbm.h ndbm.h + ln -s ../dbm.h dbm.h + ) + ''; + meta = with lib; { description = "GNU dbm key/value database library"; -- cgit 1.4.1 From 16cf4489336fcfddc3b335a499a958e0fd8277e7 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 15 Sep 2017 11:04:14 +0200 Subject: gettext, gcc5: enable stackprotector now This has been forgotten in #29349 ? --- pkgs/development/compilers/gcc/5/default.nix | 3 +-- pkgs/development/libraries/gettext/default.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f593e00ccfd4..7ddc52592ffd 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -221,8 +221,7 @@ stdenv.mkDerivation ({ inherit sha256; }; - # FIXME stackprotector needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "stackprotector" "format" ]; + hardeningDisable = [ "format" ]; inherit patches; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ee74836df81d..a35d2380eded 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" "info" ]; - # FIXME stackprotector needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "format" "stackprotector" ]; + hardeningDisable = [ "format" ]; LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; -- cgit 1.4.1 From 0a2c39e205da145e8686fcc7c4e75f7274257ea8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 19 Sep 2017 22:24:36 +0200 Subject: p11_kit: don't build documentation This depends ultimately on texlive which is a big build and depends on lots of libraries which often get security updates. This triggers mass rebuilds because systemd depends on gnutls which depends on p11_kit. This was introduced with 93d80f19515867e3b215262532deb621e234c483. --- pkgs/development/libraries/p11-kit/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 7a7a6d9d23f1..34182cd5a847 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv -, libffi, libtasn1, gtk_doc, libxslt, docbook_xsl }: +, libffi, libtasn1 }: stdenv.mkDerivation rec { name = "p11-kit-${version}"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy"; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev"]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook which pkgconfig gtk_doc libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook which pkgconfig ]; buildInputs = [ libffi libtasn1 libiconv ]; autoreconfPhase = '' @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--without-trust-paths" - "--enable-doc" ]; installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; -- cgit 1.4.1 From c41af35c04c06b99bff9701cc1c6dd1d91c0d8e9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 19 Sep 2017 14:03:53 +0200 Subject: unbound: 1.6.5 -> 1.6.6 --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a65ccb0541c8..cb462a2cedd2 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.6.5"; + version = "1.6.6"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0khhrj11yhh6a0h578w29yw2j7yzvaqkr4p44jzjapq1549am5z2"; + sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB -- cgit 1.4.1