JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71221 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2019-10-22 09:15:19 +02:00 committed by GitHub
commit d7a921cad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
91 changed files with 727 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/graphics/potrace/default.nix
View File

@ -2,17 +2,20 @@
stdenv.mkDerivation rec {
pname = "potrace";
version = "1.15";
version = "1.16";
src = fetchurl {
url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
sha256 = "17ajildjp14shsy339xarh1lw1p0k60la08ahl638a73mh23kcx9";
sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my";
};
configureFlags = [ "--with-libpotrace" ];
buildInputs = [ zlib ];
enableParallelBuilding = true;
doCheck = true;
meta = with stdenv.lib; {
homepage = http://potrace.sourceforge.net/;
description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image";

4
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -4,7 +4,7 @@
, ninja
, pkgconfig
, intltool
, vala_0_44
, vala
, wrapGAppsHook
, gcr
, libpeas
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
intltool
ninja
pkgconfig
vala_0_44
vala
wrapGAppsHook
];

4
pkgs/applications/networking/instant-messengers/wavebox/default.nix
View File

@ -8,7 +8,7 @@ with stdenv.lib;
let
bits = "x86_64";
version = "4.7.3";
version = "4.11.3";
desktopItem = makeDesktopItem rec {
name = "Wavebox";
@ -26,7 +26,7 @@ in stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23";
sha256 = "0z04071lq9bfyrlg034fmvd4346swgfhxbmsnl12m7c2m2b9z784";
};
# don't remove runtime deps

19
pkgs/build-support/kernel/make-initrd.nix
View File

@ -12,26 +12,26 @@
# `contents = {object = ...; symlink = /init;}' is a typical
# argument.
{ stdenv, perl, cpio, contents, ubootTools
{ stdenvNoCC, perl, cpio, contents, ubootTools
, name ? "initrd"
, compressor ? "gzip -9n"
, prepend ? []
, lib
}:
let
let
# !!! Move this into a public lib function, it is probably useful for others
toValidStoreName = x: with builtins;
toValidStoreName = x: with builtins;
lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x));
in stdenv.mkDerivation rec {
in stdenvNoCC.mkDerivation rec {
inherit name;
builder = ./make-initrd.sh;
makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage";
makeUInitrd = stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage";
nativeBuildInputs = [ perl cpio ]
++ stdenv.lib.optional makeUInitrd ubootTools;
++ stdenvNoCC.lib.optional makeUInitrd ubootTools;
# !!! should use XML.
objects = map (x: x.object) contents;
@ -42,12 +42,11 @@ in stdenv.mkDerivation rec {
# Note: we don't use closureInfo yet, as that won't build with nix-1.x.
# See #36268.
exportReferencesGraph =
lib.zipListsWith
(x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object])
contents
lib.zipListsWith
(x: i: [("closure-${toValidStoreName (baseNameOf x.symlink)}-${toString i}") x.object])
contents
(lib.range 0 (lib.length contents - 1));
pathsFromGraph = ./paths-from-graph.pl;
inherit compressor prepend;
}

5
pkgs/build-support/nuke-references/default.nix
View File

@ -3,10 +3,11 @@
# path (/nix/store/eeee...). This is useful for getting rid of
# dependencies that you know are not actually needed at runtime.
{ stdenv, perl }:
{ stdenvNoCC, perl }:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
name = "nuke-references";
builder = ./builder.sh;
# FIXME: get rid of perl dependency.
inherit perl;
}

9
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -19,9 +19,6 @@ assertExecutable() {
# the environment
# --unset VAR : remove VAR from the environment
# --run COMMAND : run command before the executable
# The command can push extra flags to a magic list
# variable extraFlagsArray, which are then added to
# the invocation of the executable
# --add-flags FLAGS : add FLAGS to invocation of executable
# --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP
@ -109,12 +106,8 @@ makeWrapper() {
fi
done
# Note: extraFlagsArray is an array containing additional flags
# that may be set by --run actions.
# Silence warning about unexpanded extraFlagsArray:
# shellcheck disable=SC2016
echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \
"$flagsBefore" '"${extraFlagsArray[@]}"' '"$@"' >> "$wrapper"
"$flagsBefore" '"$@"' >> "$wrapper"
chmod +x "$wrapper"
}

3
pkgs/desktops/gnome-3/default.nix
View File

@ -24,7 +24,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
gnome3 = self // { recurseForDerivations = false; };
vala = pkgs.vala_0_44;
gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
# ISO installer
@ -358,4 +357,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
nautilus-sendto = throw "deprecated 2019-09-17: abandoned";
inherit (pkgs) vala; # added 2019-10-10
})

2
pkgs/desktops/gnustep/make/builder.sh
View File

@ -16,7 +16,7 @@ wrapGSMake() {
export GNUSTEP_CONFIG_FILE="$config"
exec "$wrapped" "\$@" "\${extraFlagsArray[@]}"
exec "$wrapped" "\$@"
EOF
chmod +x "$program"
}

4
pkgs/development/compilers/go/1.12.nix
View File

@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.12.9";
version = "1.12.10";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1z32imbwmpkzgyh5c3vi7rbvzbq94xjk5qi2xm9sccj7kknmc3mb";
sha256 = "0m1rvawvpdl7kd0asw10m50xbxlhykix6dng9p4x6ih6x3y4hvpm";
};
# perl is used for testing go vet

12
pkgs/development/compilers/vala/default.nix
View File

@ -83,12 +83,12 @@ let
doCheck = false; # fails, requires dbus daemon
# Wait for PR #59372
#passthru = {
# passthru = {
# updateScript = gnome3.updateScript {
# attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}";
# packageName = pname;
# };
#};
# };
meta = with stdenv.lib; {
description = "Compiler for GObject type system";
@ -111,13 +111,13 @@ in rec {
};
vala_0_44 = generic {
version = "0.44.7";
sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz";
version = "0.44.8";
sha256 = "0f7pc496zvxfhbkhg8ayxykjas6f55mgv452wsnh0bz5zbxm8xrl";
};
vala_0_46 = generic {
version = "0.46.1";
sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l";
version = "0.46.2";
sha256 = "1g20fzcwh3j7ab46jalabyi005h2in0cp7xj0yga4b8hx29h61wj";
};
vala = vala_0_46;

4
pkgs/development/interpreters/python/default.nix
View File

@ -91,10 +91,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
patch = "4";
patch = "5";
suffix = "";
};
sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv";
sha256 = "154xc6dxww21qkmphg66pfks8987a17cl3vqq5g4hv1xkzm7cnp8";
inherit (darwin) CF configd;
inherit passthruFun;
};

7
pkgs/development/libraries/SDL2/default.nix
View File

@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
patches = [ ./find-headers.patch ];
# Fix with mesa 19.2: https://bugzilla.libsdl.org/show_bug.cgi?id=4797
postPatch = ''
substituteInPlace include/SDL_opengl_glext.h \
--replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \
--replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;"
'';
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = dlopenPropagatedBuildInputs;

4
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -4,13 +4,13 @@
let
pname = "gdk-pixbuf";
version = "2.38.2";
version = "2.40.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "10875lywkabh6nm2rgf0vxqn39h34b72kcbh63fp77fqq0g6bykk";
sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm";
};
patches = [

4
pkgs/development/libraries/geoclue/default.nix
View File

@ -7,14 +7,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "geoclue";
version = "2.5.3";
version = "2.5.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
repo = pname;
rev = version;
sha256 = "1wbpi74dw3p7izxwd57irz2i1g55r7wzl5h2yf0ns0hgq2njdfsg";
sha256 = "0a8wmf5v3x4035ixz9jypj7c6qknvs6gjv2zawa3msq1j75rf2r5";
};
patches = [

4
pkgs/development/libraries/glib-networking/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "glib-networking";
version = "2.62.0";
version = "2.62.1";
outputs = [ "out" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1p7vgav0g03r00qiafhrdiad2gh1w6wsd1a7nnn79psng5gnh8ck";
sha256 = "043imcynl3rwdz79wvpdfhkmqmgdhr34z0vac3x7jymdf5kswm9w";
};
patches = [

10
pkgs/development/libraries/glib/default.nix
View File

@ -48,21 +48,15 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.62.0";
version = "2.62.1";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc";
sha256 = "1pzrw2x9r0kyghrvwdbx3nqn2wcrrxy962f5gbdacwh83m705n9x";
};
patches = optionals stdenv.isDarwin [
./darwin-compilation.patch
# fix loading dylibs on darwin
# Remove on 2.62.1
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glib/commit/e2409e5e180f1fa369d0e87e38e4d646d9f68791.patch";
sha256 = "1dhjwlsqdgnn8fr8pzfrnd63m7pdgf7mizdyn8lwg17ggvq6qsqf";
})
] ++ optionals stdenv.hostPlatform.isMusl [
./quark_init_on_demand.patch
./gobject_init_on_demand.patch

146
pkgs/development/libraries/glibc/CVE-2018-11236.patch Normal file
View File

@ -0,0 +1,146 @@
From 5460617d1567657621107d895ee2dd83bc1f88f2 Mon Sep 17 00:00:00 2001
From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Tue, 8 May 2018 18:12:41 -0700
Subject: [PATCH] Fix BZ 22786: integer addition overflow may cause stack
buffer overflow when realpath() input length is close to SSIZE_MAX.
2018-05-09 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #22786]
* stdlib/canonicalize.c (__realpath): Fix overflow in path length
computation.
* stdlib/Makefile (test-bz22786): New test.
* stdlib/test-bz22786.c: New test.
---
ChangeLog | 8 +++++
stdlib/Makefile | 2 +-
stdlib/canonicalize.c | 2 +-
stdlib/test-bz22786.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 100 insertions(+), 2 deletions(-)
create mode 100644 stdlib/test-bz22786.c
diff --git a/stdlib/Makefile b/stdlib/Makefile
index af1643c..1ddb1f9 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -84,7 +84,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
tst-cxa_atexit tst-on_exit test-atexit-race \
test-at_quick_exit-race test-cxa_atexit-race \
test-on_exit-race test-dlclose-exit-race \
- tst-makecontext-align
+ tst-makecontext-align test-bz22786
tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \
tst-tls-atexit tst-tls-atexit-nodelete
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
index 4135f3f..390fb43 100644
--- a/stdlib/canonicalize.c
+++ b/stdlib/canonicalize.c
@@ -181,7 +181,7 @@ __realpath (const char *name, char *resolved)
extra_buf = __alloca (path_max);
len = strlen (end);
- if ((long int) (n + len) >= path_max)
+ if (path_max - n <= len)
{
__set_errno (ENAMETOOLONG);
goto error;
diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c
new file mode 100644
index 0000000..e7837f9
--- /dev/null
+++ b/stdlib/test-bz22786.c
@@ -0,0 +1,90 @@
+/* Bug 22786: test for buffer overflow in realpath.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* This file must be run from within a directory called "stdlib". */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <support/test-driver.h>
+#include <libc-diag.h>
+
+static int
+do_test (void)
+{
+ const char dir[] = "bz22786";
+ const char lnk[] = "bz22786/symlink";
+
+ rmdir (dir);
+ if (mkdir (dir, 0755) != 0 && errno != EEXIST)
+ {
+ printf ("mkdir %s: %m\n", dir);
+ return EXIT_FAILURE;
+ }
+ if (symlink (".", lnk) != 0 && errno != EEXIST)
+ {
+ printf ("symlink (%s, %s): %m\n", dir, lnk);
+ return EXIT_FAILURE;
+ }
+
+ const size_t path_len = (size_t) INT_MAX + 1;
+
+ DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (7, 0)
+ /* GCC 7 warns about too-large allocations; here we need such
+ allocation to succeed for the test to work. */
+ DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than=");
+#endif
+ char *path = malloc (path_len);
+ DIAG_POP_NEEDS_COMMENT;
+
+ if (path == NULL)
+ {
+ printf ("malloc (%zu): %m\n", path_len);
+ return EXIT_UNSUPPORTED;
+ }
+
+ /* Construct very long path = "bz22786/symlink/aaaa....." */
+ char *p = mempcpy (path, lnk, sizeof (lnk) - 1);
+ *(p++) = '/';
+ memset (p, 'a', path_len - (path - p) - 2);
+ p[path_len - (path - p) - 1] = '\0';
+
+ /* This call crashes before the fix for bz22786 on 32-bit platforms. */
+ p = realpath (path, NULL);
+
+ if (p != NULL || errno != ENAMETOOLONG)
+ {
+ printf ("realpath: %s (%m)", p);
+ return EXIT_FAILURE;
+ }
+
+ /* Cleanup. */
+ unlink (lnk);
+ rmdir (dir);
+
+ return 0;
+}
+
+#define TEST_FUNCTION do_test
+#include <support/test-driver.c>
--
2.9.3

55
pkgs/development/libraries/glibc/CVE-2018-11237.patch Normal file
View File

@ -0,0 +1,55 @@
From f51c8367685dc888a02f7304c729ed5277904aff Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Thu, 24 May 2018 14:39:18 +0200
Subject: [PATCH] Don't write beyond destination in
__mempcpy_avx512_no_vzeroupper (bug 23196)
When compiled as mempcpy, the return value is the end of the destination
buffer, thus it cannot be used to refer to the start of it.
(cherry picked from commit 9aaaab7c6e4176e61c59b0a63c6ba906d875dc0e)
---
ChangeLog | 9 +++++++++
NEWS | 7 +++++++
string/test-mempcpy.c | 1 +
sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++--
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c
index c08fba8..d98ecdd 100644
--- a/string/test-mempcpy.c
+++ b/string/test-mempcpy.c
@@ -18,6 +18,7 @@
<http://www.gnu.org/licenses/>. */
#define MEMCPY_RESULT(dst, len) (dst) + (len)
+#define MIN_PAGE_SIZE 131072
#define TEST_MAIN
#define TEST_NAME "mempcpy"
#include "test-string.h"
diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
index 23c0f7a..effc3ac 100644
--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+++ b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
@@ -336,6 +336,7 @@ L(preloop_large):
vmovups (%rsi), %zmm4
vmovups 0x40(%rsi), %zmm5
+ mov %rdi, %r11
/* Align destination for access with non-temporal stores in the loop. */
mov %rdi, %r8
and $-0x80, %rdi
@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop):
cmp $256, %rdx
ja L(gobble_256bytes_nt_loop)
sfence
- vmovups %zmm4, (%rax)
- vmovups %zmm5, 0x40(%rax)
+ vmovups %zmm4, (%r11)
+ vmovups %zmm5, 0x40(%r11)
jmp L(check)
L(preloop_large_bkw):
--
2.9.3

5
pkgs/development/libraries/glibc/common.nix
View File

@ -92,6 +92,11 @@ stdenv.mkDerivation ({
url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";
sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4";
})
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5460617d1567657621107d895ee2dd83bc1f88f2
./CVE-2018-11236.patch
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff
./CVE-2018-11237.patch
]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch

8
pkgs/development/libraries/gnutls/default.nix
View File

@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv
, unbound, dns-root-data, gettext, cacert
, unbound, dns-root-data, gettext, cacert, utillinux
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring
, withSecurity ? false, Security # darwin Security.framework
@ -8,7 +8,7 @@
assert guileBindings -> guile != null;
let
version = "3.6.9";
version = "3.6.10";
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3";
sha256 = "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@ -67,7 +67,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ]
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
++ lib.optionals doCheck [ which nettools ];
++ lib.optionals doCheck [ which nettools utillinux ];
propagatedBuildInputs = [ nettle ];

4
pkgs/development/libraries/gsound/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }:
{ stdenv, fetchurl, pkgconfig, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }:
stdenv.mkDerivation rec {
pname = "gsound";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
};
nativeBuildInputs = [ pkgconfig gobject-introspection libtool gnome3.vala ];
nativeBuildInputs = [ pkgconfig gobject-introspection libtool vala ];
buildInputs = [ glib libcanberra ];
passthru = {

10
pkgs/development/libraries/gtk/2.x.nix
View File

@ -26,21 +26,21 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
setupHooks = [
./gtk2-clean-immodules-cache.sh
./drop-icon-theme-cache.sh
./hooks/gtk2-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
];
nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ];
patches = [
./2.0-immodules.cache.patch
./gtk2-theme-paths.patch
./patches/2.0-immodules.cache.patch
./patches/gtk2-theme-paths.patch
] ++ optionals stdenv.isDarwin [
(fetchpatch {
url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
})
./2.0-darwin-x11.patch
./patches/2.0-darwin-x11.patch
];
propagatedBuildInputs = with xorg;

14
pkgs/development/libraries/gtk/3.x.nix
View File

@ -44,35 +44,35 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.11";
version = "3.24.12";
outputs = [ "out" "dev" ];
outputBin = "dev";
setupHooks = [
./gtk3-clean-immodules-cache.sh
./drop-icon-theme-cache.sh
./hooks/gtk3-clean-immodules-cache.sh
./hooks/drop-icon-theme-cache.sh
];
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "1598k357xvffbswsrvc63lyj73wq0b510lhg4vcgl6rf1a6nb9yv";
sha256 = "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k";
};
patches = [
./3.0-immodules.cache.patch
./patches/3.0-immodules.cache.patch
(fetchpatch {
name = "Xft-setting-fallback-compute-DPI-properly.patch";
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
./01-build-Fix-path-handling-in-pkgconfig.patch
./patches/01-build-Fix-path-handling-in-pkgconfig.patch
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it
# e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
./3.0-darwin-x11.patch
./patches/3.0-darwin-x11.patch
];
mesonFlags = [

0
pkgs/development/libraries/gtk/drop-icon-theme-cache.sh → pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
View File

0
pkgs/development/libraries/gtk/gtk2-clean-immodules-cache.sh → pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh
View File

0
pkgs/development/libraries/gtk/gtk3-clean-immodules-cache.sh → pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh
View File

0
pkgs/development/libraries/gtk/01-build-Fix-path-handling-in-pkgconfig.patch → pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
View File

0
pkgs/development/libraries/gtk/2.0-darwin-x11.patch → pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
View File

0
pkgs/development/libraries/gtk/2.0-immodules.cache.patch → pkgs/development/libraries/gtk/patches/2.0-immodules.cache.patch
View File

0
pkgs/development/libraries/gtk/3.0-darwin-x11.patch → pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
View File

0
pkgs/development/libraries/gtk/3.0-immodules.cache.patch → pkgs/development/libraries/gtk/patches/3.0-immodules.cache.patch
View File

0
pkgs/development/libraries/gtk/gtk2-theme-paths.patch → pkgs/development/libraries/gtk/patches/gtk2-theme-paths.patch
View File

18
pkgs/development/libraries/libpcap/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, fetchpatch, flex, bison }:
{ stdenv, fetchurl, flex, bison }:
stdenv.mkDerivation rec {
name = "libpcap-1.9.0";
pname = "libpcap";
version = "1.9.1";
src = fetchurl {
url = "https://www.tcpdump.org/release/${name}.tar.gz";
sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf";
url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3";
};
nativeBuildInputs = [ flex bison ];
@ -27,15 +28,6 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace " -arch i386" ""
'';
patches = [
# https://github.com/the-tcpdump-group/libpcap/pull/735
(fetchpatch {
name = "add-missing-limits-h-include-pr735.patch";
url = https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa.patch;
sha256 = "05zb4hx9g24gx07bi02rprk2rn7fdc1ss3249dv5x36qkasnfhvf";
})
];
meta = with stdenv.lib; {
homepage = https://www.tcpdump.org;
description = "Packet Capture Library";

4
pkgs/development/libraries/librsvg/default.nix
View File

@ -4,14 +4,14 @@
let
pname = "librsvg";
version = "2.46.0";
version = "2.46.1";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1la3az2af2ccm6rp86b6wh0kq7kxzl4n8pli5qxhyic1rd91xj4n";
sha256 = "0hvnqrgfi8c2xh94gxs6xwwg1m2z3l0lblqs2anlx8k3g9ag589d";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/libsoup/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libsoup";
version = "2.68.1";
version = "2.68.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13dz7x092yswdidj69hadzqfyv6cyfnjbzidjym7nycf7gjj60vz";
sha256 = "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai";
};
postPatch = ''

6
pkgs/development/libraries/mesa/default.nix
View File

@ -27,7 +27,7 @@
with stdenv.lib;
let
version = "19.1.5";
version = "19.2.1";
branch = versions.major version;
in
@ -35,14 +35,14 @@ stdenv.mkDerivation {
pname = "mesa";
inherit version;
src = fetchurl {
src = fetchurl {
urls = [
"ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "1d3frncljickn5yi2ch1w2phwxhxpi6diyac3cbin9f76m7f2m3v";
sha256 = "4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9";
};
prePatch = "patchShebangs .";

4
pkgs/development/libraries/nettle/default.nix
View File

@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.4.1";
version = "3.5.1";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr";
sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m";
};
})

10
pkgs/development/libraries/polkit/default.nix
View File

@ -9,7 +9,7 @@
let
system = "/run/current-system/sw";
setuid = "/run/wrappers/bin"; #TODO: from <nixos> config.security.wrapperDir;
setuid = "/run/wrappers/bin";
in
@ -40,11 +40,13 @@ stdenv.mkDerivation rec {
[ glib gtk-doc pkgconfig intltool perl ]
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
buildInputs =
[ glib expat pam spidermonkey_60 ]
[ expat pam spidermonkey_60 ]
++ stdenv.lib.optional useSystemd systemd
++ stdenv.lib.optional withGnome gobject-introspection;
NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56
propagatedBuildInputs = [
glib # in .pc Requires
];
preConfigure = ''
chmod +x test/mocklibc/bin/mocklibc{,-test}.in
@ -83,7 +85,7 @@ stdenv.mkDerivation rec {
];
inherit doCheck;
checkInputs = [dbus];
checkInputs = [ dbus ];
checkPhase = ''
# tests need access to the system bus
dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'

1
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -65,6 +65,7 @@ let
./qtbase.patch.d/0009-qtbase-tzdir.patch
./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
./qtbase.patch.d/0011-qtbase-assert.patch
./qtbase.patch.d/0012-fix-header_module.patch
];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];

2
pkgs/development/libraries/qt-5/5.12/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/ )
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/ )

29
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
View File

@ -1,18 +1,18 @@
From 58d98b66da5d748d610f053053bd12e42c97d9e6 Mon Sep 17 00:00:00 2001
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:00 -0500
Subject: [PATCH 01/11] qtbase-mkspecs-mac
Subject: [PATCH 01/12] qtbase-mkspecs-mac
---
mkspecs/common/mac.conf | 2 +-
mkspecs/features/mac/default_post.prf | 196 --------------------------
mkspecs/features/mac/default_post.prf | 201 --------------------------
mkspecs/features/mac/default_pre.prf | 58 --------
mkspecs/features/mac/sdk.mk | 25 ----
mkspecs/features/mac/sdk.prf | 61 --------
5 files changed, 1 insertion(+), 341 deletions(-)
5 files changed, 1 insertion(+), 346 deletions(-)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec..470c38e7 100644
index b77494ec9b..470c38e772 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
@ -25,10 +25,10 @@ index b77494ec..470c38e7 100644
QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index c46222de..18dcfbce 100644
index 26bd3e2e98..b80ec1e801 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -64,202 +64,6 @@ qt {
@@ -68,207 +68,6 @@ qt {
}
}
@ -212,6 +212,11 @@ index c46222de..18dcfbce 100644
- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
-}
-
-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) {
- # Explicit SDK version has been set, respect that
- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version
-}
-
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-!isEmpty(QMAKE_XCODE_VERSION): \
- cache(QMAKE_XCODE_VERSION, stash)
@ -229,10 +234,10 @@ index c46222de..18dcfbce 100644
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
-
!macx-xcode {
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
generate_xcode_project.target = xcodeproj
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e3534561..3b01424e 100644
index e3534561a5..3b01424e67 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -1,60 +1,2 @@
@ -297,7 +302,7 @@ index e3534561..3b01424e 100644
-xcode_copy_phase_strip_setting.value = NO
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
index c40f58c9..e69de29b 100644
index c40f58c987..e69de29bb2 100644
--- a/mkspecs/features/mac/sdk.mk
+++ b/mkspecs/features/mac/sdk.mk
@@ -1,25 +0,0 @@
@ -327,7 +332,7 @@ index c40f58c9..e69de29b 100644
- endif
-endif
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 3a9c2778..e69de29b 100644
index 3a9c2778bb..e69de29bb2 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -1,61 +0,0 @@
@ -393,5 +398,5 @@ index 3a9c2778..e69de29b 100644
- cache($$tool_variable, set stash, $$tool)
-}
--
2.22.1
2.23.GIT

2
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
View File

@ -1,7 +1,7 @@
From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:37:15 -0500
Subject: [PATCH 02/11] qtbase-mac
Subject: [PATCH 02/12] qtbase-mac
---
src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--

34
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
View File

@ -1,7 +1,7 @@
From 5ff996d9028c0f54939ca7c54d358cd7503ab1ae Mon Sep 17 00:00:00 2001
From 8bdbddc2e5fef1553b1ba0297d3c03b38e9b947b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:39 -0500
Subject: [PATCH 03/11] qtbase-mkspecs
Subject: [PATCH 03/12] qtbase-mkspecs
---
mkspecs/features/create_cmake.prf | 53 ++++--------
@ -18,7 +18,7 @@ Subject: [PATCH 03/11] qtbase-mkspecs
11 files changed, 39 insertions(+), 142 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index c9910dda..e9bc8076 100644
index 00da9bd33f..bd166fbfea 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -21,7 +21,7 @@ load(cmake_functions)
@ -30,7 +30,7 @@ index c9910dda..e9bc8076 100644
contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
@@ -60,45 +60,20 @@ split_incpath {
@@ -70,45 +70,20 @@ split_incpath {
$$cmake_extra_source_includes.output
}
@ -87,7 +87,7 @@ index c9910dda..e9bc8076 100644
static|staticlib:CMAKE_STATIC_TYPE = true
@@ -178,7 +153,7 @@ contains(CONFIG, plugin) {
@@ -188,7 +163,7 @@ contains(CONFIG, plugin) {
cmake_target_file
cmake_qt5_plugin_file.files = $$cmake_target_file.output
@ -96,7 +96,7 @@ index c9910dda..e9bc8076 100644
INSTALLS += cmake_qt5_plugin_file
return()
@@ -323,7 +298,7 @@ exists($$cmake_macros_file.input) {
@@ -333,7 +308,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}
@ -106,7 +106,7 @@ index c9910dda..e9bc8076 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index c7298928..c60ef16e 100644
index c729892889..c60ef16e64 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@ -266,7 +266,7 @@ index c7298928..c60ef16e 100644
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 57cfec78..5cbd7c52 100644
index 57cfec78b3..5cbd7c52ef 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -51,7 +51,7 @@ builtin_resources {
@ -279,7 +279,7 @@ index 57cfec78..5cbd7c52 100644
qmlfiles.base = $$_PRO_FILE_PWD_
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index ad8ecdf5..804634b2 100644
index ad8ecdf5f1..804634b22e 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -50,7 +50,7 @@ load(qt_build_paths)
@ -292,7 +292,7 @@ index ad8ecdf5..804634b2 100644
# Some final setup
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
index 8354f30e..62028fef 100644
index 8354f30eea..62028fef8e 100644
--- a/mkspecs/features/qt_app.prf
+++ b/mkspecs/features/qt_app.prf
@@ -30,7 +30,7 @@ host_build:force_bootstrap {
@ -305,7 +305,7 @@ index 8354f30e..62028fef 100644
}
INSTALLS += target
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
index 3bb3823a..655b7b7d 100644
index 3bb3823a8e..655b7b7db8 100644
--- a/mkspecs/features/qt_build_paths.prf
+++ b/mkspecs/features/qt_build_paths.prf
@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
@ -318,7 +318,7 @@ index 3bb3823a..655b7b7d 100644
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
}
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 3b74cd4d..6bfbbe6e 100644
index 3b74cd4dd5..6bfbbe6e2d 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
@ -357,7 +357,7 @@ index 3b74cd4d..6bfbbe6e 100644
INSTALLS += inst_qch_docs
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 43b58817..e635b8f6 100644
index 43b58817fe..e635b8f67a 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -88,7 +88,7 @@ sourcefiles += \
@ -370,7 +370,7 @@ index 43b58817..e635b8f6 100644
check_examples {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 1903e509..ae7b5859 100644
index 1903e509c8..ae7b585989 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@ -383,7 +383,7 @@ index 1903e509..ae7b5859 100644
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 1ebca173..b784441d 100644
index 1ebca17366..b784441da0 100644
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@@ -12,16 +12,10 @@
@ -448,7 +448,7 @@ index 1ebca173..b784441d 100644
INSTALLS += privpritarget
}
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 40528a65..903f7952 100644
index 40528a65e2..903f795284 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
@ -461,5 +461,5 @@ index 40528a65..903f7952 100644
TARGET = $$qt5LibraryTarget($$TARGET)
--
2.22.1
2.23.GIT

18
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
View File

@ -1,7 +1,7 @@
From d126db8f5c2c1f6d6738de1a53040c93fdf6ff73 Mon Sep 17 00:00:00 2001
From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:50 -0500
Subject: [PATCH 04/11] qtbase-replace-libdir
Subject: [PATCH 04/12] qtbase-replace-libdir
---
mkspecs/features/qt_common.prf | 20 ++------------------
@ -9,7 +9,7 @@ Subject: [PATCH 04/11] qtbase-replace-libdir
2 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index caecb68a..d3aa3ba5 100644
index caecb68a84..d3aa3ba570 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) {
@ -48,10 +48,10 @@ index caecb68a..d3aa3ba5 100644
# The remainder of this file must not apply to host tools/libraries,
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 51b5bde6..82e2907c 100644
index ee7de22059..9015b30d73 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -292,10 +292,7 @@ load(qt_targets)
@@ -303,10 +303,7 @@ load(qt_targets)
}
!lib_bundle:unix {
CONFIG += create_libtool
@ -60,9 +60,9 @@ index 51b5bde6..82e2907c 100644
- else: \
- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
ltlib_replace.match = $$lib_replace.match
!isEmpty(lib_replace.replace): \
ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
!isEmpty(lib_replace0.match) {
ltlib_replace0.match = $$lib_replace0.match
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
--
2.22.1
2.23.GIT

22
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
View File

@ -1,7 +1,7 @@
From 0ea804da2eb1d0cfbbfc15fbc33a3d7dd5de36ed Mon Sep 17 00:00:00 2001
From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:28 -0500
Subject: [PATCH 05/11] qtbase-cmake
Subject: [PATCH 05/12] qtbase-cmake
---
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
@ -15,7 +15,7 @@ Subject: [PATCH 05/11] qtbase-cmake
8 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index c60ef16e..e354ab91 100644
index c60ef16e64..e354ab9156 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@ -28,7 +28,7 @@ index c60ef16e..e354ab91 100644
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
index 5baf0fdb..3583745a 100644
index 5baf0fdb10..3583745aea 100644
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -2,10 +2,10 @@
@ -45,7 +45,7 @@ index 5baf0fdb..3583745a 100644
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index e0652fdc..450b2a2d 100644
index e0652fdcf9..450b2a2d28 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
@ -94,7 +94,7 @@ index e0652fdc..450b2a2d 100644
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
!!ENDIF
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
index c357237d..6f0c75de 100644
index c357237d0e..6f0c75de3c 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
@@ -1,6 +1,6 @@
@ -106,7 +106,7 @@ index c357237d..6f0c75de 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
index 706304cf..546420f6 100644
index 706304cf34..546420f6ad 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
@@ -1,6 +1,6 @@
@ -118,7 +118,7 @@ index 706304cf..546420f6 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
index 1d947159..b36865fc 100644
index 1d947159e2..b36865fc48 100644
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
@@ -2,11 +2,7 @@
@ -148,7 +148,7 @@ index 1d947159..b36865fc 100644
set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
index 84dbbfeb..8ad0720c 100644
index 84dbbfebd4..8ad0720c5c 100644
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -2,7 +2,7 @@
@ -177,7 +177,7 @@ index 84dbbfeb..8ad0720c 100644
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
index 99d87e2e..a4eab2aa 100644
index 99d87e2e46..a4eab2aa72 100644
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
@ -190,5 +190,5 @@ index 99d87e2e..a4eab2aa 100644
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ENDIF
--
2.22.1
2.23.GIT

8
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
View File

@ -1,14 +1,14 @@
From 8fa184fb70a62cbe9ee160bceddaf5d7c21cb85c Mon Sep 17 00:00:00 2001
From 5bf1785809baf6be7fb5904ce6cefdb761f2c278 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:35:33 -0500
Subject: [PATCH 06/11] qtbase-gtk3
Subject: [PATCH 06/12] qtbase-gtk3
---
src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
index fb1c425d..bb8bab97 100644
index fb1c425d8e..bb8bab9795 100644
--- a/src/plugins/platformthemes/gtk3/main.cpp
+++ b/src/plugins/platformthemes/gtk3/main.cpp
@@ -39,6 +39,7 @@
@ -44,5 +44,5 @@ index fb1c425d..bb8bab97 100644
return 0;
}
--
2.22.1
2.23.GIT

8
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
View File

@ -1,14 +1,14 @@
From b4fe78eb31f30ef499970b2ca7e7947c025588af Mon Sep 17 00:00:00 2001
From 35e80f303ae6a6c4c53ba8eb3d84574cc03d68d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:35:58 -0500
Subject: [PATCH 07/11] qtbase-xcursor
Subject: [PATCH 07/12] qtbase-xcursor
---
src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index fbadab4d..c83ce0af 100644
index fbadab4d50..c83ce0af5b 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
@ -25,5 +25,5 @@ index fbadab4d..c83ce0af 100644
}
if (xcursorFound) {
--
2.22.1
2.23.GIT

8
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
View File

@ -1,14 +1,14 @@
From 47b2bed58224bda2267480604707a580dc17dd1f Mon Sep 17 00:00:00 2001
From b7c1c103ba04e76ae498f87ca9ef2c4e09e36d7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:36:10 -0500
Subject: [PATCH 08/11] qtbase-xcompose
Subject: [PATCH 08/12] qtbase-xcompose
---
.../compose/generator/qtablegenerator.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index b5a0a5bb..6c20305f 100644
index b5a0a5bbeb..6c20305f4d 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
@ -26,5 +26,5 @@ index b5a0a5bb..6c20305f 100644
QString TableGenerator::findComposeFile()
--
2.22.1
2.23.GIT

12
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
View File

@ -1,17 +1,17 @@
From 354713a61005b9a4743b9db0d76c72514c4579f8 Mon Sep 17 00:00:00 2001
From db9686362ae34e02538e449e0edfe3d61065b2e9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:36:25 -0500
Subject: [PATCH 09/11] qtbase-tzdir
Subject: [PATCH 09/12] qtbase-tzdir
---
src/corelib/tools/qtimezoneprivate_tz.cpp | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
index 7d85bc07..c13d99b8 100644
index 57bc000af5..d7d8119682 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -71,7 +71,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
@@ -77,7 +77,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones()
{
@ -24,7 +24,7 @@ index 7d85bc07..c13d99b8 100644
if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
@@ -650,12 +654,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
@@ -656,12 +660,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
if (!tzif.open(QIODevice::ReadOnly))
return;
} else {
@ -47,5 +47,5 @@ index 7d85bc07..c13d99b8 100644
}
--
2.22.1
2.23.GIT

10
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
View File

@ -1,17 +1,17 @@
From 571060c0e1dca29554cc97cfb33087c9b41114a5 Mon Sep 17 00:00:00 2001
From a3aaebda6d4b302cd202c21e306c55d3715e9b0d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:36:41 -0500
Subject: [PATCH 10/11] qtbase-qtpluginpath
Subject: [PATCH 10/12] qtbase-qtpluginpath
---
src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8652c456..74562272 100644
index db6546028a..cc97c46004 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2690,6 +2690,15 @@ QStringList QCoreApplication::libraryPaths()
@@ -2694,6 +2694,15 @@ QStringList QCoreApplication::libraryPaths()
QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths);
@ -28,5 +28,5 @@ index 8652c456..74562272 100644
if (!libPathEnv.isEmpty()) {
QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
--
2.22.1
2.23.GIT

8
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
View File

@ -1,14 +1,14 @@
From 545e696e270a3879dd59f71d145e31a7d93ab8f4 Mon Sep 17 00:00:00 2001
From 4f93027de0e9b825c4b7853d583e9b02a0443c6b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:37:04 -0500
Subject: [PATCH 11/11] qtbase-assert
Subject: [PATCH 11/12] qtbase-assert
---
src/testlib/qtestassert.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
index 6498ea84..d821ced7 100644
index 6498ea84ef..d821ced7fc 100644
--- a/src/testlib/qtestassert.h
+++ b/src/testlib/qtestassert.h
@@ -44,10 +44,13 @@
@ -28,5 +28,5 @@ index 6498ea84..d821ced7 100644
QT_END_NAMESPACE
--
2.22.1
2.23.GIT

25
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch Normal file
View File

@ -0,0 +1,25 @@
From 821db0c3056a813e2d0d36fbb2c7361df5559b05 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Sep 2019 20:15:40 -0500
Subject: [PATCH 12/12] fix header_module
---
mkspecs/features/qt_module.prf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 9015b30d73..7347c791b4 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -84,7 +84,7 @@ header_module {
CONFIG += qt_no_install_library
# Allow creation of .prl, .la and .pc files.
- target.path = $$[QT_INSTALL_LIBS]
+ target.path = $$NIX_OUTPUT_OUT/lib
target.CONFIG += dummy_install
INSTALLS += target
} else {
--
2.23.GIT

320
pkgs/development/libraries/qt-5/5.12/srcs.nix
View File

@ -3,323 +3,323 @@
{
qt3d = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qt3d-everywhere-src-5.12.4.tar.xz";
sha256 = "cfad2e16f40fa07f8be59fa29c0c246743ee67db417ca29772a92f36fa322af3";
name = "qt3d-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qt3d-everywhere-src-5.12.5.tar.xz";
sha256 = "2a35b144768c7ad8a9265d16a04f038d9bc51016bd2c4b2b516e374f81ff29c4";
name = "qt3d-everywhere-src-5.12.5.tar.xz";
};
};
qtactiveqt = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtactiveqt-everywhere-src-5.12.4.tar.xz";
sha256 = "d3c78e6c2a75b9d4f9685d4eea6e84f44f97034a54aed7a159c53cfd4ec4eac7";
name = "qtactiveqt-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtactiveqt-everywhere-src-5.12.5.tar.xz";
sha256 = "d673a1269dd900c78dbfe88eb16e086e36d236571722712a64401cdec7b73a40";
name = "qtactiveqt-everywhere-src-5.12.5.tar.xz";
};
};
qtandroidextras = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtandroidextras-everywhere-src-5.12.4.tar.xz";
sha256 = "18e0dbd82920b0ca51b29172fc0ed1f2a923cb7c4fa8fb574595abc16ec3245e";
name = "qtandroidextras-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtandroidextras-everywhere-src-5.12.5.tar.xz";
sha256 = "f115ccef1e808da7c5d0348f3e245952a2973966f34d18b935f9e3eb16062eab";
name = "qtandroidextras-everywhere-src-5.12.5.tar.xz";
};
};
qtbase = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtbase-everywhere-src-5.12.4.tar.xz";
sha256 = "20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195";
name = "qtbase-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz";
sha256 = "fc8abffbbda9da3e593d8d62b56bc17dbaab13ff71b72915ddda11dabde4d625";
name = "qtbase-everywhere-src-5.12.5.tar.xz";
};
};
qtcanvas3d = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtcanvas3d-everywhere-src-5.12.4.tar.xz";
sha256 = "d7e0e8aa542d077a929fb7700411ca9de1f65ae4748d64168d2e7533facd7869";
name = "qtcanvas3d-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtcanvas3d-everywhere-src-5.12.5.tar.xz";
sha256 = "1553e06ce3cc5afb36aed3698b85c00e734eac07f7f41895426bebd84216d80c";
name = "qtcanvas3d-everywhere-src-5.12.5.tar.xz";
};
};
qtcharts = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtcharts-everywhere-src-5.12.4.tar.xz";
sha256 = "06ff68a80dc377847429cdd87d4e46465e1d6fbc417d52700a0a59d197669c9e";
name = "qtcharts-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtcharts-everywhere-src-5.12.5.tar.xz";
sha256 = "4c7c30a916ba0100a1635b89f48bc5a8af4cdedac79c3fc18456af54dc0a6608";
name = "qtcharts-everywhere-src-5.12.5.tar.xz";
};
};
qtconnectivity = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtconnectivity-everywhere-src-5.12.4.tar.xz";
sha256 = "749d05242b9fae12e80f569fb6b918dc011cb191eeb05147cbde474ca6b173ef";
name = "qtconnectivity-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtconnectivity-everywhere-src-5.12.5.tar.xz";
sha256 = "bdf62c72d689f47c4d17ecdde934d9f85a1164091e58fce02873de259e8de88b";
name = "qtconnectivity-everywhere-src-5.12.5.tar.xz";
};
};
qtdatavis3d = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtdatavis3d-everywhere-src-5.12.4.tar.xz";
sha256 = "1c160eeb430c8602aaee8ae4faa55bc62f880dae642be5fd1ac019f7886eb15a";
name = "qtdatavis3d-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdatavis3d-everywhere-src-5.12.5.tar.xz";
sha256 = "1de165bf5330c7fb18c6fbb8c0e5cda47fa19c2eaba657b3792fd75e653444f3";
name = "qtdatavis3d-everywhere-src-5.12.5.tar.xz";
};
};
qtdeclarative = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtdeclarative-everywhere-src-5.12.4.tar.xz";
sha256 = "614105ed73079d67d81b34fef31c9934c5e751342e4b2e0297128c8c301acda7";
name = "qtdeclarative-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdeclarative-everywhere-src-5.12.5.tar.xz";
sha256 = "22c5323d4b01259e6e352eef1b54129d6dfee00a406f0312905fa7db322b9190";
name = "qtdeclarative-everywhere-src-5.12.5.tar.xz";
};
};
qtdoc = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtdoc-everywhere-src-5.12.4.tar.xz";
sha256 = "93e6cb6abc0dad3a831a6e2c46d950bd7a99b59d60ce2d2b81c2ce893bfb41bb";
name = "qtdoc-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdoc-everywhere-src-5.12.5.tar.xz";
sha256 = "f1de30227b8854c284e9c23e9c0c44d9fe768880aef826b0f880a44dd7c7538d";
name = "qtdoc-everywhere-src-5.12.5.tar.xz";
};
};
qtgamepad = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtgamepad-everywhere-src-5.12.4.tar.xz";
sha256 = "25de6f10fb18f2484d1e569688bf33deb90ecbfb97ce41c2b5fb3521146e4c45";
name = "qtgamepad-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtgamepad-everywhere-src-5.12.5.tar.xz";
sha256 = "de88f01d47f7cc5d54a1af783c5fae9f2b0101948ff33b8290f71b2657aded33";
name = "qtgamepad-everywhere-src-5.12.5.tar.xz";
};
};
qtgraphicaleffects = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtgraphicaleffects-everywhere-src-5.12.4.tar.xz";
sha256 = "0bc38b168fa724411984525173d667aa47076c8cbd4eeb791d0da7fe4b9bdf73";
name = "qtgraphicaleffects-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtgraphicaleffects-everywhere-src-5.12.5.tar.xz";
sha256 = "bdbddba7e0e0d041809a98d97c07da8be8936ec48537335cbaea9b0049c646ad";
name = "qtgraphicaleffects-everywhere-src-5.12.5.tar.xz";
};
};
qtimageformats = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtimageformats-everywhere-src-5.12.4.tar.xz";
sha256 = "2dee25c3eea90d172cbd40f41450153322b902da1daa7d2370a55124b2307bb3";
name = "qtimageformats-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtimageformats-everywhere-src-5.12.5.tar.xz";
sha256 = "9f19394830542fb9e6bde6806b6216b7207f96bff674b91e8e8a8f89699e1f0a";
name = "qtimageformats-everywhere-src-5.12.5.tar.xz";
};
};
qtlocation = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtlocation-everywhere-src-5.12.4.tar.xz";
sha256 = "127b40bd7679fead3fb98f4c9c1d71dde9d6d416e90a6000129b61a5f128b3a0";
name = "qtlocation-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtlocation-everywhere-src-5.12.5.tar.xz";
sha256 = "12c8b59755abc4ca56e135e8ae3db7c6ba1bd95c779060f10a01393ae1040122";
name = "qtlocation-everywhere-src-5.12.5.tar.xz";
};
};
qtmacextras = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtmacextras-everywhere-src-5.12.4.tar.xz";
sha256 = "3ea0b94f9b63e801f2ddafa2a908002d9529a3c65021d261627d21e07454acde";
name = "qtmacextras-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtmacextras-everywhere-src-5.12.5.tar.xz";
sha256 = "984c3c95834aaa6fd85234ab1987a79662911c510e419611ce88fb4756313194";
name = "qtmacextras-everywhere-src-5.12.5.tar.xz";
};
};
qtmultimedia = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtmultimedia-everywhere-src-5.12.4.tar.xz";
sha256 = "7c0759ab6fca2480b10b71a35beeffe0b847adeff5af94eacd1a4531d033423d";
name = "qtmultimedia-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtmultimedia-everywhere-src-5.12.5.tar.xz";
sha256 = "d5a0a4fddc5ef14d641160a1fc0011b190ff8d9f19009498d586516b8ee3479c";
name = "qtmultimedia-everywhere-src-5.12.5.tar.xz";
};
};
qtnetworkauth = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtnetworkauth-everywhere-src-5.12.4.tar.xz";
sha256 = "e501eb46b8405a2b7db9fe90a1c224cf6676a07dc22c0662317ffe3dee1dbf55";
name = "qtnetworkauth-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtnetworkauth-everywhere-src-5.12.5.tar.xz";
sha256 = "0933475a2d30550c70ce4026c72678cbfdac73211593c78d442e038ef531a9f1";
name = "qtnetworkauth-everywhere-src-5.12.5.tar.xz";
};
};
qtpurchasing = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtpurchasing-everywhere-src-5.12.4.tar.xz";
sha256 = "7804a111043d0e8d6d81a0d0ae465ce2c36eca73f2774ccb5fa7be8670211672";
name = "qtpurchasing-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtpurchasing-everywhere-src-5.12.5.tar.xz";
sha256 = "7bcebc4985d387f3fa4ffcc19eada1f4f0f000ed0fd3e1d1dc37eb1db0be615b";
name = "qtpurchasing-everywhere-src-5.12.5.tar.xz";
};
};
qtquickcontrols = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtquickcontrols-everywhere-src-5.12.4.tar.xz";
sha256 = "32d4c2505337c67b0bac26d7f565ec8fabdc616e61247e98674820769dda9858";
name = "qtquickcontrols-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols-everywhere-src-5.12.5.tar.xz";
sha256 = "46deaefbdac3daa576c748e807956f5f82b2318923b1a36e434a3ff32d1d2559";
name = "qtquickcontrols-everywhere-src-5.12.5.tar.xz";
};
};
qtquickcontrols2 = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtquickcontrols2-everywhere-src-5.12.4.tar.xz";
sha256 = "9a447eed38bc8c7d7be7bc407317f58940377c077ddca74c9a641b1ee6200331";
name = "qtquickcontrols2-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols2-everywhere-src-5.12.5.tar.xz";
sha256 = "d744bdc492486db6cb521b1d4891e2358719399825ca1cf2a50968a80f6acb8f";
name = "qtquickcontrols2-everywhere-src-5.12.5.tar.xz";
};
};
qtremoteobjects = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtremoteobjects-everywhere-src-5.12.4.tar.xz";
sha256 = "54dd0c782abff90bf0608771c2e90b36073d9bd8d6c61706a2873bb7c317f413";
name = "qtremoteobjects-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtremoteobjects-everywhere-src-5.12.5.tar.xz";
sha256 = "acf131af93dd1fefbf30c7e03e29b8a1da3180e00c49f95c14a1cb6158cfeacd";
name = "qtremoteobjects-everywhere-src-5.12.5.tar.xz";
};
};
qtscript = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtscript-everywhere-src-5.12.4.tar.xz";
sha256 = "7adb3fe77638c7a6f2a26bca850b0ff54f5fb7e5561d2e4141d14a84305c2b6a";
name = "qtscript-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtscript-everywhere-src-5.12.5.tar.xz";
sha256 = "0083734ae827840334b774decb15de37f1b4ea5c88e442e2f485c530f24f1df4";
name = "qtscript-everywhere-src-5.12.5.tar.xz";
};
};
qtscxml = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtscxml-everywhere-src-5.12.4.tar.xz";
sha256 = "696fb72a62018151275fe589fc80cb160d2becab9a3254321d40e2e11a0ad4f8";
name = "qtscxml-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtscxml-everywhere-src-5.12.5.tar.xz";
sha256 = "6f1ec74100cdb2e7dfc3535e09d356fc53ba42e61b32fc3b93d5a7efed49960c";
name = "qtscxml-everywhere-src-5.12.5.tar.xz";
};
};
qtsensors = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtsensors-everywhere-src-5.12.4.tar.xz";
sha256 = "95873c7ea5960008d6eb41368ca64d68fbd05594ca8c2cd848b1612fc4aec0a9";
name = "qtsensors-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtsensors-everywhere-src-5.12.5.tar.xz";
sha256 = "e3a86a706f475bb23fc874de56026482de223ebd24f8cb4e94a28d1985ca0b85";
name = "qtsensors-everywhere-src-5.12.5.tar.xz";
};
};
qtserialbus = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtserialbus-everywhere-src-5.12.4.tar.xz";
sha256 = "69d56905f43ee13e670750e8f46d373835fae81d6343baa7c4004d2a2c6311fc";
name = "qtserialbus-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtserialbus-everywhere-src-5.12.5.tar.xz";
sha256 = "8474ae61a703c56e327ae0755c27643f2eafe0d915e8c6afb21728548dc02c22";
name = "qtserialbus-everywhere-src-5.12.5.tar.xz";
};
};
qtserialport = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtserialport-everywhere-src-5.12.4.tar.xz";
sha256 = "bf487df8a9fb2eddf103842b57a75b17ef4c498ee40306ae9997017c82b0ad39";
name = "qtserialport-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtserialport-everywhere-src-5.12.5.tar.xz";
sha256 = "f8ef0321a59ecfe2c72adc2ee220e0047403439a3c7b9efb719b1476af1fb862";
name = "qtserialport-everywhere-src-5.12.5.tar.xz";
};
};
qtspeech = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtspeech-everywhere-src-5.12.4.tar.xz";
sha256 = "2ff9660fb3f5663c9161f491d1a304db62691720136ae22c145ef6a1c94b90ec";
name = "qtspeech-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtspeech-everywhere-src-5.12.5.tar.xz";
sha256 = "f94c0cd7236d1a20d97d314d2c17c45c967cd7f24b869c43f5f46253f436f25b";
name = "qtspeech-everywhere-src-5.12.5.tar.xz";
};
};
qtsvg = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtsvg-everywhere-src-5.12.4.tar.xz";
sha256 = "110812515a73c650e5ebc41305d9a243dadeb21f485aaed773e394dd84ce0d04";
name = "qtsvg-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtsvg-everywhere-src-5.12.5.tar.xz";
sha256 = "75a791cf749f671d7ea9090b403ca513f745795018db512e7eecbf418b679840";
name = "qtsvg-everywhere-src-5.12.5.tar.xz";
};
};
qttools = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qttools-everywhere-src-5.12.4.tar.xz";
sha256 = "3b0e353860a9c0cd4db9eeae5f94fef8811ed7d107e3e5e97e4a557f61bd6eb6";
name = "qttools-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz";
sha256 = "28e095047b4985437dd66120cbcb49ac091bf4f12576ecad7ebc781b7dd44025";
name = "qttools-everywhere-src-5.12.5.tar.xz";
};
};
qttranslations = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qttranslations-everywhere-src-5.12.4.tar.xz";
sha256 = "ab8dd55f5ca869cab51c3a6ce0888f854b96dc03c7f25d2bd3d2c50314ab60fb";
name = "qttranslations-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qttranslations-everywhere-src-5.12.5.tar.xz";
sha256 = "72eb6317190fdcc3f8de37996adc646ab8772988766bacaab60a5bcc7d6a3f2a";
name = "qttranslations-everywhere-src-5.12.5.tar.xz";
};
};
qtvirtualkeyboard = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz";
sha256 = "33ac0356f916995fe5a91582e12b4c4f730c705808ea3c14e75c6e350e8131e6";
name = "qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz";
sha256 = "786d745b34b1f145073488d492325e98bcde81b07ab984032ea5eb2fb52e6e5e";
name = "qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz";
};
};
qtwayland = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwayland-everywhere-src-5.12.4.tar.xz";
sha256 = "2fade959c3927687134c597d85c12ba1af22129a60ab326c2dc77a648e74e6b7";
name = "qtwayland-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwayland-everywhere-src-5.12.5.tar.xz";
sha256 = "29fd31267149451f93faa15f031e0a14506e704086033f70d51479522c6f3846";
name = "qtwayland-everywhere-src-5.12.5.tar.xz";
};
};
qtwebchannel = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwebchannel-everywhere-src-5.12.4.tar.xz";
sha256 = "ab571a1b699e61a86be1a6b8d6ffd998d431c4850cc27e9a21f81fa5923bfdb7";
name = "qtwebchannel-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebchannel-everywhere-src-5.12.5.tar.xz";
sha256 = "9f1d1ac20722ee053ecf071d4ec0070a45a765cb67b6e31add61004fb4b3c5e8";
name = "qtwebchannel-everywhere-src-5.12.5.tar.xz";
};
};
qtwebengine = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwebengine-everywhere-src-5.12.4.tar.xz";
sha256 = "fccf5c945412c19c3805323211b504ac8becbf191c638a2dc85ec91abfb1b331";
name = "qtwebengine-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebengine-everywhere-src-5.12.5.tar.xz";
sha256 = "31881130e69eb8336e9480f9f33cd5a93e86de8d7323c0ae1893e1a72ce70743";
name = "qtwebengine-everywhere-src-5.12.5.tar.xz";
};
};
qtwebglplugin = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwebglplugin-everywhere-src-5.12.4.tar.xz";
sha256 = "756fa09893618029bb56605be3ac5756a1834255fb223f8e4b7de205846d3266";
name = "qtwebglplugin-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebglplugin-everywhere-src-5.12.5.tar.xz";
sha256 = "aac3b2b2e5b6f26dd7abba6eab616777fecbb4d06de05ddab68c1296652bc4f7";
name = "qtwebglplugin-everywhere-src-5.12.5.tar.xz";
};
};
qtwebsockets = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwebsockets-everywhere-src-5.12.4.tar.xz";
sha256 = "b471eda2f486d21c51fc3bc53bb8844022117e746d5f15c5eabb82cd37eb2abe";
name = "qtwebsockets-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebsockets-everywhere-src-5.12.5.tar.xz";
sha256 = "5d58e697c49c0ea19a8299deba84b5360dca8c336a1636d38de0351757293262";
name = "qtwebsockets-everywhere-src-5.12.5.tar.xz";
};
};
qtwebview = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwebview-everywhere-src-5.12.4.tar.xz";
sha256 = "1f244c6b774dd9d03d3c5cafe877381900b50a2775cef6487c8bb66e32ab5a5d";
name = "qtwebview-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebview-everywhere-src-5.12.5.tar.xz";
sha256 = "a6d4d8c335cd6838f4638874fcd67655e80db569ed567a774a84f6bf7d332f26";
name = "qtwebview-everywhere-src-5.12.5.tar.xz";
};
};
qtwinextras = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtwinextras-everywhere-src-5.12.4.tar.xz";
sha256 = "f6e0172582a499d5e50c51877552d1a3bff66546d9a02e5754100a51b192973f";
name = "qtwinextras-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwinextras-everywhere-src-5.12.5.tar.xz";
sha256 = "7ee2fc73bc95c5e36e8ed2d02fc89822d56c406c540fbfa52bb0e3929ff2f93d";
name = "qtwinextras-everywhere-src-5.12.5.tar.xz";
};
};
qtx11extras = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtx11extras-everywhere-src-5.12.4.tar.xz";
sha256 = "49cc009eaf4a01ca7dbe12651ef39de9a43860acb674aec372e70b209f9bae1e";
name = "qtx11extras-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtx11extras-everywhere-src-5.12.5.tar.xz";
sha256 = "89425af3e48b040878c6a64ace58c17a83b87c9330e6366b09a41d6797062a68";
name = "qtx11extras-everywhere-src-5.12.5.tar.xz";
};
};
qtxmlpatterns = {
version = "5.12.4";
version = "5.12.5";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.12/5.12.4/submodules/qtxmlpatterns-everywhere-src-5.12.4.tar.xz";
sha256 = "0bea1719bb948f65cbed4375cc3e997a6464f35d25b631bafbd7a3161f8f5666";
name = "qtxmlpatterns-everywhere-src-5.12.4.tar.xz";
url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtxmlpatterns-everywhere-src-5.12.5.tar.xz";
sha256 = "b905d9107f87798ef0f142942fc45c0f63fc113522ab041e791d3cb744a8babd";
name = "qtxmlpatterns-everywhere-src-5.12.5.tar.xz";
};
};
}

6
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -221,7 +221,6 @@ stdenv.mkDerivation {
# To prevent these failures, we need to override PostgreSQL detection.
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
# -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
# TODO Remove obsolete and useless flags once the build will be totally mastered
configureFlags =
[
@ -328,11 +327,6 @@ stdenv.mkDerivation {
"-libinput"
"-no-eglfs"
"-no-gbm"
"-no-kms"
"-no-linuxfb"
''-${lib.optionalString (cups == null) "no-"}cups''
"-dbus-linked"
"-glib"

4
pkgs/development/libraries/x265/default.nix
View File

@ -17,14 +17,14 @@ in
stdenv.mkDerivation rec {
pname = "x265";
version = "3.1.1";
version = "3.2";
src = fetchurl {
urls = [
"https://get.videolan.org/x265/x265_${version}.tar.gz"
"ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
];
sha256 = "1l68lgdbsi4wjz5vad98ggx7mf92rnvzlq34m6w0a08ark3h0yc2";
sha256 = "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n";
};
enableParallelBuilding = true;

4
pkgs/development/libraries/xdg-dbus-proxy/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "xdg-dbus-proxy";
version = "0.1.1";
version = "0.1.2";
src = fetchurl {
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1w8yg5j51zsr9d97d4jjp9dvd7iq893p2xk54i6lf3lx01ribdqh";
sha256 = "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p";
};
nativeBuildInputs = [ pkgconfig libxslt docbook_xsl docbook_xml_dtd_43 ];

3
pkgs/development/perl-modules/generic/default.nix
View File

@ -22,9 +22,6 @@ toPerlModule(stdenv.mkDerivation (
# Prevent CPAN downloads.
PERL_AUTOINSTALL = "--skipdeps";
# Avoid creating perllocal.pod, which contains a timestamp
installTargets = "pure_install";
# From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows
# authors to skip certain tests (or include certain tests) when
# the results are not being monitored by a human being."

4
pkgs/development/python-modules/flake8/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "flake8";
version = "3.7.7";
version = "3.7.8";
src = fetchPypi {
inherit pname version;
sha256 = "859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661";
sha256 = "19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548";
};
checkInputs = [ pytest mock pytestrunner ];

4
pkgs/development/python-modules/netcdf4/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, pytest
, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython, cftime
}:
buildPythonPackage rec {
@ -37,7 +37,7 @@ buildPythonPackage rec {
# Variables used to configure the build process
USE_NCCONFIG="0";
HDF5_DIR=hdf5;
HDF5_DIR = lib.getDev hdf5;
NETCDF4_DIR=netcdf;
CURL_DIR=curl.dev;
JPEG_DIR=libjpeg.dev;

25
pkgs/development/python-modules/setuptools/default.nix
View File

@ -6,11 +6,17 @@
, unzip
, callPackage
, bootstrapped-pip
, lib
, pipInstallHook
, setuptoolsBuildHook
}:
buildPythonPackage rec {
pname = "setuptools";
version = "41.2.0";
# Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly.
# Instead, we override it to remove setuptools to avoid a circular dependency.
# The same is done for pip and the pipInstallHook.
format = "other";
src = fetchPypi {
@ -19,19 +25,18 @@ buildPythonPackage rec {
sha256 = "66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012";
};
# There is nothing to build
dontBuild = true;
nativeBuildInputs = [
bootstrapped-pip
(pipInstallHook.override{pip=null;})
(setuptoolsBuildHook.override{setuptools=null; wheel=null;})
];
nativeBuildInputs = [ bootstrapped-pip ];
installPhase = ''
dst=$out/${python.sitePackages}
mkdir -p $dst
export PYTHONPATH="$dst:$PYTHONPATH"
${python.pythonForBuild.interpreter} setup.py install --prefix=$out
wrapPythonPrograms
preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
'';
pipInstallFlags = [ "--ignore-installed" ];
# Adds setuptools to nativeBuildInputs causing infinite recursion.
catchConflicts = false;

4
pkgs/development/python-modules/sqlalchemy/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
version = "1.3.6";
version = "1.3.8";
src = fetchPypi {
inherit pname version;
sha256 = "1zxhabcgzspwrh9l7b68p57kqx4h664a1dp9xr8mi84r472pyzi1";
sha256 = "106digcgx7nwvykdvmnwf3vfxvfkdv6ykwk7sd325afklikgb3rg";
};
checkInputs = [

3
pkgs/development/python-modules/tables/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchPypi, python, buildPythonPackage
{ stdenv, lib, fetchPypi, python, buildPythonPackage
, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc, mock }:
with stdenv.lib;
@ -23,7 +23,6 @@ buildPythonPackage rec {
"--bzip2=${getDev bzip2}"
"--blosc=${getDev c-blosc}"
];
# Run the test suite.
# It requires the build path to be in the python search path.
# These tests take quite some time.

2
pkgs/development/python-modules/zope-deferredimport/default.nix
View File

@ -23,6 +23,8 @@ buildPythonPackage rec {
zope-testrunner --test-path=src []
'';
doCheck = false;
meta = with lib; {
description = "Allows you to perform imports names that will only be resolved when used in the code";
homepage = https://github.com/zopefoundation/zope.deferredimport;

2
pkgs/development/python-modules/zope_testrunner/default.nix
View File

@ -19,7 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
doCheck = !stdenv.isDarwin;
doCheck = false; # custom test modifies sys.path
meta = with stdenv.lib; {
description = "A flexible test runner with layer support";

8
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -124,12 +124,17 @@ addEnvHooks "$targetOffset" addCMakeParams
makeCmakeFindLibs(){
isystem_seen=
iframework_seen=
for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do
if test -n "$isystem_seen" && test -d "$flag"; then
isystem_seen=
export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}"
elif test -n "$iframework_seen" && test -d "$flag"; then
iframework_seen=
export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag}"
else
isystem_seen=
iframework_seen=
case $flag in
-I*)
export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}"
@ -143,6 +148,9 @@ makeCmakeFindLibs(){
-isystem)
isystem_seen=1
;;
-iframework)
iframework_seen=1
;;
esac
fi
done

24
pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
View File

@ -1,24 +0,0 @@
From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 18 May 2019 14:44:08 -0400
Subject: [PATCH] highlight: fix permission on file style
---
gtkdoc/highlight.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
index 8f6e470..d11c432 100644
--- a/gtkdoc/highlight.py
+++ b/gtkdoc/highlight.py
@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'):
def append_style_defs(css_file_name):
- os.chmod(css_file_name, stat.S_IWRITE)
+ os.chmod(css_file_name, 0o664)
with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
css.write(HTML_FORMATTER.get_style_defs())
--
2.21.0

9
pkgs/development/tools/documentation/gtk-doc/default.nix
View File

@ -15,20 +15,18 @@
stdenv.mkDerivation rec {
pname = "gtk-doc";
version = "1.30";
version = "1.32";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
sha256 = "14fihxj662gg4ln1ngff6s52zzkpbcc58qa0nxysxypnhp0h4ypk";
};
patches = [
passthru.respect_xml_catalog_files_var_patch
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
./0001-highlight-fix-permission-on-file-style.patch
];
outputDevdoc = "out";
@ -45,6 +43,7 @@ stdenv.mkDerivation rec {
libxslt
pkgconfig
python3
python3.pkgs.pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
libxml2Python
]
++ stdenv.lib.optional withDblatex dblatex
@ -77,6 +76,6 @@ stdenv.mkDerivation rec {
description = "Tools to extract documentation embedded in GTK and GNOME source code";
homepage = "https://www.gtk.org/gtk-doc";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
maintainers = with maintainers; [ pSub worldofpeace ];
};
}

2
pkgs/development/tools/misc/ccls/wrapper
View File

@ -9,4 +9,4 @@ fi
initString+="]}}"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"

2
pkgs/development/tools/misc/cquery/wrapper
View File

@ -9,4 +9,4 @@ fi
initString+="]}"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@"
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"

9
pkgs/development/tools/parsing/re2c/default.nix
View File

@ -2,19 +2,20 @@
stdenv.mkDerivation rec {
pname = "re2c";
version = "1.0.3";
sourceRoot = "${src.name}/re2c";
version = "1.2.1";
src = fetchFromGitHub {
owner = "skvadrik";
repo = "re2c";
rev = version;
sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi";
sha256 = "1qj0ck9msb9h8g9qb1lr57jmlj8x68ini3y3ccdifjjahhhr0hd4";
};
nativeBuildInputs = [ autoreconfHook ];
doCheck = true;
enableParallelBuilding = true;
preCheck = ''
patchShebangs run_tests.sh
'';

27
pkgs/development/tools/valadoc/default.nix
View File

@ -1,27 +0,0 @@
{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
stdenv.mkDerivation rec {
version = "0.36.2";
pname = "valadoc";
src = fetchurl {
url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h";
};
nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ];
buildInputs = [ graphviz glib gnome3.libgee expat ];
passthru = {
updateScript = gnome3.updateScript {
packageName = "valadoc";
};
};
meta = with stdenv.lib; {
description = "A documentation generator for generating API documentation from Vala source code";
homepage = https://valadoc.org;
license = licenses.gpl2;
maintainers = with maintainers; [ sternenseemann ];
platforms = platforms.linux;
};
}

2
pkgs/games/simutrans/default.nix
View File

@ -97,7 +97,7 @@ let
cat > "$out/bin/simutrans" <<EOF
#!${runtimeShell}
cd "$out"/share/simutrans
exec "${binaries}/bin/simutrans" -use_workdir "\''${extraFlagsArray[@]}" "\$@"
exec "${binaries}/bin/simutrans" -use_workdir "\$@"
EOF
chmod +x "$out/bin/simutrans"
'';

4
pkgs/os-specific/linux/apparmor/default.nix
View File

@ -14,7 +14,7 @@
let
apparmor-series = "2.13";
apparmor-patchver = "1";
apparmor-patchver = "3";
apparmor-version = apparmor-series + "." + apparmor-patchver;
apparmor-meta = component: with stdenv.lib; {
@ -27,7 +27,7 @@ let
apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
sha256 = "7a060d94c275e59f96bacd1da150e6fee2c9152a85bf57800109d07d51ef8afb";
sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16";
};
prePatchCommon = ''

12
pkgs/os-specific/linux/libnl/default.nix
View File

@ -1,25 +1,19 @@
{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig
{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}:
stdenv.mkDerivation rec {
pname = "libnl";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
repo = "libnl";
owner = "thom311";
rev = "libnl${lib.replaceStrings ["."] ["_"] version}";
sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp";
sha256 = "1ak30jcx52gl5yz1691qq0b76ldbcp2z6vsvdr2mrrwqiplqbcs2";
};
outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py";
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/musl/48d2a28710ae40877fd3e178ead1fb1bb0baa62c/dev-libs/libnl/files/libnl-3.3.0_rc1-musl.patch";
sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r";
});
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ]

11
pkgs/os-specific/linux/shadow/default.nix
View File

@ -19,13 +19,13 @@ in
stdenv.mkDerivation rec {
pname = "shadow";
version = "4.6";
version = "4.7";
src = fetchFromGitHub {
owner = "shadow-maint";
repo = "shadow";
rev = version;
sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82";
sha256 = "0a7g9k83igfid8pybqpk6fracmz2q021isn2by3994p4hhh3s327";
};
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
# Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch
dots_in_usernames
# Check for correct DocBook version during configure
# https://github.com/shadow-maint/shadow/pull/162
(fetchpatch {
url = "https://github.com/shadow-maint/shadow/commit/47797ca6654f79e3de854a6c69db2bdb0516db08.patch";
sha256 = "1zn8f6fd26gj5sh60099xqc7mjwgbbkkic5xfigvxa4b90vm8fd7";
})
];
# The nix daemon often forbids even creating set[ug]id files.

3
pkgs/os-specific/linux/systemd/default.nix
View File

@ -115,7 +115,7 @@ stdenv.mkDerivation {
export LC_ALL="en_US.UTF-8";
# FIXME: patch this in systemd properly (and send upstream).
# already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c units/systemd-logind.service.in units/systemd-nspawn@.service.in; do
test -e $i
substituteInPlace $i \
--replace /usr/bin/getent ${getent}/bin/getent \
@ -125,6 +125,7 @@ stdenv.mkDerivation {
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${lib.getBin utillinux}/sbin/sulogin \
--replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
done

12
pkgs/servers/sql/postgresql/default.nix
View File

@ -81,8 +81,8 @@ let
postInstall =
''
moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
moveToOutput "lib/libpgcommon.a" "$out"
moveToOutput "lib/libpgport.a" "$out"
moveToOutput "lib/libpgcommon*.a" "$out"
moveToOutput "lib/libpgport*.a" "$out"
moveToOutput "lib/libecpg*" "$out"
# Prevent a retained dependency on gcc-wrapper.
@ -200,4 +200,12 @@ in self: {
inherit self;
};
postgresql_12 = self.callPackage generic {
version = "12.0";
psqlSchema = "12";
sha256 = "1ijm13gx1d9ai09n26nbdc77n9b8akh6pj21yy9vfn7p2mr3k8nd";
this = self.postgresql_12;
inherit self;
};
}

30
pkgs/servers/x11/xorg/default.nix
View File

@ -664,11 +664,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation {
name = "libICE-1.0.9";
name = "libICE-1.0.10";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2;
sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
url = mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2;
sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation {
name = "libXt-1.1.5";
name = "libXt-1.2.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2;
sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6";
url = mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2;
sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@ -1392,11 +1392,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation {
name = "xbacklight-1.2.2";
name = "xbacklight-1.2.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2;
sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1";
url = mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2;
sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@ -1535,11 +1535,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
name = "xclock-1.0.8";
name = "xclock-1.0.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xclock-1.0.8.tar.bz2;
sha256 = "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k";
url = mirror://xorg/individual/app/xclock-1.0.9.tar.bz2;
sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation {
name = "xorgproto-2018.4";
name = "xorgproto-2019.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2;
sha256 = "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y";
url = mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2;
sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];

10
pkgs/servers/x11/xorg/tarballs.list
View File

@ -27,9 +27,9 @@ mirror://xorg/individual/app/twm-1.0.10.tar.bz2
mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
mirror://xorg/individual/app/xauth-1.1.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2
mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2
mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
mirror://xorg/individual/app/xclock-1.0.9.tar.bz2
mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2
mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
@ -173,7 +173,7 @@ mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
@ -203,7 +203,7 @@ mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2
@ -211,7 +211,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2
mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
mirror://xorg/individual/util/lndir-1.0.3.tar.bz2

4
pkgs/shells/xonsh/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.9.10";
version = "0.9.11";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = "refs/tags/${version}";
sha256 = "0dil7vannl8sblzz528503ich8m8g0ld0p496bgw6jjh0pzkdskc";
sha256 = "0kvq1hlmlb8k9z6z385924fcqq3sf36pmi3aqczlb90m37rwzb6d";
};
LC_ALL = "en_US.UTF-8";

24
pkgs/tools/filesystems/mtdutils/default.nix
View File

@ -1,25 +1,27 @@
{ stdenv, fetchurl, libuuid, lzo, zlib, acl }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "mtd-utils";
version = "1.5.2";
version = "2.1.1";
src = fetchurl {
url = ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.5.2.tar.bz2;
sha256 = "007lhsd8yb34l899r4m37whhzdw815cz4fnjbpnblfha524p7dax";
url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd";
};
patchPhase = ''
sed -i -e s,/usr/local,, -e s,/usr,$out, common.mk
'';
nativeBuildInputs = [ autoreconfHook cmocka pkgconfig ];
buildInputs = [ acl libuuid lzo zlib zstd ];
buildInputs = [ libuuid lzo zlib acl ];
configureFlags = [ "--enable-unit-tests" "--enable-tests" ];
enableParallelBuilding = true;
doCheck = true;
meta = {
description = "Tools for MTD filesystems";
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.linux-mtd.infradead.org/;
maintainers = with stdenv.lib.maintainers; [viric];
homepage = "http://www.linux-mtd.infradead.org/";
maintainers = with stdenv.lib.maintainers; [ viric ];
platforms = with stdenv.lib.platforms; linux;
};
}

4
pkgs/tools/misc/ethtool/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ethtool";
version = "5.2";
version = "5.3";
src = fetchurl {
url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz";
sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6";
sha256 = "1i14zrg4a84zjpwvqi8an0zx0hm06g614a79zc2syrkhrvdw1npk";
};
meta = with stdenv.lib; {

5
pkgs/tools/misc/hdf5/default.nix
View File

@ -53,7 +53,10 @@ stdenv.mkDerivation rec {
postInstall = ''
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
moveToOutput bin/h5cc "''${!outputDev}"
moveToOutput 'bin/h5cc' "''${!outputDev}"
moveToOutput 'bin/h5c++' "''${!outputDev}"
moveToOutput 'bin/h5fc' "''${!outputDev}"
moveToOutput 'bin/h5pcc' "''${!outputDev}"
'';
meta = {

11
pkgs/tools/networking/dnsmasq/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus, nettle
{ stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch
, libidn, libnetfilter_conntrack }:
with stdenv.lib;
@ -19,6 +19,15 @@ stdenv.mkDerivation rec {
sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd";
};
patches = [
# Fix build with nettle 3.5
(fetchpatch {
name = "nettle-3.5.patch";
url = "thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e";
sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic";
})
];
preBuild = ''
makeFlagsArray=("COPTS=${copts}")
'';

13
pkgs/tools/networking/network-manager/default.nix
View File

@ -10,11 +10,11 @@ let
pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
in stdenv.mkDerivation rec {
pname = "network-manager";
version = "1.20.2";
version = "1.20.4";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "115cgz448vypc7c592lqqjd7lp2kzdczhjk4ran6qls65hzkfkji";
sha256 = "0k4i6m8acp48vl6l13267wv6kfkmzfjq2mraaa5m9n82wyvkimx3";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -51,15 +51,6 @@ in stdenv.mkDerivation rec {
];
patches = [
# 1.20.2 added a decorators.sh script but they forgot to distribute it (breaking the build)
# as it was to fix things with gtk-doc 1.32 we can safely revert it.
(fetchpatch {
url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/2d941dc95a1d94d023ac8f98df2f344dbb1d223e.patch";
sha256 = "1mvbajddwd6diwk6dgjg5p65i6852gx6b9p3949rs63d2i6yzg21";
excludes = [ "tools/decorators.sh" ];
revert = true;
})
(substituteAll {
src = ./fix-paths.patch;
inherit iputils kmod openconnect ethtool gnused dbus;

26
pkgs/tools/networking/network-manager/fix-paths.patch
View File

@ -39,11 +39,33 @@ index 2f442bf23..c3e797bf4 100644
#ExecReload=/bin/kill -HUP $MAINPID
ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure
diff --git a/libnm/meson.build b/libnm/meson.build
index 710ef181d..3aa182dd4 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -280,7 +280,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
@@ -289,7 +289,7 @@ if enable_introspection
name,
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'],
depends: libnm_gir,
)
endif
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 823cf48a5..cda16e48d 100644
index 67e23b8f9..b0ce52711 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -12822,14 +12822,14 @@ nm_device_start_ip_check (NMDevice *self)
@@ -12840,14 +12840,14 @@ nm_device_start_ip_check (NMDevice *self)
gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
if (gw) {
nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);

15
pkgs/tools/networking/tcpdump/default.nix
View File

@ -1,20 +1,13 @@
{ stdenv, fetchurl, libpcap, perl }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "tcpdump";
version = "4.9.2";
version = "4.9.3";
# leaked embargoed security update
src = fetchurl {
url = "https://src.fedoraproject.org/lookaside/pkgs/tcpdump/tcpdump-4.9.2.tar.gz/sha512/e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b/tcpdump-4.9.2.tar.gz";
sha256 = "0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr";
url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c";
};
# src = fetchFromGitHub rec {
# owner = "the-tcpdump-group";
# repo = "tcpdump";
# rev = "${repo}-${version}";
# sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
# };
postPatch = ''
patchShebangs tests

11
pkgs/tools/networking/unbound/default.nix
View File

@ -2,13 +2,20 @@
stdenv.mkDerivation rec {
pname = "unbound";
version = "1.9.3";
version = "1.9.4";
src = fetchurl {
url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
sha256 = "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v";
sha256 = "1c2bjm13x8bkw0ds1mhn9ivd2gzmfrb0x5y76bkz09a04bxjagix";
};
# https://github.com/NLnetLabs/unbound/pull/90
postPatch = ''
substituteInPlace validator/val_secalgo.c \
--replace '&nettle_secp_256r1' 'nettle_get_secp_256r1()' \
--replace '&nettle_secp_384r1' 'nettle_get_secp_384r1()'
'';
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
buildInputs = [ openssl nettle expat libevent ];

1
pkgs/top-level/aliases.nix
View File

@ -386,6 +386,7 @@ mapAliases ({
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
v4l_utils = v4l-utils; # added 2019-08-07
vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01

7
pkgs/top-level/all-packages.nix
View File

@ -8595,8 +8595,6 @@ in
vala_0_46
vala;
valadoc = callPackage ../development/tools/valadoc { };
wcc = callPackage ../development/compilers/wcc { };
wla-dx = callPackage ../development/compilers/wla-dx { };
@ -11248,6 +11246,7 @@ in
gnutls = callPackage ../development/libraries/gnutls/default.nix {
inherit (darwin.apple_sdk.frameworks) Security;
utillinux = utillinuxMinimal; # break the cyclic dependency
};
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
@ -12823,8 +12822,7 @@ in
};
mesa = callPackage ../development/libraries/mesa {
# 7 is the default, but only on Linux, so keep this for now
llvmPackages = llvmPackages_7;
llvmPackages = llvmPackages_9;
inherit (darwin.apple_sdk.frameworks) OpenGL;
inherit (darwin.apple_sdk.libs) Xplugin;
};
@ -15181,6 +15179,7 @@ in
postgresql_9_6
postgresql_10
postgresql_11
postgresql_12
;
postgresql = postgresql_11.override { this = postgresql; };
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;

2
pkgs/top-level/perl-packages.nix
View File

@ -20157,6 +20157,8 @@ let
sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac";
};
propagatedBuildInputs = [ XMLParser XMLSAX ];
# Avoid creating perllocal.pod, which contains a timestamp
installTargets = "pure_install";
meta = {
description = "SAX Driver for Expat";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];