git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #66528: glibc: 2.27 -> 2.30 (into staging)

Includes update of stdenv bootstap tools (for three main platforms) and many package fixes with new glibc.

commit48a997cd76c8f141938cf98f82a867d0cf88fec2 authorVladimír Čunát <v@cunat.cz> dateWed 5 Feb 2020, 13:41 (7 years ago) parent15021db5ca088f
65 files changed+436−406
pkgs/applications/audio/distrho/default.nix+1−1 pkgs/applications/misc/gcal/default.nix+8−1 pkgs/applications/misc/spacefm/default.nix+2 pkgs/applications/misc/spacefm/glibc-fix.patch+12 pkgs/applications/misc/ssw/default.nix+21 pkgs/applications/misc/vit/default.nix+3−1 pkgs/applications/science/math/pspp/default.nix+8−5 pkgs/applications/virtualization/xen/4.8.nix+4−1 pkgs/development/compilers/mono/4.nix+1 pkgs/development/compilers/mono/generic.nix+2−3 pkgs/development/compilers/mono/mono4-glibc.patch+12 pkgs/development/compilers/wcc/default.nix+2 pkgs/development/compilers/z88dk/default.nix+4−4 pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch+23 pkgs/development/interpreters/python/cpython/default.nix+1−4 pkgs/development/libraries/glibc/CVE-2018-11236.patch−146 pkgs/development/libraries/glibc/CVE-2018-11237.patch−55 pkgs/development/libraries/glibc/common.nix+16−27 pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch−26 pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch−35 pkgs/development/libraries/libffi/default.nix+2−2 pkgs/development/libraries/libmilter/default.nix+1−1 pkgs/development/libraries/libmilter/glibc-2.30.patch+44 pkgs/development/libraries/libunistring/default.nix+1−1 pkgs/development/libraries/seasocks/default.nix+8−1 pkgs/development/tools/analysis/coz/default.nix+4 pkgs/development/tools/analysis/eresi/default.nix+8−1 pkgs/development/tools/analysis/rr/default.nix+4−4 pkgs/development/tools/gnulib/default.nix+3−3 pkgs/development/tools/misc/gnum4/default.nix+8−1 pkgs/development/tools/misc/intel-gpu-tools/default.nix+5−4 pkgs/os-specific/linux/drbd/default.nix+1−1 pkgs/os-specific/linux/drbd/fix-glibc-compilation.patch+24 pkgs/os-specific/linux/jfbview/default.nix+5 pkgs/os-specific/linux/policycoreutils/default.nix+2 pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patch−48 pkgs/os-specific/linux/tiscamera/default.nix+16−9 pkgs/servers/diod/default.nix+1 pkgs/servers/foundationdb/default.nix+6 pkgs/servers/gpsd/default.nix+4 pkgs/servers/http/lwan/default.nix+2−2 pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch+34 pkgs/servers/mail/postfix/default.nix+1 pkgs/servers/prayer/default.nix+1 pkgs/stdenv/linux/bootstrap-files/aarch64.nix+2−2 pkgs/stdenv/linux/bootstrap-files/i686.nix+2−2 pkgs/stdenv/linux/bootstrap-files/x86_64.nix+2−2 pkgs/stdenv/linux/default.nix+26−4 pkgs/tools/archivers/sharutils/default.nix+4 pkgs/tools/compression/bzip2/default.nix+3 pkgs/tools/filesystems/ext4magic/default.nix+1 pkgs/tools/filesystems/ext4magic/glibc-fix.patch+12 pkgs/tools/filesystems/jfsutils/default.nix+7−1 pkgs/tools/filesystems/udftools/default.nix+1 pkgs/tools/misc/expect/default.nix+3−3 pkgs/tools/misc/idutils/default.nix+1 pkgs/tools/misc/kermit/default.nix+1 pkgs/tools/misc/ttyrec/default.nix+1 pkgs/tools/networking/gftp/default.nix+4 pkgs/tools/networking/ppp/default.nix+8−1 pkgs/tools/networking/ppp/nix-purity.patch+12−3 pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch+25 pkgs/tools/networking/xnbd/default.nix+2 pkgs/tools/security/oath-toolkit/default.nix+10−1 pkgs/top-level/all-packages.nix+4
pkgs/applications/audio/distrho/default.nix+1−1
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
2626 runHook postConfigure
2727 '';
2828
29− patchPhase = ''
29+ postPatch = ''
3030 sed -e "s#@./scripts#sh scripts#" -i Makefile
3131 '';
3232
pkgs/applications/misc/gcal/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ncurses }:
1+{ stdenv, fetchurl, ncurses, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "gcal";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
99 sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
1010 };
1111
12+ patches = [
13+ (fetchpatch {
14+ url = "https://src.fedoraproject.org/rpms/gcal/raw/master/f/gcal-glibc-no-libio.patch";
15+ sha256 = "0l4nw9kgzsay32rsdwvs75pbp4fhx6pfm85paynfbd20cdm2n2kv";
16+ })
17+ ];
18+
1219 enableParallelBuilding = true;
1320
1421 buildInputs = [ ncurses ];
pkgs/applications/misc/spacefm/default.nix+2
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
1313 sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
1414 };
1515
16+ patches = [ ./glibc-fix.patch ];
17+
1618 configureFlags = [
1719 "--with-bash-path=${pkgs.bash}/bin/bash"
1820 ];
pkgs/applications/misc/spacefm/glibc-fix.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/src/main.c b/src/main.c
2+index 27f5614..2b45708 100644
3+--- a/src/main.c
4++++ b/src/main.c
5+@@ -23,6 +23,7 @@
6+ #include <sys/types.h>
7+ #include <sys/socket.h>
8+ #include <sys/un.h>
9++#include <sys/sysmacros.h>
10+
11+ #include <signal.h>
12+
pkgs/applications/misc/ssw/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ stdenv, fetchurl, pkg-config, gtk3 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "ssw";
5+ version = "0.3";
6+
7+ src = fetchurl {
8+ url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz";
9+ sha256 = "1h93yyh2by6yrmkwqg38nd5knids05k5nqzcihc1hdwgzg3c4b8y";
10+ };
11+
12+ nativeBuildInputs = [ pkg-config ];
13+ buildInputs = [ gtk3 ];
14+
15+ meta = with stdenv.lib; {
16+ homepage = "https://www.gnu.org/software/ssw/";
17+ license = licenses.gpl3;
18+ description = "GNU Spread Sheet Widget";
19+ platforms = platforms.linux;
20+ };
21+}
pkgs/applications/misc/vit/default.nix+3−1
@@ -1,7 +1,8 @@
11{ lib
22, python3Packages
3+, taskwarrior
34, glibcLocales
4−, taskwarrior }:
5+}:
56
67with python3Packages;
78
@@ -21,6 +22,7 @@ buildPythonApplication rec {
2122 tzlocal
2223 urwid
2324 ];
25+
2426 checkInputs = [ glibcLocales ];
2527
2628 makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ];
pkgs/applications/science/math/pspp/default.nix+8−5
@@ -1,20 +1,23 @@
11{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
22, pkgconfig, gtksourceview, pango, gettext, dconf
33, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
4+, texinfo, ssw
45}:
56
67stdenv.mkDerivation rec {
7− name = "pspp-1.0.1";
8+ pname = "pspp";
9+ version = "1.2.0";
810
911 src = fetchurl {
10− url = "mirror://gnu/pspp/${name}.tar.gz";
11− sha256 = "1r8smr5057993h90nx0mdnff8nxw9x546zzh6qpy4h3xblp1la5s";
12+ url = "mirror://gnu/pspp/${pname}-${version}.tar.gz";
13+ sha256 = "07pp27zycrb5x927jwaj9r3q7hy915jh51xs85zxby6gfiwl63m5";
1214 };
1315
14− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkgconfig texinfo ];
1517 buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
1618 gtksourceview pango gettext
17− makeWrapper gsettings-desktop-schemas hicolor-icon-theme ];
19+ makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw
20+ ];
1821
1922 doCheck = false;
2023
pkgs/applications/virtualization/xen/4.8.nix+4−1
@@ -185,7 +185,10 @@ callPackage (import ./generic.nix (rec {
185185 # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
186186 sed 1i'#include <sys/sysmacros.h>' \
187187 -i tools/blktap2/control/tap-ctl-allocate.c \
188− -i tools/libxl/libxl_device.c
188+ -i tools/libxl/libxl_device.c \
189+ ${optionalString withInternalQemu "-i tools/qemu-xen/hw/9pfs/9p.c"}
190+
191+ sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c
189192 '';
190193
191194 passthru.qemu-system-i386 = if withInternalQemu
pkgs/development/compilers/mono/4.nix+1
@@ -5,4 +5,5 @@ callPackage ./generic.nix ({
55 version = "4.8.1.0";
66 sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
77 enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
8+ extraPatches = [ ./mono4-glibc.patch ];
89})
pkgs/development/compilers/mono/generic.nix+2−3
@@ -1,6 +1,7 @@
11{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which
22, enableParallelBuilding ? true
33, srcArchiveSuffix ? "tar.bz2"
4+, extraPatches ? []
45}:
56
67let
@@ -22,8 +23,6 @@ stdenv.mkDerivation rec {
2223
2324 propagatedBuildInputs = [glib];
2425
25− NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
26−
2726 # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
2827 dontDisableStatic = true;
2928
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
4443
4544 # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
4645 # because we control pkg-config
47− patches = [ ./pkgconfig-before-gac.patch ];
46+ patches = [ ./pkgconfig-before-gac.patch ] ++ extraPatches;
4847
4948 # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default
5049 # LLVM path to point into the Mono LLVM build, since it's private anyway.
pkgs/development/compilers/mono/mono4-glibc.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c
2+index 53c271a4..84bd3252 100644
3+--- a/mono/io-layer/processes.c
4++++ b/mono/io-layer/processes.c
5+@@ -19,6 +19,7 @@
6+ #include <errno.h>
7+ #include <sys/types.h>
8+ #include <sys/stat.h>
9++#include <sys/sysmacros.h>
10+ #include <unistd.h>
11+ #ifdef HAVE_SIGNAL_H
12+ #include <signal.h>
pkgs/development/compilers/wcc/default.nix+2
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
1717 postPatch = ''
1818 sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \
1919 -e "s#/usr/share/wcc#$out/share/wcc#"
20+
21+ sed -i -e '/stropts.h>/d' src/wsh/include/libwitch/wsh.h
2022 '';
2123
2224 installFlags = [ "DESTDIR=$(out)" ];
pkgs/development/compilers/z88dk/default.nix+4−4
@@ -1,14 +1,14 @@
11{ fetchFromGitHub, stdenv, makeWrapper, unzip, libxml2, m4, uthash, which }:
22
33stdenv.mkDerivation rec {
4− pname = "z88dk";
5− version = "unstable-2019-05-09";
4+ pname = "z88dk-unstable";
5+ version = "2020-01-27";
66
77 src = fetchFromGitHub {
88 owner = "z88dk";
99 repo = "z88dk";
10− rev = "826d68632c3a7c17df88dd2ec54571a6041da69c";
11− sha256 = "104qgb01sdb97mkcxnq1cdlqi5qvjm4rd9bg5r42pdfz81ss49xj";
10+ rev = "efdd07c2e2229cac7cfef97ec01f478004846e39";
11+ sha256 = "0jcks5ygp256lmzmllffp4yb38cxjgdyqnnimkj4s65095cfasyb";
1212 fetchSubmodules = true;
1313 };
1414
pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patchnew file+23
@@ -0,0 +1,23 @@
1+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
2+index c3682b4..16826c6 100644
3+--- a/Modules/posixmodule.c
4++++ b/Modules/posixmodule.c
5+@@ -5880,15 +5880,13 @@ error:
6+ #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX)
7+ #ifdef HAVE_PTY_H
8+ #include <pty.h>
9+-#else
10++#endif
11+ #ifdef HAVE_LIBUTIL_H
12+ #include <libutil.h>
13+-#else
14++#endif
15+ #ifdef HAVE_UTIL_H
16+ #include <util.h>
17+-#endif /* HAVE_UTIL_H */
18+-#endif /* HAVE_LIBUTIL_H */
19+-#endif /* HAVE_PTY_H */
20++#endif
21+ #ifdef HAVE_STROPTS_H
22+ #include <stropts.h>
23+ #endif
pkgs/development/interpreters/python/cpython/default.nix+1−4
@@ -103,10 +103,7 @@ in with passthru; stdenv.mkDerivation {
103103 ./3.5/ld_library_path.patch
104104 ] ++ optionals (isPy37 || isPy38) [
105105 # Fix darwin build https://bugs.python.org/issue34027
106− (fetchpatch {
107− url = https://bugs.python.org/file47666/darwin-libutil.patch;
108− sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa";
109− })
106+ ./3.7/darwin-libutil.patch
110107 ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [
111108 # Fix for http://bugs.python.org/issue1222585
112109 # Upstream distutils is calling C compiler to compile C++ code, which
pkgs/development/libraries/glibc/CVE-2018-11236.patchdeleted−146
@@ -1,146 +0,0 @@
1−From 5460617d1567657621107d895ee2dd83bc1f88f2 Mon Sep 17 00:00:00 2001
2−From: Paul Pluzhnikov <ppluzhnikov@google.com>
3−Date: Tue, 8 May 2018 18:12:41 -0700
4−Subject: [PATCH] Fix BZ 22786: integer addition overflow may cause stack
5− buffer overflow when realpath() input length is close to SSIZE_MAX.
6−
7−2018-05-09 Paul Pluzhnikov <ppluzhnikov@google.com>
8−
9− [BZ #22786]
10− * stdlib/canonicalize.c (__realpath): Fix overflow in path length
11− computation.
12− * stdlib/Makefile (test-bz22786): New test.
13− * stdlib/test-bz22786.c: New test.
14−---
15− ChangeLog | 8 +++++
16− stdlib/Makefile | 2 +-
17− stdlib/canonicalize.c | 2 +-
18− stdlib/test-bz22786.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
19− 4 files changed, 100 insertions(+), 2 deletions(-)
20− create mode 100644 stdlib/test-bz22786.c
21−
22−diff --git a/stdlib/Makefile b/stdlib/Makefile
23−index af1643c..1ddb1f9 100644
24−--- a/stdlib/Makefile
25−+++ b/stdlib/Makefile
26−@@ -84,7 +84,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
27− tst-cxa_atexit tst-on_exit test-atexit-race \
28− test-at_quick_exit-race test-cxa_atexit-race \
29− test-on_exit-race test-dlclose-exit-race \
30−- tst-makecontext-align
31−+ tst-makecontext-align test-bz22786
32−
33− tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \
34− tst-tls-atexit tst-tls-atexit-nodelete
35−diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
36−index 4135f3f..390fb43 100644
37−--- a/stdlib/canonicalize.c
38−+++ b/stdlib/canonicalize.c
39−@@ -181,7 +181,7 @@ __realpath (const char *name, char *resolved)
40− extra_buf = __alloca (path_max);
41−
42− len = strlen (end);
43−- if ((long int) (n + len) >= path_max)
44−+ if (path_max - n <= len)
45− {
46− __set_errno (ENAMETOOLONG);
47− goto error;
48−diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c
49−new file mode 100644
50−index 0000000..e7837f9
51−--- /dev/null
52−+++ b/stdlib/test-bz22786.c
53−@@ -0,0 +1,90 @@
54−+/* Bug 22786: test for buffer overflow in realpath.
55−+ Copyright (C) 2018 Free Software Foundation, Inc.
56−+ This file is part of the GNU C Library.
57−+
58−+ The GNU C Library is free software; you can redistribute it and/or
59−+ modify it under the terms of the GNU Lesser General Public
60−+ License as published by the Free Software Foundation; either
61−+ version 2.1 of the License, or (at your option) any later version.
62−+
63−+ The GNU C Library is distributed in the hope that it will be useful,
64−+ but WITHOUT ANY WARRANTY; without even the implied warranty of
65−+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
66−+ Lesser General Public License for more details.
67−+
68−+ You should have received a copy of the GNU Lesser General Public
69−+ License along with the GNU C Library; if not, see
70−+ <http://www.gnu.org/licenses/>. */
71−+
72−+/* This file must be run from within a directory called "stdlib". */
73−+
74−+#include <errno.h>
75−+#include <limits.h>
76−+#include <stdio.h>
77−+#include <stdlib.h>
78−+#include <string.h>
79−+#include <unistd.h>
80−+#include <sys/stat.h>
81−+#include <sys/types.h>
82−+#include <support/test-driver.h>
83−+#include <libc-diag.h>
84−+
85−+static int
86−+do_test (void)
87−+{
88−+ const char dir[] = "bz22786";
89−+ const char lnk[] = "bz22786/symlink";
90−+
91−+ rmdir (dir);
92−+ if (mkdir (dir, 0755) != 0 && errno != EEXIST)
93−+ {
94−+ printf ("mkdir %s: %m\n", dir);
95−+ return EXIT_FAILURE;
96−+ }
97−+ if (symlink (".", lnk) != 0 && errno != EEXIST)
98−+ {
99−+ printf ("symlink (%s, %s): %m\n", dir, lnk);
100−+ return EXIT_FAILURE;
101−+ }
102−+
103−+ const size_t path_len = (size_t) INT_MAX + 1;
104−+
105−+ DIAG_PUSH_NEEDS_COMMENT;
106−+#if __GNUC_PREREQ (7, 0)
107−+ /* GCC 7 warns about too-large allocations; here we need such
108−+ allocation to succeed for the test to work. */
109−+ DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than=");
110−+#endif
111−+ char *path = malloc (path_len);
112−+ DIAG_POP_NEEDS_COMMENT;
113−+
114−+ if (path == NULL)
115−+ {
116−+ printf ("malloc (%zu): %m\n", path_len);
117−+ return EXIT_UNSUPPORTED;
118−+ }
119−+
120−+ /* Construct very long path = "bz22786/symlink/aaaa....." */
121−+ char *p = mempcpy (path, lnk, sizeof (lnk) - 1);
122−+ *(p++) = '/';
123−+ memset (p, 'a', path_len - (path - p) - 2);
124−+ p[path_len - (path - p) - 1] = '\0';
125−+
126−+ /* This call crashes before the fix for bz22786 on 32-bit platforms. */
127−+ p = realpath (path, NULL);
128−+
129−+ if (p != NULL || errno != ENAMETOOLONG)
130−+ {
131−+ printf ("realpath: %s (%m)", p);
132−+ return EXIT_FAILURE;
133−+ }
134−+
135−+ /* Cleanup. */
136−+ unlink (lnk);
137−+ rmdir (dir);
138−+
139−+ return 0;
140−+}
141−+
142−+#define TEST_FUNCTION do_test
143−+#include <support/test-driver.c>
144−--
145−2.9.3
146−
pkgs/development/libraries/glibc/CVE-2018-11237.patchdeleted−55
@@ -1,55 +0,0 @@
1−From f51c8367685dc888a02f7304c729ed5277904aff Mon Sep 17 00:00:00 2001
2−From: Andreas Schwab <schwab@suse.de>
3−Date: Thu, 24 May 2018 14:39:18 +0200
4−Subject: [PATCH] Don't write beyond destination in
5− __mempcpy_avx512_no_vzeroupper (bug 23196)
6−
7−When compiled as mempcpy, the return value is the end of the destination
8−buffer, thus it cannot be used to refer to the start of it.
9−
10−(cherry picked from commit 9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e)
11−---
12− ChangeLog | 9 +++++++++
13− NEWS | 7 +++++++
14− string/test-mempcpy.c | 1 +
15− sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++--
16− 4 files changed, 20 insertions(+), 2 deletions(-)
17−
18−diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c
19−index c08fba8..d98ecdd 100644
20−--- a/string/test-mempcpy.c
21−+++ b/string/test-mempcpy.c
22−@@ -18,6 +18,7 @@
23− <http://www.gnu.org/licenses/>. */
24−
25− #define MEMCPY_RESULT(dst, len) (dst) + (len)
26−+#define MIN_PAGE_SIZE 131072
27− #define TEST_MAIN
28− #define TEST_NAME "mempcpy"
29− #include "test-string.h"
30−diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
31−index 23c0f7a..effc3ac 100644
32−--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
33−+++ b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
34−@@ -336,6 +336,7 @@ L(preloop_large):
35− vmovups (%rsi), %zmm4
36− vmovups 0x40(%rsi), %zmm5
37−
38−+ mov %rdi, %r11
39− /* Align destination for access with non-temporal stores in the loop. */
40− mov %rdi, %r8
41− and $-0x80, %rdi
42−@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop):
43− cmp $256, %rdx
44− ja L(gobble_256bytes_nt_loop)
45− sfence
46−- vmovups %zmm4, (%rax)
47−- vmovups %zmm5, 0x40(%rax)
48−+ vmovups %zmm4, (%r11)
49−+ vmovups %zmm5, 0x40(%r11)
50− jmp L(check)
51−
52− L(preloop_large_bkw):
53−--
54−2.9.3
55−
pkgs/development/libraries/glibc/common.nix+16−27
@@ -19,10 +19,12 @@
1919
2020{ stdenv, lib
2121, buildPackages
22−, fetchurl, fetchpatch
22+, fetchurl
2323, linuxHeaders ? null
2424, gd ? null, libpng ? null
25+, libidn2
2526, bison
27+, python3
2628}:
2729
2830{ name
@@ -34,9 +36,9 @@
3436} @ args:
3537
3638let
37− version = "2.27";
39+ version = "2.30";
3840 patchSuffix = "";
39− sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji";
41+ sha256 = "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72";
4042in
4143
4244assert withLinuxHeaders -> linuxHeaders != null;
@@ -92,35 +94,13 @@ stdenv.mkDerivation ({
9294 url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";
9395 sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4";
9496 })
95−
96− # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5460617d1567657621107d895ee2dd83bc1f88f2
97− ./CVE-2018-11236.patch
98− # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff
99− ./CVE-2018-11237.patch
100−
101− # Remove after upgrading to glibc 2.28+
102− # Change backported from upstream
103− # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9c79cec8cd2a6996a73aa83d79b360ffd4bebde6
104− ./fix-out-of-bounds-access-in-findidxwc.patch
105−
106− # Remove after upgrading to glibc 2.28+
107− # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=21526a507df8f1b2e37492193a754534d8938c0b
108− ./fix-out-of-bounds-access-in-ibm-1390-converter.patch
10997 ]
11098 ++ lib.optionals stdenv.isx86_64 [
11199 ./fix-x64-abi.patch
112100 ./2.27-CVE-2019-19126.patch
113101 ]
114102 ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
115− ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
116−
117− # Remove after upgrading to glibc 2.28+
118− ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform || stdenv.hostPlatform.isMusl) (fetchpatch {
119− url = "https://sourceware.org/git/?p=glibc.git;a=patch;h=780684eb04298977bc411ebca1eadeeba4877833";
120− name = "correct-pwent-parsing-issue-and-resulting-build.patch";
121− sha256 = "08fja894vzaj8phwfhsfik6jj2pbji7kypy3q8pgxvsd508zdv1q";
122− excludes = [ "ChangeLog" ];
123− });
103+ ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;
124104
125105 postPatch =
126106 ''
@@ -131,6 +111,15 @@ stdenv.mkDerivation ({
131111 # nscd needs libgcc, and we don't want it dynamically linked
132112 # because we don't want it to depend on bootstrap-tools libs.
133113 echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile
114+
115+ # Ensure that libidn2 is found.
116+ patch -p 1 <<EOF
117+ --- a/inet/idna.c
118+ +++ b/inet/idna.c
119+ @@ -25,1 +25,1 @@
120+ -#define LIBIDN2_SONAME "libidn2.so.0"
121+ +#define LIBIDN2_SONAME "${lib.getLib libidn2}/lib/libidn2.so.0"
122+ EOF
134123 '';
135124
136125 configureFlags =
@@ -162,7 +151,7 @@ stdenv.mkDerivation ({
162151 outputs = [ "out" "bin" "dev" "static" ];
163152
164153 depsBuildBuild = [ buildPackages.stdenv.cc ];
165− nativeBuildInputs = [ bison ];
154+ nativeBuildInputs = [ bison python3 ];
166155 buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
167156
168157 # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patchdeleted−26
@@ -1,26 +0,0 @@
1−diff -ur glibc-2.27/locale/weightwc.h glibc-2.27-patched/locale/weightwc.h
2−--- glibc-2.27/locale/weightwc.h 2018-02-02 01:17:18.000000000 +0900
3−+++ glibc-2.27-patched/locale/weightwc.h 2020-01-12 04:54:16.044440602 +0900
4−@@ -94,19 +94,19 @@
5− if (cp[cnt] != usrc[cnt])
6− break;
7−
8−- if (cnt < nhere - 1)
9−+ if (cnt < nhere - 1 || cnt == len)
10− {
11− cp += 2 * nhere;
12− continue;
13− }
14−
15−- if (cp[nhere - 1] > usrc[nhere -1])
16−+ if (cp[nhere - 1] > usrc[nhere - 1])
17− {
18− cp += 2 * nhere;
19− continue;
20− }
21−
22−- if (cp[2 * nhere - 1] < usrc[nhere -1])
23−+ if (cp[2 * nhere - 1] < usrc[nhere - 1])
24− {
25− cp += 2 * nhere;
26− continue;
pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patchdeleted−35
@@ -1,35 +0,0 @@
1−From 21526a507df8f1b2e37492193a754534d8938c0b Mon Sep 17 00:00:00 2001
2−From: Andreas Schwab <schwab@suse.de>
3−Date: Tue, 24 Jul 2018 14:08:34 +0200
4−Subject: [PATCH] Fix out-of-bounds access in IBM-1390 converter (bug 23448)
5−
6−The IBM-1390 converter can consume/produce two UCS4 characters in each
7−loop.
8−---
9− ChangeLog | 6 ++++++
10− iconvdata/ibm1364.c | 2 ++
11− 2 files changed, 8 insertions(+)
12−
13−diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c
14−index b833273..517fe60 100644
15−--- a/iconvdata/ibm1364.c
16−+++ b/iconvdata/ibm1364.c
17−@@ -150,6 +150,7 @@ enum
18− #define MIN_NEEDED_INPUT MIN_NEEDED_FROM
19− #define MAX_NEEDED_INPUT MAX_NEEDED_FROM
20− #define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
21−+#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
22− #define LOOPFCT FROM_LOOP
23− #define BODY \
24− { \
25−@@ -296,6 +297,7 @@ enum
26−
27− /* Next, define the other direction. */
28− #define MIN_NEEDED_INPUT MIN_NEEDED_TO
29−+#define MAX_NEEDED_INPUT MAX_NEEDED_TO
30− #define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
31− #define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
32− #define LOOPFCT TO_LOOP
33−--
34−2.9.3
35−
pkgs/development/libraries/libffi/default.nix+2−2
@@ -1,9 +1,9 @@
11{ stdenv, fetchurl, fetchpatch
22, autoreconfHook
33
4−# libffi is used in darwin stdenv
4+# libffi is used in darwin and linux with glibc stdenv
55# we cannot run checks within it
6−, doCheck ? !stdenv.isDarwin, dejagnu
6+, doCheck ? stdenv.hostPlatform.isMusl, dejagnu
77}:
88
99stdenv.mkDerivation rec {
pkgs/development/libraries/libmilter/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 sh Build -f ./a.m4
3232 '';
3333
34− patches = [ ./install.patch ./sharedlib.patch ];
34+ patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ];
3535
3636 nativeBuildInputs = [ m4 ];
3737
pkgs/development/libraries/libmilter/glibc-2.30.patchnew file+44
@@ -0,0 +1,44 @@
1+diff --git a/libmilter/sm_gethost.c b/libmilter/sm_gethost.c
2+index 2423c34..f00468c 100644
3+--- a/libmilter/sm_gethost.c
4++++ b/libmilter/sm_gethost.c
5+@@ -52,16 +52,8 @@ sm_getipnodebyname(name, family, flags, err)
6+ bool resv6 = true;
7+ struct hostent *h;
8+
9+- if (family == AF_INET6)
10+- {
11+- /* From RFC2133, section 6.1 */
12+- resv6 = bitset(RES_USE_INET6, _res.options);
13+- _res.options |= RES_USE_INET6;
14+- }
15+ SM_SET_H_ERRNO(0);
16+- h = gethostbyname(name);
17+- if (family == AF_INET6 && !resv6)
18+- _res.options &= ~RES_USE_INET6;
19++ h = gethostbyname2(name, family);
20+
21+ /* the function is supposed to return only the requested family */
22+ if (h != NULL && h->h_addrtype != family)
23+diff --git a/sendmail/conf.c b/sendmail/conf.c
24+index c73334e..500dafb 100644
25+--- a/sendmail/conf.c
26++++ b/sendmail/conf.c
27+@@ -4243,16 +4243,8 @@ sm_getipnodebyname(name, family, flags, err)
28+ # else /* HAS_GETHOSTBYNAME2 */
29+ bool resv6 = true;
30+
31+- if (family == AF_INET6)
32+- {
33+- /* From RFC2133, section 6.1 */
34+- resv6 = bitset(RES_USE_INET6, _res.options);
35+- _res.options |= RES_USE_INET6;
36+- }
37+ SM_SET_H_ERRNO(0);
38+- h = gethostbyname(name);
39+- if (!resv6)
40+- _res.options &= ~RES_USE_INET6;
41++ h = gethostbyname2(name, family);
42+
43+ /* the function is supposed to return only the requested family */
44+ if (h != NULL && h->h_addrtype != family)
pkgs/development/libraries/libunistring/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 "--with-libiconv-prefix=${libiconv}"
1818 ];
1919
20− doCheck = true;
20+ doCheck = false;
2121
2222 /* This seems to cause several random failures like these, which I assume
2323 is because of bad or missing target dependencies in their build system:
pkgs/development/libraries/seasocks/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, python, zlib }:
1+{ stdenv, fetchFromGitHub, cmake, python, zlib, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "seasocks";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
1111 sha256 = "1c2gc0k9wgbgn7y7wmq2ylp0gvdbmagc1x8c4jwbsncl1gy6x4g2";
1212 };
1313
14+ patches = [
15+ (fetchpatch {
16+ url = "https://github.com/mattgodbolt/seasocks/commit/5753b50ce3b2232d166843450043f88a4a362422.patch";
17+ sha256 = "1c20xjma8jdgcr5m321srpmys6b4jvqkazfqr668km3r2ck5xncl";
18+ })
19+ ];
20+
1421 nativeBuildInputs = [ cmake ];
1522 buildInputs = [ zlib python ];
1623
pkgs/development/tools/analysis/coz/default.nix+4
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
1616 sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc";
1717 };
1818
19+ postPatch = ''
20+ sed -i -e '/pid_t gettid/,+2d' libcoz/ccutil/thread.h
21+ '';
22+
1923 postConfigure = ''
2024 # This is currently hard-coded. Will be fixed in the next release.
2125 sed -e "s|/usr/lib/|$out/lib/|" -i ./coz
pkgs/development/tools/analysis/eresi/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, which, openssl, readline }:
1+{ stdenv, lib, fetchFromGitHub, which, openssl, readline, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 pname = "eresi";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
1111 sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625";
1212 };
1313
14+ patches = [
15+ (fetchpatch {
16+ url = "https://github.com/thorkill/eresi/commit/a79406344cc21d594d27fa5ec5922abe9f7475e7.patch";
17+ sha256 = "1mjjc6hj7r06iarvai7prcdvjk9g0k5vwrmkwcm7b8ivd5xzxp2z";
18+ })
19+ ];
20+
1421 postPatch = ''
1522 # Two occurences of fprintf() with only two arguments, which should really
1623 # be fputs().
pkgs/development/tools/analysis/rr/default.nix+4−4
@@ -1,14 +1,14 @@
1−{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }:
1+{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python3Packages, which, procps, gdb, capnproto }:
22
33stdenv.mkDerivation rec {
4− version = "5.2.0";
4+ version = "5.3.0";
55 pname = "rr";
66
77 src = fetchFromGitHub {
88 owner = "mozilla";
99 repo = "rr";
1010 rev = version;
11− sha256 = "19jsnm8n2smalx2z60x9d8f6g4kdm7zghwyjfvwcxnslk1vn9dkc";
11+ sha256 = "1x6l1xsdksnhz9v50p4r7hhmr077cq20kaywqy1jzdklvkjqzf64";
1212 };
1313
1414 postPatch = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 nativeBuildInputs = [ pkgconfig ];
2525 buildInputs = [
26− cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto
26+ cmake libpfm zlib python3Packages.python python3Packages.pexpect which procps gdb capnproto
2727 ];
2828 propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime
2929 cmakeFlags = [
pkgs/development/tools/gnulib/default.nix+3−3
@@ -2,12 +2,12 @@
22
33stdenv.mkDerivation {
44 pname = "gnulib";
5− version = "20190326";
5+ version = "20190811";
66
77 src = fetchgit {
88 url = https://git.savannah.gnu.org/r/gnulib.git;
9− rev = "a18f7ce3c0aa760c33d46bbeb8e5b3a14cf24984";
10− sha256 = "04py5n3j17wyqv9wfsslcrxzapni9vmw6p5g0adzy2md3ygjw4x4";
9+ rev = "6430babe47ece6953cf18ef07c1d8642c8588e89";
10+ sha256 = "14kgykbjly03dlb25sllcfcrpk7zkypa449gr3zbqv4rhpmnzizg";
1111 };
1212
1313 dontFixup = true;
pkgs/development/tools/misc/gnum4/default.nix+8−1
@@ -13,7 +13,14 @@ stdenv.mkDerivation {
1313 configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ];
1414
1515 # Upstream is aware of it; it may be in the next release.
16− patches = [ ./s_isdir.patch ]
16+ patches =
17+ [
18+ ./s_isdir.patch
19+ (fetchurl {
20+ url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch";
21+ sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk";
22+ })
23+ ]
1724 ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
1825
1926 meta = {
pkgs/development/tools/misc/intel-gpu-tools/default.nix+5−4
@@ -1,20 +1,21 @@
11{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
22, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
3−, procps, utilmacros, gtk-doc, openssl, peg }:
3+, procps, utilmacros, gtk-doc, openssl, peg, elfutils
4+}:
45
56stdenv.mkDerivation rec {
67 pname = "intel-gpu-tools";
7− version = "1.23";
8+ version = "1.24";
89
910 src = fetchurl {
1011 url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz";
11− sha256 = "1l4s95m013p2wvddwr4cjqyvsgmc88zxx2887p1fbb1va5n0hjsd";
12+ sha256 = "1gr1m18w73hmh6n9w2f6gky21qc0pls14bgxkhy95z7azrr7qdap";
1213 };
1314
1415 nativeBuildInputs = [ pkgconfig utilmacros ];
1516 buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
1617 libXext libXv libXrandr glib bison libunwind python3 procps
17− gtk-doc openssl peg ];
18+ gtk-doc openssl peg elfutils ];
1819
1920 NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ];
2021
pkgs/os-specific/linux/drbd/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0";
99 };
1010
11− patches = [ ./pass-force.patch ];
11+ patches = [ ./pass-force.patch ./fix-glibc-compilation.patch ];
1212
1313 nativeBuildInputs = [ flex ];
1414 buildInputs = [ perl ];
pkgs/os-specific/linux/drbd/fix-glibc-compilation.patchnew file+24
@@ -0,0 +1,24 @@
1+diff --git a/user/drbdadm_adjust.c b/user/drbdadm_adjust.c
2+index cb23270..3a751ca 100644
3+--- a/user/drbdadm_adjust.c
4++++ b/user/drbdadm_adjust.c
5+@@ -29,6 +29,7 @@
6+ #include <sys/types.h>
7+ #include <sys/stat.h>
8+ #include <sys/wait.h>
9++#include <sys/sysmacros.h>
10+ #include <unistd.h>
11+ #include <fcntl.h>
12+
13+diff --git a/user/legacy/drbdadm_adjust.c b/user/legacy/drbdadm_adjust.c
14+index c79163c..6990ffb 100644
15+--- a/user/legacy/drbdadm_adjust.c
16++++ b/user/legacy/drbdadm_adjust.c
17+@@ -27,6 +27,7 @@
18+ #include <sys/types.h>
19+ #include <sys/stat.h>
20+ #include <sys/wait.h>
21++#include <sys/sysmacros.h>
22+ #include <unistd.h>
23+ #include <fcntl.h>
24+
pkgs/os-specific/linux/jfbview/default.nix+5
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
2424 sha256 = "09rcmlf04aka0yzr25imadi0fl4nlbsxcahs7fhvzx4nql4halqw";
2525 };
2626
27+ postPatch = ''
28+ substituteInPlace main.cpp \
29+ --replace "<stropts.h>" "<sys/ioctl.h>"
30+ '';
31+
2732 hardeningDisable = [ "format" ];
2833
2934 buildInputs = [
pkgs/os-specific/linux/policycoreutils/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 substituteInPlace po/Makefile \
1616 --replace /usr/bin/install install --replace /usr/share /share
1717 substituteInPlace newrole/Makefile --replace /usr/share /share
18+
19+ sed -i -e '39i#include <crypt.h>' run_init/run_init.c
1820 '';
1921
2022 nativeBuildInputs = [ gettext ];
pkgs/os-specific/linux/tiscamera/allow-pipeline-stop-in-trigger-mode.patchdeleted−48
@@ -1,48 +0,0 @@
1−diff --git a/src/gstreamer-1.0/gsttcamsrc.cpp b/src/gstreamer-1.0/gsttcamsrc.cpp
2−index d482e1e..e36afd8 100644
3−--- a/src/gstreamer-1.0/gsttcamsrc.cpp
4−+++ b/src/gstreamer-1.0/gsttcamsrc.cpp
5−@@ -1112,6 +1112,7 @@ bool gst_tcam_src_init_camera (GstTcamSrc* self)
6−
7− static void gst_tcam_src_close_camera (GstTcamSrc* self)
8− {
9−+ GST_INFO("Closing device");
10− if (self->device != NULL)
11− {
12− self->device->dev->stop_stream();
13−@@ -1156,7 +1157,7 @@ static gboolean gst_tcam_src_stop (GstBaseSrc* src)
14−
15− self->device->dev->stop_stream();
16− gst_element_send_event(GST_ELEMENT(self), gst_event_new_eos());
17−- GST_DEBUG_OBJECT (self, "Stopped acquisition");
18−+ GST_DEBUG("Stopped acquisition");
19−
20− return TRUE;
21− }
22−@@ -1556,6 +1557,18 @@ static void gst_tcam_src_get_property (GObject* object,
23− }
24−
25−
26−+static gboolean gst_tcam_src_unlock (GstBaseSrc* src)
27−+{
28−+ GstTcamSrc* self = GST_TCAM_SRC(src);
29−+
30−+ self->is_running = FALSE;
31−+
32−+ self->cv.notify_all();
33−+
34−+ return TRUE;
35−+}
36−+
37−+
38− static void gst_tcam_src_class_init (GstTcamSrcClass* klass)
39− {
40− GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
41−@@ -1616,6 +1629,7 @@ static void gst_tcam_src_class_init (GstTcamSrcClass* klass)
42− gstbasesrc_class->fixate = gst_tcam_src_fixate_caps;
43− gstbasesrc_class->start = gst_tcam_src_start;
44− gstbasesrc_class->stop = gst_tcam_src_stop;
45−+ gstbasesrc_class->unlock = gst_tcam_src_unlock;
46− gstbasesrc_class->negotiate = gst_tcam_src_negotiate;
47− gstbasesrc_class->get_times = gst_tcam_src_get_times;
48−
pkgs/os-specific/linux/tiscamera/default.nix+16−9
@@ -11,17 +11,23 @@
1111, gobject-introspection
1212, gst_all_1
1313, libwebcam
14+, libunwind
15+, gstreamer
16+, elfutils
17+, orc
18+, python3
19+, libuuid
1420}:
1521
1622stdenv.mkDerivation rec {
1723 pname = "tiscamera";
18− version = "0.9.1";
24+ version = "0.11.1";
1925
2026 src = fetchFromGitHub {
2127 owner = "TheImagingSource";
2228 repo = pname;
2329 rev = "v-${pname}-${version}";
24− sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87";
30+ sha256 = "07vp6khgl6qd3a4519dmx1s5bfw7pld793p50pjn29fqh91fm93g";
2531 };
2632
2733 nativeBuildInputs = [
@@ -39,6 +45,12 @@ stdenv.mkDerivation rec {
3945 gst_all_1.gstreamer
4046 gst_all_1.gst-plugins-base
4147 libwebcam
48+ libunwind
49+ gstreamer
50+ elfutils
51+ orc
52+ python3
53+ libuuid
4254 ];
4355
4456
@@ -50,13 +62,8 @@ stdenv.mkDerivation rec {
5062 "-DBUILD_LIBUSB=ON"
5163 ];
5264
53−
54− patches = [
55− ./allow-pipeline-stop-in-trigger-mode.patch # To be removed next release.
56− ];
57−
5865 postPatch = ''
59− substituteInPlace ./data/udev/80-theimagingsource-cameras.rules \
66+ substituteInPlace ./data/udev/80-theimagingsource-cameras.rules.in \
6067 --replace "/usr/bin/uvcdynctrl" "${libwebcam}/bin/uvcdynctrl" \
6168 --replace "/path/to/tiscamera/uvc-extensions" "$out/share/uvcdynctrl/data/199e"
6269
@@ -94,4 +101,4 @@ stdenv.mkDerivation rec {
94101 platforms = platforms.linux;
95102 maintainers = with maintainers; [ jraygauthier ];
96103 };
97−}
104+}
pkgs/servers/diod/default.nix+1
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 postPatch = ''
1515 substituteInPlace diod/xattr.c --replace attr/xattr.h sys/xattr.h
16+ sed -i -e '/sys\/types\.h>/a #include <sys/sysmacros.h>' diod/ops.c
1617 '';
1718
1819 buildInputs = [ munge lua libcap perl ncurses ];
pkgs/servers/foundationdb/default.nix+6
@@ -24,6 +24,11 @@ let
2424 sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an";
2525 };
2626
27+ glibc230-fix = fetchpatch {
28+ url = "https://github.com/Ma27/foundationdb/commit/e133cb974b9a9e4e1dc2d4ac15881d31225c0197.patch";
29+ sha256 = "1v9q2fyc73msigcykjnbmfig45zcrkrzcg87b0r6mxpnby8iryl1";
30+ };
31+
2732in with builtins; {
2833
2934 # Older versions use the bespoke 'vsmake' build system
@@ -78,6 +83,7 @@ in with builtins; {
7883 patches = [
7984 ./patches/clang-libcxx.patch
8085 ./patches/suppress-clang-warnings.patch
86+ glibc230-fix
8187 ];
8288 };
8389
pkgs/servers/gpsd/default.nix+4
@@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
4242 ./0002-scons-envs-patch.patch
4343 ];
4444
45+ postPatch = ''
46+ sed -i -e '17i#include <sys/sysmacros.h>' serial.c
47+ '';
48+
4549 # - leapfetch=no disables going online at build time to fetch leap-seconds
4650 # info. See <gpsd-src>/build.txt for more info.
4751 preBuild = ''
pkgs/servers/http/lwan/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "lwan";
5− version = "0.2";
5+ version = "0.3";
66
77 src = fetchFromGitHub {
88 owner = "lpereira";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1z1g6bmdsf7zj809sq6jqkpzkdnx1jch84kk67h0v2x6lxhdpv5r";
11+ sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr";
1212 };
1313
1414 nativeBuildInputs = [ cmake pkgconfig ];
pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patchnew file+34
@@ -0,0 +1,34 @@
1+From a6a61d0dc018101a9a8d0a664f31140d7e38db0e Mon Sep 17 00:00:00 2001
2+From: Maximilian Bosch <maximilian@mbosch.me>
3+Date: Fri, 17 Jan 2020 01:42:40 +0100
4+Subject: [PATCH] Fix build with glibc 2.30
5+
6+https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923
7+---
8+ src/dns/dns_str_resflags.c | 6 ++++++
9+ 1 file changed, 6 insertions(+)
10+
11+diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c
12+index 5f2cce5..df32345 100644
13+--- a/src/dns/dns_str_resflags.c
14++++ b/src/dns/dns_str_resflags.c
15+@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = {
16+ "RES_DEFNAMES", RES_DEFNAMES,
17+ "RES_STAYOPEN", RES_STAYOPEN,
18+ "RES_DNSRCH", RES_DNSRCH,
19++#ifdef RES_INSECURE1
20+ "RES_INSECURE1", RES_INSECURE1,
21++#endif
22++#ifdef RES_INSECURE2
23+ "RES_INSECURE2", RES_INSECURE2,
24++#endif
25+ "RES_NOALIASES", RES_NOALIASES,
26++#ifdef RES_USE_INET6
27+ "RES_USE_INET6", RES_USE_INET6,
28++#endif
29+ #ifdef RES_ROTATE
30+ "RES_ROTATE", RES_ROTATE,
31+ #endif
32+--
33+2.23.1
34+
pkgs/servers/mail/postfix/default.nix+1
@@ -48,6 +48,7 @@ in stdenv.mkDerivation rec {
4848 ./postfix-3.0-no-warnings.patch
4949 ./post-install-script.patch
5050 ./relative-symlinks.patch
51+ ./0001-Fix-build-with-glibc-2.30.patch
5152 ];
5253
5354 postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
pkgs/servers/prayer/default.nix+1
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
3535 Config
3636 sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \
3737 templates/src/*.pl
38+ sed -i -e '/<stropts.h>/d' lib/os_linux.h
3839 '' + /* html-tidy updates */ ''
3940 substituteInPlace ./session/html_secure_tidy.c \
4041 --replace buffio.h tidybuffio.h
pkgs/stdenv/linux/bootstrap-files/aarch64.nix+2−2
@@ -5,7 +5,7 @@
55 executable = true;
66 };
77 bootstrapTools = import <nix/fetchurl.nix> {
8− url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/bootstrap-tools.tar.xz;
9− sha256 = "1075d5n4yclbhgisi6ba50601mw3fhivlkjs462qlnq8hh0xc7nq";
8+ url = http://tarballs.nixos.org/stdenv-linux/aarch64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz;
9+ sha256 = "d3f1bf2a1495b97f45359d5623bdb1f8eb75db43d3bf2059fc127b210f059358";
1010 };
1111}
pkgs/stdenv/linux/bootstrap-files/i686.nix+2−2
@@ -6,7 +6,7 @@
66 };
77
88 bootstrapTools = import <nix/fetchurl.nix> {
9− url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
10− sha256 = "cf920d26d94335f5cb46e247455d0e5389765d16a2b8fc233b792a655b5b58aa";
9+ url = http://tarballs.nixos.org/stdenv-linux/i686/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz;
10+ sha256 = "b9bf20315f8c5c0411679c5326084420b522046057a0850367c67d9514794f1c";
1111 };
1212}
pkgs/stdenv/linux/bootstrap-files/x86_64.nix+2−2
@@ -3,7 +3,7 @@
33
44{
55 bootstrapTools = import <nix/fetchurl.nix> {
6− url = http://tarballs.nixos.org/stdenv-linux/x86_64/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/bootstrap-tools.tar.xz;
7− sha256 = "abe3f0727dd771a60b7922892d308da1bc7b082afc13440880862f0c8823c09f";
6+ url = http://tarballs.nixos.org/stdenv-linux/x86_64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz;
7+ sha256 = "a5ce9c155ed09397614646c9717fc7cd94b1023d7b76b618d409e4fefd6e9d39";
88 };
99}
pkgs/stdenv/linux/default.nix+26−4
@@ -226,6 +226,28 @@ in
226226 ccWrapperStdenv
227227 gcc-unwrapped coreutils gnugrep
228228 perl gnum4 bison;
229+ dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } );
230+
231+ # We need libidn2 and its dependency libunistring as glibc dependency.
232+ # To avoid the cycle, we build against bootstrap libc, nuke references,
233+ # and use the result as input for our final glibc. We also pass this pair
234+ # through, so the final package-set uses exactly the same builds.
235+ libunistring = super.libunistring.overrideAttrs (attrs: {
236+ postFixup = attrs.postFixup or "" + ''
237+ ${self.nukeReferences}/bin/nuke-refs "$out"/lib/lib*.so.*.*
238+ '';
239+ # Apparently iconv won't work with bootstrap glibc, but it will be used
240+ # with glibc built later where we keep *this* build of libunistring,
241+ # so we need to trick it into supporting libiconv.
242+ am_cv_func_iconv_works = "yes";
243+ });
244+ libidn2 = super.libidn2.overrideAttrs (attrs: {
245+ postFixup = attrs.postFixup or "" + ''
246+ ${self.nukeReferences}/bin/nuke-refs -e '${lib.getLib self.libunistring}' \
247+ "$out"/lib/lib*.so.*.*
248+ '';
249+ });
250+
229251 # This also contains the full, dynamically linked, final Glibc.
230252 binutils = prevStage.binutils.override {
231253 # Rewrap the binutils with the new glibc, so both the next
@@ -246,7 +268,7 @@ in
246268 inherit (prevStage)
247269 ccWrapperStdenv
248270 binutils coreutils gnugrep
249− perl patchelf linuxHeaders gnum4 bison;
271+ perl patchelf linuxHeaders gnum4 bison libidn2 libunistring;
250272 ${localSystem.libc} = getLibc prevStage;
251273 # Link GCC statically against GMP etc. This makes sense because
252274 # these builds of the libraries are only used by GCC, so it
@@ -276,7 +298,7 @@ in
276298 # because gcc (since JAR support) already depends on zlib, and
277299 # then if we already have a zlib we want to use that for the
278300 # other purposes (binutils and top-level pkgs) too.
279− inherit (prevStage) gettext gnum4 bison gmp perl texinfo zlib linuxHeaders;
301+ inherit (prevStage) gettext gnum4 bison gmp perl texinfo zlib linuxHeaders libidn2 libunistring;
280302 ${localSystem.libc} = getLibc prevStage;
281303 binutils = super.binutils.override {
282304 # Don't use stdenv's shell but our own
@@ -362,7 +384,7 @@ in
362384 ]
363385 # Library dependencies
364386 ++ map getLib (
365− [ attr acl zlib pcre ]
387+ [ attr acl zlib pcre libidn2 libunistring ]
366388 ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
367389 )
368390 # More complicated cases
@@ -377,7 +399,7 @@ in
377399 inherit (prevStage)
378400 gzip bzip2 xz bash coreutils diffutils findutils gawk
379401 gnumake gnused gnutar gnugrep gnupatch patchelf
380− attr acl zlib pcre;
402+ attr acl zlib pcre libunistring libidn2;
381403 ${localSystem.libc} = getLibc prevStage;
382404 } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
383405 # Need to get rid of these when cross-compiling.
pkgs/tools/archivers/sharutils/default.nix+4
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
2525 url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-2+deb9u1/debian/patches/01-fix-heap-buffer-overflow-cve-2018-1000097.patch";
2626 sha256 = "19g0sxc8g79aj5gd5idz5409311253jf2q8wqkasf0handdvsbxx";
2727 })
28+ (fetchurl {
29+ url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-4/debian/patches/02-fix-ftbfs-with-glibc-2.28.patch";
30+ sha256 = "15kpjqnfs98n6irmkh8pw7masr08xala7gx024agv7zv14722vkc";
31+ })
2832 ];
2933
3034 postPatch = let
pkgs/tools/compression/bzip2/default.nix+3
@@ -1,5 +1,6 @@
11{ stdenv, fetchurl
22, linkStatic ? (stdenv.hostPlatform.system == "i686-cygwin")
3+, autoreconfHook
34}:
45
56stdenv.mkDerivation rec {
@@ -20,6 +21,8 @@ stdenv.mkDerivation rec {
2021 sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
2122 };
2223
24+ nativeBuildInputs = [ autoreconfHook ];
25+
2326 patches = [
2427 ./CVE-2016-3189.patch
2528 ./cve-2019-12900.patch
pkgs/tools/filesystems/ext4magic/default.nix+1
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
1414 url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch;
1515 sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c";
1616 })
17+ ./glibc-fix.patch
1718 ];
1819
1920 buildInputs = [ file libuuid e2fsprogs zlib bzip2 ];
pkgs/tools/filesystems/ext4magic/glibc-fix.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/src/recover.c b/src/recover.c
2+index 41b4aee..30b5d8f 100644
3+--- a/src/recover.c
4++++ b/src/recover.c
5+@@ -24,6 +24,7 @@
6+ #include <errno.h>
7+ #include <fcntl.h>
8+ #include <utime.h>
9++#include <sys/sysmacros.h>
10+
11+ #ifndef O_LARGEFILE
12+ #define O_LARGEFILE 0
pkgs/tools/filesystems/jfsutils/default.nix+7−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libuuid, autoreconfHook }:
1+{ stdenv, fetchurl, fetchpatch, libuuid, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 name = "jfsutils-1.1.15";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
1313 ./hardening-format.patch
1414 # required for cross-compilation
1515 ./ar-fix.patch
16+ # fix for glibc>=2.28
17+ (fetchpatch {
18+ name = "add_sysmacros.patch";
19+ url = "https://sources.debian.org/data/main/j/jfsutils/1.1.15-4/debian/patches/add_sysmacros.patch";
20+ sha256 = "1qcwvxs4d0d24w5x98z59arqfx2n7f0d9xaqhjcg6w8n34vkhnyc";
21+ })
1622 ];
1723
1824 nativeBuildInputs = [ autoreconfHook ];
pkgs/tools/filesystems/udftools/default.nix+1
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424 sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c
2525 sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c
2626 sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c
27+ sed -e '46i#include <sys/sysmacros.h>' -i mkudffs/main.c
2728
2829 sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am
2930 '';
pkgs/tools/misc/expect/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, tcl, makeWrapper }:
1+{ stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 version = "5.45.4";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildInputs = [ tcl ];
13− nativeBuildInputs = [ makeWrapper ];
13+ nativeBuildInputs = [ makeWrapper autoreconfHook ];
1414
1515 hardeningDisable = [ "format" ];
1616
17− patchPhase = ''
17+ postPatch = ''
1818 sed -i "s,/bin/stty,$(type -p stty),g" configure
1919 '';
2020
pkgs/tools/misc/idutils/default.nix+1
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
5050
5151 maintainers = [ ];
5252 platforms = stdenv.lib.platforms.all;
53+ broken = true;
5354 };
5455}
pkgs/tools/misc/kermit/default.nix+1
@@ -35,5 +35,6 @@ stdenv.mkDerivation {
3535 license = licenses.bsd3;
3636 maintainers = with maintainers; [ pSub ];
3737 platforms = with platforms; linux;
38+ broken = true;
3839 };
3940}
pkgs/tools/misc/ttyrec/default.nix+1
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
2626 license = licenses.bsd3;
2727 platforms = platforms.all;
2828 maintainers = with maintainers; [ zimbatm ];
29+ broken = true; # 2020-01-28
2930 };
3031}
pkgs/tools/networking/gftp/default.nix+4
@@ -8,6 +8,10 @@ stdenv.mkDerivation {
88 sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
99 };
1010
11+ postPatch = ''
12+ sed -i -e '/<stropts.h>/d' lib/pty.c
13+ '';
14+
1115 nativeBuildInputs = [ pkgconfig ];
1216 buildInputs = [ gtk2 readline ncurses gettext openssl ];
1317
pkgs/tools/networking/ppp/default.nix+8−1
@@ -10,10 +10,17 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 patches =
13− [ ( substituteAll {
13+ [
14+ # fix for glibc>=2.28
15+ (fetchurl {
16+ url = "https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875.patch";
17+ sha256 = "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z";
18+ })
19+ ( substituteAll {
1420 src = ./nix-purity.patch;
1521 inherit libpcap;
1622 glibc = stdenv.cc.libc.dev or stdenv.cc.libc;
23+ openssl = openssl.dev;
1724 })
1825 # Without nonpriv.patch, pppd --version doesn't work when not run as
1926 # root.
pkgs/tools/networking/ppp/nix-purity.patch+12−3
@@ -1,8 +1,8 @@
11diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
2−index 060db6a..c151c62 100644
2+index 1ebebec..bf90c62 100644
33--- a/pppd/Makefile.linux
44+++ b/pppd/Makefile.linux
5−@@ -117,7 +117,7 @@ CFLAGS += -DHAS_SHADOW
5+@@ -120,7 +120,7 @@ CFLAGS += -DHAS_SHADOW
66 #LIBS += -lshadow $(LIBS)
77 endif
88
@@ -11,7 +11,16 @@ index 060db6a..c151c62 100644
1111 CFLAGS += -DHAVE_CRYPT_H=1
1212 LIBS += -lcrypt
1313 endif
14−@@ -169,7 +169,7 @@ LIBS += -ldl
14+@@ -132,7 +132,7 @@ endif
15+
16+ ifdef NEEDDES
17+ ifndef USE_CRYPT
18+-CFLAGS += -I/usr/include/openssl
19++CFLAGS += -I@openssl@/include/openssl
20+ LIBS += -lcrypto
21+ else
22+ CFLAGS += -DUSE_CRYPT=1
23+@@ -178,7 +178,7 @@ LIBS += -ldl
1524 endif
1625
1726 ifdef FILTER
pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patchnew file+25
@@ -0,0 +1,25 @@
1+From e799a7e0a64696e4ef6c088d36e4db09f8323581 Mon Sep 17 00:00:00 2001
2+From: Maximilian Bosch <maximilian@mbosch.me>
3+Date: Sun, 19 Jan 2020 22:37:04 +0100
4+Subject: [PATCH] Fix build for glibc>=2.28
5+
6+The major/minor macros are defined in <sys/sysmacros.h> now.
7+---
8+ lib/io.h | 1 +
9+ 1 file changed, 1 insertion(+)
10+
11+diff --git a/lib/io.h b/lib/io.h
12+index 8703cc8..e3d0d10 100644
13+--- a/lib/io.h
14++++ b/lib/io.h
15+@@ -33,6 +33,7 @@
16+ #include <sys/types.h>
17+ #include <sys/stat.h>
18+ #include <sys/mman.h>
19++#include <sys/sysmacros.h>
20+
21+
22+ void read_all(int fd, void *buf, size_t len);
23+--
24+2.23.1
25+
pkgs/tools/networking/xnbd/default.nix+2
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
1010
1111 sourceRoot = "${name}/trunk";
1212
13+ patches = [ ./0001-Fix-build-for-glibc-2.28.patch ];
14+
1315 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1416
1517 buildInputs = [ glib jansson ];
pkgs/tools/security/oath-toolkit/default.nix+10−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }:
1+{ stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }:
22
33let
44 securityDependency =
@@ -15,6 +15,15 @@ in stdenv.mkDerivation {
1515 sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74";
1616 };
1717
18+ patches = [
19+ # fix for glibc>=2.28
20+ (fetchpatch {
21+ name = "new_glibc_check.patch";
22+ url = "https://sources.debian.org/data/main/o/oath-toolkit/2.6.1-1.3/debian/patches/new-glibc-check.patch";
23+ sha256 = "0h75xyy3xsl485v7w27yqkks6z9sgsjmrv6wiswy15fdj5wyciv3";
24+ })
25+ ];
26+
1827 buildInputs = [ securityDependency libxml2 perl gengetopt bison ];
1928
2029 nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkgconfig ];
pkgs/top-level/all-packages.nix+4
@@ -8113,6 +8113,8 @@ in
81138113 # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
81148114 profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
81158115
8116+ enableLTO = !stdenv.isi686;
8117+
81168118 libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
81178119 threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
81188120
@@ -24479,6 +24481,8 @@ in
2447924481
2448024482 pspp = callPackage ../applications/science/math/pspp { };
2448124483
24484+ ssw = callPackage ../applications/misc/ssw { };
24485+
2448224486 pynac = callPackage ../applications/science/math/pynac { };
2448324487
2448424488 singular = callPackage ../applications/science/math/singular { };