From 0b059cc9561672215c178ccd02f97fd7bf2308f8 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 9 Mar 2019 20:46:23 +0100 Subject: [PATCH 01/46] qtbase: Fix paths returned by qmake -query --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 92ac8a24201..b3d12fcea46 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation { NIX_OUTPUT_BIN = $bin NIX_OUTPUT_DEV = $dev NIX_OUTPUT_OUT = $out - NIX_OUTPUT_DOC = $dev/$qtDocPrefix + NIX_OUTPUT_DOC = $out/$qtDocPrefix NIX_OUTPUT_QML = $bin/$qtQmlPrefix NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix EOF @@ -376,6 +376,18 @@ stdenv.mkDerivation { moveToOutput bin "$dev" '' + # Fix paths returned by qmake -query + + '' + cat > $dev/bin/qt.conf < Date: Mon, 1 Jul 2019 09:45:42 -0700 Subject: [PATCH 02/46] gobject-introspection: 1.60.1 -> 1.60.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gobject-introspection/versions --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b1fdb916b5c..43695d8db58 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -9,7 +9,7 @@ let pname = "gobject-introspection"; - version = "1.60.1"; + version = "1.60.2"; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cr4r3lh5alrks9q2ycs1kn2crnkhrhn2wrmibng6dndkr4x2i6q"; + sha256 = "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz"; }; outputs = [ "out" "dev" "man" ]; From 2c0a6e1ea0529d1cd23b10ce5cdd4b108bfcbc71 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 7 Jul 2019 12:26:54 +0200 Subject: [PATCH 03/46] rustc: 1.35.0 -> 1.36.0 --- pkgs/development/compilers/rust/bootstrap.nix | 14 +++++------ .../rust/patches/net-tcp-disable-tests.patch | 23 ++++++++----------- pkgs/development/compilers/rust/rustc.nix | 4 ++-- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 5eccc92a0c7..973d17e1c7b 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.34.2"; + version = "1.35.0"; # fetch hashes by running `print-hashes.sh 1.34.2` hashes = { - i686-unknown-linux-gnu = "926bafd09eb90ba7d5a0195fcffb8f33dd57e515af4f8987a143459f6b1d3f04"; - x86_64-unknown-linux-gnu = "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f"; - armv7-unknown-linux-gnueabihf = "70d1057fcc133dc3e44377060a00d2f9d3a134e2670963d3f1d93f3dbfa0548e"; - aarch64-unknown-linux-gnu = "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8"; - i686-apple-darwin = "b9fc44cbb06050975664f1033d1337bb38d5ea73b503a5d3af5409033397be5c"; - x86_64-apple-darwin = "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8"; + i686-unknown-linux-gnu = "05337776b3645e4b8c8c7ced0bcd1615cf9ad1b9c8b3d0f333620e5401e31aee"; + x86_64-unknown-linux-gnu = "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c"; + armv7-unknown-linux-gnueabihf = "8f0f32d8ddc6fb7bcb8f50ec5e694078799d93facbf135eec5bd9a8c94d0c11e"; + aarch64-unknown-linux-gnu = "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952"; + i686-apple-darwin = "6a45ae8db094c5f6c57c5594a00f1a92b08c444a7347a657b4033186d4f08b19"; + x86_64-apple-darwin = "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6"; }; platform = diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch index 57abb3117ec..583a6027f83 100644 --- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch +++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch @@ -1,6 +1,6 @@ -diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/src/libstd/net/tcp.rs ---- rustc-1.35.0-src-orig/src/libstd/net/tcp.rs 2019-05-20 14:10:15.000000000 +0200 -+++ rustc-1.35.0-src/src/libstd/net/tcp.rs 2019-06-13 19:59:46.740611889 +0200 +diff -ru rustc-1.36.0-src-orig/src/libstd/net/tcp.rs rustc-1.36.0-src/src/libstd/net/tcp.rs +--- rustc-1.36.0-src-orig/src/libstd/net/tcp.rs 2019-07-03 10:00:00.000000000 +0200 ++++ rustc-1.36.0-src/src/libstd/net/tcp.rs 2019-07-07 11:33:35.378130207 +0200 @@ -973,6 +973,7 @@ } } @@ -57,19 +57,16 @@ diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/sr fn clone_while_reading() { each_ip(&mut |addr| { let accept = t!(TcpListener::bind(&addr)); -@@ -1597,7 +1604,10 @@ +@@ -1597,7 +1604,7 @@ - // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code + // FIXME: re-enabled openbsd tests once their socket timeout code // no longer has rounding errors. -- #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)] -+ #[cfg_attr(any(target_os = "bitrig", -+ target_os = "netbsd", -+ target_os = "openbsd", -+ target_os = "macos"), ignore)] +- #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)] ++ #[cfg_attr(any(target_os = "netbsd", target_os = "openbsd", target_os = "macos"), ignore)] #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 #[test] fn timeouts() { -@@ -1643,6 +1653,7 @@ +@@ -1643,6 +1650,7 @@ drop(listener); } @@ -77,7 +74,7 @@ diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/sr #[test] #[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31 fn test_read_with_timeout() { -@@ -1687,6 +1698,7 @@ +@@ -1687,6 +1695,7 @@ drop(listener); } @@ -85,7 +82,7 @@ diff -ru -x '*~' rustc-1.35.0-src-orig/src/libstd/net/tcp.rs rustc-1.35.0-src/sr #[test] #[cfg_attr(target_env = "sgx", ignore)] fn nodelay() { -@@ -1719,6 +1731,7 @@ +@@ -1719,6 +1728,7 @@ assert_eq!(ttl, t!(stream.ttl())); } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 099e41805ab..056f17c43d7 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,11 +17,11 @@ let llvmShared = llvm_7.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0bbizy6b7002v1rdhrxrf5gijclbyizdhkglhp81ib3bf5x66kas"; + sha256 = "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"; }; __darwinAllowLocalNetworking = true; From 33723434a888b7b9ce5a9b35dba2e77baf254109 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 7 Jul 2019 14:44:04 +0200 Subject: [PATCH 04/46] rustc: Add setup hook to set $CARGO_HOME This works around 'failed to open: /homeless-shelter/.cargo/.package-cache' with Rust 1.36 even when we're using 'cargo --frozen'. --- pkgs/development/compilers/rust/rustc.nix | 2 ++ pkgs/development/compilers/rust/setup-hook.sh | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 pkgs/development/compilers/rust/setup-hook.sh diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 056f17c43d7..66da4d33251 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -206,6 +206,8 @@ in stdenv.mkDerivation rec { # https://github.com/rust-lang/rust/issues/30181 # enableParallelBuilding = false; + setupHooks = ./setup-hook.sh; + requiredSystemFeatures = [ "big-parallel" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/rust/setup-hook.sh b/pkgs/development/compilers/rust/setup-hook.sh new file mode 100644 index 00000000000..7078ec7060b --- /dev/null +++ b/pkgs/development/compilers/rust/setup-hook.sh @@ -0,0 +1,4 @@ +# Fix 'failed to open: /homeless-shelter/.cargo/.package-cache' in rust 1.36. +if [[ -z $IN_NIX_SHELL && -z $CARGO_HOME ]]; then + export CARGO_HOME=$TMPDIR +fi From 05ad8cf2095aa77d7def4f18abf3a9630835c9d0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Jul 2019 19:58:46 +0200 Subject: [PATCH 05/46] iproute: 5.1.0 -> 5.2.0 "Not a lot of big new features in this release. Just the usual array of small fixes across the board." [0] File changes: None nix path-info -S: 5.1.0 46637048 5.2.0 46627312 [0]: https://www.spinics.net/lists/netdev/msg584562.html --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 1e53112d360..527edc5ea74 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kvvrz5mlpjxqcm7vl6i8w6l1cb2amp6p5xyq006pgzafc49hnnw"; + sha256 = "1a2dywa2kam24951byv9pl32mb9z6klh7d4vp8fwfgrm4vn5vfd5"; }; preConfigure = '' From 220c628fc3069b0fbcda5b4a4d29bf98df41e434 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jul 2019 15:03:46 -0500 Subject: [PATCH 06/46] libdrm: 2.4.98 -> 2.4.99 https://lists.x.org/archives/xorg-announce/2019-July/003001.html --- pkgs/development/libraries/libdrm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4ed3ad356a9..bdc191fe8a3 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.98"; + pname = "libdrm"; + version = "2.4.99"; src = fetchurl { - url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "150qdzsm2nx6dfacc75rx53anzsc6m31nhxidf5xxax3mk6fvq4b"; + url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd"; }; outputs = [ "out" "dev" "bin" ]; From 9d329c22ac2883448d7e0097e52eaccb9552ab92 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 25 Jun 2019 18:56:24 -0500 Subject: [PATCH 07/46] libinput: 1.13.2 -> 1.13.4 https://lists.freedesktop.org/archives/wayland-devel/2019-June/040650.html https://lists.freedesktop.org/archives/wayland-devel/2019-June/040675.html --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 651c4329708..0c759835183 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.13.2"; + version = "1.13.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx"; + sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; }; outputs = [ "bin" "out" "dev" ]; From d086573e6c1736bce711e4b16fbd1ba8fde61abe Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 12 Jul 2019 00:21:52 -0400 Subject: [PATCH 08/46] vala: 0.44.3 -> 0.44.5 https://gitlab.gnome.org/GNOME/vala/raw/0.44.5/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 6400f6e1387..353963007d4 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -129,8 +129,8 @@ in rec { }; vala_0_44 = generic { - version = "0.44.3"; - sha256 = "1sgas7z6y9r2mf4pxry3fx2awdnzn3vlg2sxd3hqpy2a90ib8lw5"; + version = "0.44.5"; + sha256 = "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv"; }; vala = vala_0_44; From 552803f6f56b503536e77c3bc6bb28ac0375a5f1 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 26 May 2019 16:43:24 +0200 Subject: [PATCH 09/46] qt 5.12.0 -> 5.12.3 --- .../libraries/qt-5/5.12/default.nix | 1 - pkgs/development/libraries/qt-5/5.12/fetch.sh | 2 +- .../libraries/qt-5/5.12/qtbase.patch | 49 +-- .../qt-5/5.12/qtwebengine-CVE-2019-5786.patch | 26 -- pkgs/development/libraries/qt-5/5.12/srcs.nix | 320 +++++++++--------- .../libraries/qt-5/modules/qtbase.nix | 31 +- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 216 insertions(+), 215 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 1fbf7b57289..186e154597f 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -60,7 +60,6 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch - ./qtwebengine-CVE-2019-5786.patch ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index aa3a0fe9489..a4d2fc82ff2 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch index aa987acbe92..a3b4e438fe8 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -2,7 +2,7 @@ diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 61bea952b2..9909dae726 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ QMAKE_FIX_RPATH = install_name_tool -id @@ -90,7 +90,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -263,15 +263,14 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul index 99f68b78f5..dde69cb7c2 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -63,199 +63,3 @@ qt { - } +@@ -64,202 +64,6 @@ } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { -- QMAKE_RPATHDIR += @executable_path/Frameworks +- QMAKE_RPATHDIR += @executable_path/../Frameworks - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks -} - @@ -463,6 +462,10 @@ index 99f68b78f5..dde69cb7c2 100644 - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -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.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf @@ -532,7 +535,7 @@ diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 8360dd8b38..8b13789179 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ +@@ -1,54 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -568,10 +571,6 @@ index 8360dd8b38..8b13789179 100644 -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) - --sysrootified = --for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val --QMAKE_INCDIR_OPENGL = $$sysrootified -- -QMAKESPEC_NAME = $$basename(QMAKESPEC) - -# Resolve SDK version of various tools @@ -595,24 +594,24 @@ diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index 65212b2abf..accd4c07f0 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf -@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_ - # Tools need qmldir and plugins.qmltypes always installed on the file system - qmldir.files = $$qmldir_file $$fq_aux_qml_files +@@ -54,7 +54,7 @@ + + qmldir.files = $$qmldir_file install_qml_files: qmldir.files += $$fq_qml_files --qmldir.path = $$instbase/$$TARGETPATH +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += qmldir - !debug_and_release|!build_all|CONFIG(release, debug|release) { + qmlfiles.base = $$_PRO_FILE_PWD_ diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index cd6377dcc6..e98bf98151 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf -@@ -56,7 +56,7 @@ qml1_target { - instbase = $$[QT_INSTALL_QML] - } +@@ -50,7 +50,7 @@ --target.path = $$instbase/$$TARGETPATH + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += target @@ -746,7 +745,7 @@ index 8f98987b99..21b3bb8b32 100644 !static: target.CONFIG = no_dll INSTALLS += target } -@@ -29,33 +23,33 @@ +@@ -29,35 +23,35 @@ #headers qt_install_headers { gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES @@ -762,6 +761,8 @@ index 8f98987b99..21b3bb8b32 100644 private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist INSTALLS += private_headers qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES @@ -876,7 +877,7 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea index 463e30e1c3..0e1ab669e4 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths() +@@ -2668,6 +2668,15 @@ QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -889,9 +890,9 @@ index 463e30e1c3..0e1ab669e4 100644 + } + } + - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp index bed62a02bd..73158993f7 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch deleted file mode 100644 index ec9a432ea70..00000000000 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc -@@ -135,14 +135,16 @@ - if (!raw_data_ || error_code_) - return nullptr; - -- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -- if (finished_loading_) { -- array_buffer_result_ = result; -- AdjustReportedMemoryUsageToV8( -- -1 * static_cast(raw_data_->ByteLength())); -- raw_data_.reset(); -+ if (!finished_loading_) { -+ return DOMArrayBuffer::Create( -+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); - } -- return result; -+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); -+ AdjustReportedMemoryUsageToV8(-1 * -+ static_cast(raw_data_->ByteLength())); -+ -+ raw_data_.reset(); -+ return array_buffer_result_; - } - - String FileReaderLoader::StringResult() { diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix index d83edc97e94..ce567c3a2bc 100644 --- a/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1"; - name = "qt3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d"; + name = "qt3d-everywhere-src-5.12.3.tar.xz"; }; }; qtactiveqt = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52"; - name = "qtactiveqt-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz"; + sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f"; + name = "qtactiveqt-everywhere-src-5.12.3.tar.xz"; }; }; qtandroidextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm"; - name = "qtandroidextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f"; + name = "qtandroidextras-everywhere-src-5.12.3.tar.xz"; }; }; qtbase = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz"; - sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy"; - name = "qtbase-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz"; + sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701"; + name = "qtbase-everywhere-src-5.12.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj"; - name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea"; + name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz"; }; }; qtcharts = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz"; - sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww"; - name = "qtcharts-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz"; + sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9"; + name = "qtcharts-everywhere-src-5.12.3.tar.xz"; }; }; qtconnectivity = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz"; - sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f"; - name = "qtconnectivity-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz"; + sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661"; + name = "qtconnectivity-everywhere-src-5.12.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz"; - sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf"; - name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz"; + sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313"; + name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz"; }; }; qtdeclarative = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz"; - sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag"; - name = "qtdeclarative-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz"; + sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7"; + name = "qtdeclarative-everywhere-src-5.12.3.tar.xz"; }; }; qtdoc = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz"; - sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h"; - name = "qtdoc-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz"; + sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f"; + name = "qtdoc-everywhere-src-5.12.3.tar.xz"; }; }; qtgamepad = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz"; - sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac"; - name = "qtgamepad-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz"; + sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642"; + name = "qtgamepad-everywhere-src-5.12.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1"; - name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; + sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73"; + name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; }; }; qtimageformats = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z"; - name = "qtimageformats-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz"; + sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2"; + name = "qtimageformats-everywhere-src-5.12.3.tar.xz"; }; }; qtlocation = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz"; - sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh"; - name = "qtlocation-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz"; + sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6"; + name = "qtlocation-everywhere-src-5.12.3.tar.xz"; }; }; qtmacextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr"; - name = "qtmacextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed"; + name = "qtmacextras-everywhere-src-5.12.3.tar.xz"; }; }; qtmultimedia = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw"; - name = "qtmultimedia-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz"; + sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301"; + name = "qtmultimedia-everywhere-src-5.12.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz"; - sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1"; - name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz"; + sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332"; + name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz"; }; }; qtpurchasing = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr"; - name = "qtpurchasing-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz"; + sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e"; + name = "qtpurchasing-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz"; - sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb"; - name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz"; + sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46"; + name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; - sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9"; - name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; + sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a"; + name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz"; - sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09"; - name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz"; + sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42"; + name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz"; }; }; qtscript = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz"; - sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp"; - name = "qtscript-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz"; + sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e"; + name = "qtscript-everywhere-src-5.12.3.tar.xz"; }; }; qtscxml = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz"; - sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw"; - name = "qtscxml-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz"; + sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19"; + name = "qtscxml-everywhere-src-5.12.3.tar.xz"; }; }; qtsensors = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz"; - sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5"; - name = "qtsensors-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz"; + sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc"; + name = "qtsensors-everywhere-src-5.12.3.tar.xz"; }; }; qtserialbus = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz"; - sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb"; - name = "qtserialbus-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz"; + sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d"; + name = "qtserialbus-everywhere-src-5.12.3.tar.xz"; }; }; qtserialport = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz"; - sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r"; - name = "qtserialport-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz"; + sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51"; + name = "qtserialport-everywhere-src-5.12.3.tar.xz"; }; }; qtspeech = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz"; - sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r"; - name = "qtspeech-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz"; + sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5"; + name = "qtspeech-everywhere-src-5.12.3.tar.xz"; }; }; qtsvg = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz"; - sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb"; - name = "qtsvg-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz"; + sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2"; + name = "qtsvg-everywhere-src-5.12.3.tar.xz"; }; }; qttools = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz"; - sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p"; - name = "qttools-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz"; + sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8"; + name = "qttools-everywhere-src-5.12.3.tar.xz"; }; }; qttranslations = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz"; - sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv"; - name = "qttranslations-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz"; + sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca"; + name = "qttranslations-everywhere-src-5.12.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; - sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv"; - name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; + sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22"; + name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; }; }; qtwayland = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz"; - sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m"; - name = "qtwayland-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz"; + sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff"; + name = "qtwayland-everywhere-src-5.12.3.tar.xz"; }; }; qtwebchannel = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz"; - sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5"; - name = "qtwebchannel-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz"; + sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a"; + name = "qtwebchannel-everywhere-src-5.12.3.tar.xz"; }; }; qtwebengine = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz"; - sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x"; - name = "qtwebengine-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz"; + sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317"; + name = "qtwebengine-everywhere-src-5.12.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz"; - sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5"; - name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz"; + sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3"; + name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz"; }; }; qtwebsockets = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz"; - sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4"; - name = "qtwebsockets-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz"; + sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577"; + name = "qtwebsockets-everywhere-src-5.12.3.tar.xz"; }; }; qtwebview = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz"; - sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p"; - name = "qtwebview-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz"; + sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5"; + name = "qtwebview-everywhere-src-5.12.3.tar.xz"; }; }; qtwinextras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz"; - sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6"; - name = "qtwinextras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz"; + sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b"; + name = "qtwinextras-everywhere-src-5.12.3.tar.xz"; }; }; qtx11extras = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz"; - sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06"; - name = "qtx11extras-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz"; + sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613"; + name = "qtx11extras-everywhere-src-5.12.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.0"; + version = "5.12.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; - sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk"; - name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; + sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61"; + name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 458946b803d..8506a80ddf3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -229,6 +229,8 @@ stdenv.mkDerivation { "-widgets" "-opengl desktop" "-icu" + "-L" "${icu.out}/lib" + "-I" "${icu.dev}/include" "-pch" ] ++ lib.optionals (compareVersion "5.11.0" < 0) @@ -265,10 +267,18 @@ stdenv.mkDerivation { ++ [ "-system-zlib" + "-L" "${zlib.out}/lib" + "-I" "${zlib.dev}/include" "-system-libjpeg" + "-L" "${libjpeg.out}/lib" + "-I" "${libjpeg.dev}/include" "-system-harfbuzz" + "-L" "${harfbuzz.out}/lib" + "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" + "-L" "${openssl.out}/lib" + "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' @@ -297,10 +307,14 @@ stdenv.mkDerivation { "-system-xcb" "-xcb" "-qpa xcb" + "-L" "${libX11.out}/lib" + "-I" "${libX11.out}/include" + "-L" "${libXext.out}/lib" + "-I" "${libXext.out}/include" + "-L" "${libXrender.out}/lib" + "-I" "${libXrender.out}/include" - "-system-xkbcommon" "-libinput" - "-xkbcommon-evdev" "-no-eglfs" "-no-gbm" @@ -321,6 +335,19 @@ stdenv.mkDerivation { "-no-feature-renameat2" "-no-feature-getentropy" ] + ++ lib.optionals (compareVersion "5.12.1" < 0) [ + # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 + "-system-xkbcommon" + "-xkbcommon-evdev" + ] + ++ lib.optionals (cups != null) [ + "-L" "${cups.lib}/lib" + "-I" "${cups.dev}/include" + ] + ++ lib.optionals (mysql != null) [ + "-L" "${mysql.out}/lib" + "-I" "${mysql.out}/include" + ] ); enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73079bbced9..970a4749a9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12822,7 +12822,7 @@ in inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - harfbuzz = harfbuzzFull; + inherit harfbuzz; inherit libGL; inherit perl; inherit gtk3; From 02afb228e2ada0a251a82c9437e2227890baacf4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 10 Jul 2019 09:39:44 -0500 Subject: [PATCH 10/46] qt512: Update qtbase.patch --- .../libraries/qt-5/5.12/qtbase.patch | 485 ++++++++---------- 1 file changed, 222 insertions(+), 263 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch index a3b4e438fe8..118ffaa511e 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf 2019-07-10 09:35:08.917628566 -0500 +@@ -24,7 +24,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf 2019-07-10 09:35:08.917628566 -0500 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 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 -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -318,7 +293,7 @@ exists($$cmake_macros_file.input) { +@@ -318,7 +293,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 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 3ed6dd5889..4c7c8da21a 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) +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-10 09:35:08.917628566 -0500 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 3ed6dd5889..4c7c8da21a 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 3ed6dd5889..4c7c8da21a 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -272,25 +228,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -309,25 +253,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 3ed6dd5889..4c7c8da21a 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -346,11 +278,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,10 +256,9 @@ index 3ed6dd5889..4c7c8da21a 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 99f68b78f5..dde69cb7c2 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf 2019-07-10 09:35:08.917628566 -0500 @@ -64,202 +64,6 @@ } } @@ -466,10 +462,9 @@ index 99f68b78f5..dde69cb7c2 100644 !macx-xcode { generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf 2019-07-10 09:35:08.917628566 -0500 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -531,10 +526,9 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf 2019-07-10 09:35:08.917628566 -0500 @@ -1,54 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ @@ -590,10 +584,9 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 65212b2abf..accd4c07f0 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf 2019-07-10 09:35:08.917628566 -0500 @@ -54,7 +54,7 @@ qmldir.files = $$qmldir_file @@ -603,10 +596,9 @@ index 65212b2abf..accd4c07f0 100644 INSTALLS += qmldir qmlfiles.base = $$_PRO_FILE_PWD_ -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index cd6377dcc6..e98bf98151 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf 2019-07-10 09:35:08.918628595 -0500 @@ -50,7 +50,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH @@ -616,11 +608,10 @@ index cd6377dcc6..e98bf98151 100644 INSTALLS += target # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -30,7 +30,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -629,11 +620,10 @@ index 8354f30eea..62028fef8e 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -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): \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -642,11 +632,10 @@ index 3bb3823a8e..655b7b7db8 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 4ad9946ae0..6d66f29c26 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -34,8 +34,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -657,11 +646,10 @@ index 4ad9946ae0..6d66f29c26 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 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 +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -670,7 +658,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -681,7 +669,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -696,11 +684,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -709,11 +696,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -722,10 +708,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${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 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf 2019-07-10 09:35:08.918628595 -0500 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -787,11 +772,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -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 { +diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf 2019-07-10 09:35:08.918628595 -0500 +@@ -88,7 +88,7 @@ } } @@ -800,83 +784,9 @@ index 40528a65e2..903f795284 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -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) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - 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 c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - 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 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 463e30e1c3..0e1ab669e4 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp 2019-07-10 09:35:08.919628625 -0500 @@ -2668,6 +2668,15 @@ QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -893,11 +803,114 @@ index 463e30e1c3..0e1ab669e4 100644 QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); if (!libPathEnv.isEmpty()) { QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bed62a02bd..73158993f7 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h +--- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h 2019-07-10 09:35:08.920628655 -0500 +@@ -212,7 +212,7 @@ + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -290,7 +290,19 @@ + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-07-10 09:35:08.918628595 -0500 +@@ -3,7 +3,7 @@ + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -116,7 +116,7 @@ + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -130,7 +130,7 @@ + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-07-10 09:35:08.918628595 -0500 +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-07-10 09:35:08.918628595 -0500 +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -910,7 +923,7 @@ index bed62a02bd..73158993f7 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -932,10 +945,9 @@ index bed62a02bd..73158993f7 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -949,7 +961,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -962,10 +974,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -975,7 +986,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -991,11 +1002,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -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() +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1009,11 +1019,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 57629ac03a..8a7f219a98 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-07-10 09:35:08.919628625 -0500 +@@ -317,10 +317,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1026,10 +1035,10 @@ index 57629ac03a..8a7f219a98 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig +diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp 2019-07-10 09:35:08.919628625 -0500 @@ -39,6 +39,7 @@ #include @@ -1038,7 +1047,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1062,10 +1071,21 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp 2019-07-10 09:35:08.920628655 -0500 +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h 2019-07-10 09:35:08.919628625 -0500 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1082,11 +1102,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -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) +diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 ++++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -1095,63 +1114,3 @@ index 99d87e2e46..a4eab2aa72 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index b14a494296..779c4eda95 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -211,7 +211,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include -@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index 2c1005ad80..244147ea7d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index 1268730cc6..a50e9b0764 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - #endif - } - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Logger that also feeds messages to AUL. It needs to wrap the existing - // logger, as it needs to be able to short circuit the existing logger - // in case AUL prints to stderr. From 46409b5c32da64d06ec465d7cb0b2b6a1e1ad246 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 22 May 2017 11:01:00 +0200 Subject: [PATCH 11/46] Python: add sitecustomize.py, listen to NIX_PYTHONPATH This commit adds a Nix-specific module that recursively adds paths that are on `NIX_PYTHONPATH` to `sys.path`. In order to process possible `.pth` files `site.addsitedir` is used. The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but they will be added before the entries we add here and thus take precedence. The reason for adding support for this environment variable is that we can set it in a wrapper without breaking support for `PYTHONPATH`. --- .../python/cpython/2.7/default.nix | 5 +++++ .../interpreters/python/cpython/default.nix | 3 +++ .../interpreters/python/pypy/default.nix | 3 +++ .../interpreters/python/pypy/prebuilt.nix | 4 ++++ .../interpreters/python/sitecustomize.py | 18 ++++++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 pkgs/development/interpreters/python/sitecustomize.py diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 1503c221bdd..de980f1ca68 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -256,6 +256,11 @@ in with passthru; stdenv.mkDerivation ({ inherit passthru; + postFixup = '' + # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7. + cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + ''; + enableParallelBuilding = true; doCheck = false; # expensive, and fails diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 5eb7f3ec166..2f398d8dccb 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -221,6 +221,9 @@ in with passthru; stdenv.mkDerivation { find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + + # Include a sitecustomize.py file + cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails # We rebuild three times, once for each optimization level diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 42b652978bc..705ddb2a6f5 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -137,6 +137,9 @@ in with passthru; stdenv.mkDerivation rec { # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + + # Include a sitecustomize.py file + cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py ''; inherit passthru; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 6af198e65ea..1ac779ed25e 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -84,6 +84,10 @@ in with passthru; stdenv.mkDerivation { echo "Removing bytecode" find . -name "__pycache__" -type d -depth -exec rm -rf {} \; popd + + # Include a sitecustomize.py file + cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + ''; doInstallCheck = true; diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/pkgs/development/interpreters/python/sitecustomize.py new file mode 100644 index 00000000000..7e43be56147 --- /dev/null +++ b/pkgs/development/interpreters/python/sitecustomize.py @@ -0,0 +1,18 @@ +""" +This is a Nix-specific module for discovering modules built with Nix. + +The module recursively adds paths that are on `NIX_PYTHONPATH` to `sys.path`. In +order to process possible `.pth` files `site.addsitedir` is used. + +The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but they +will be added before the entries we add here and thus take precedence. + +Note the `NIX_PYTHONPATH` environment variable is unset in order to prevent leakage. +""" +import site +import os +import functools + +paths = os.environ.pop('NIX_PYTHONPATH', None) +if paths: + functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo()) From ec7f569211091282410050e89e68832d4fe60528 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 9 Jul 2019 14:34:15 +0200 Subject: [PATCH 12/46] python.buildEnv: use NIX_PYTHONPATH --- pkgs/development/interpreters/python/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 5a2ec567b9e..d97bef222a1 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -13,6 +13,7 @@ let env = let paths = requiredPythonModules (extraLibs ++ [ python ] ) ; + pythonPath = "${placeholder "out"}/${python.sitePackages}"; in buildEnv { name = "${python.name}-env"; @@ -35,7 +36,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done From 1e0ebdb8a4fe94db67b6520225d325292d60247c Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Sat, 13 Jul 2019 00:25:23 +0300 Subject: [PATCH 13/46] buildPythonPackage: add support for setupPyDistFlags Flags passed to the "python setup.py" command. --- doc/languages-frameworks/python.section.md | 1 + .../python/build-python-package-pyproject.nix | 9 ++++++--- .../python/build-python-package-setuptools.nix | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 77b387dd302..ae2f755ff9a 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -603,6 +603,7 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. +* `setupPyDistFlags ? []`: List of flags passed to `setup.py` command. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix index 86c450fcf92..38f2f67bfcd 100644 --- a/pkgs/development/interpreters/python/build-python-package-pyproject.nix +++ b/pkgs/development/interpreters/python/build-python-package-pyproject.nix @@ -5,10 +5,12 @@ }: { +# passed to "python setup.py" + setupPyDistFlags ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 # Rename to `buildOptions` because it is not setuptools specific? - setupPyBuildFlags ? [] +, setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -16,13 +18,14 @@ , ... } @ attrs: let + installOptions = lib.concatMapStringsSep " " (option: "--install-option ${option}") setupPyDistFlags; options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags; in attrs // { buildPhase = attrs.buildPhase or '' runHook preBuild mkdir -p dist echo "Creating a wheel..." - ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} . + ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${installOptions} ${options} . echo "Finished creating a wheel..." runHook postBuild ''; @@ -50,4 +53,4 @@ in attrs // { ${postShellHook} ''; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index 4c66fdec5f6..ecb3fed6a04 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -5,9 +5,11 @@ }: { +# passed to "python setup.py" + setupPyDistFlags ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 - setupPyBuildFlags ? [] +, setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -19,13 +21,16 @@ let # pip does the same thing: https://github.com/pypa/pip/pull/3265 setuppy = ./run_setup.py; + setupPyDistFlagsString = lib.concatStringsSep " " setupPyDistFlags; + setupPyBuildExtString = lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags)); + in attrs // { # we copy nix_run_setup over so it's executed relative to the root of the source # many project make that assumption buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup - ${python.pythonForBuild.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + ${python.pythonForBuild.interpreter} nix_run_setup ${setupPyDistFlagsString} ${setupPyBuildExtString} bdist_wheel runHook postBuild ''; From 271b57c219f9a4fe44fb4459e61f40418ec1a28c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Jul 2019 13:25:32 +0200 Subject: [PATCH 14/46] Revert "buildPythonPackage: add support for setupPyDistFlags" I merged this a bit too quick. We need to have a closer look at it. See the points brought up in https://github.com/NixOS/nixpkgs/pull/64682. This reverts commit 1e0ebdb8a4fe94db67b6520225d325292d60247c. --- doc/languages-frameworks/python.section.md | 1 - .../python/build-python-package-pyproject.nix | 9 +++------ .../python/build-python-package-setuptools.nix | 9 ++------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index ae2f755ff9a..77b387dd302 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -603,7 +603,6 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. -* `setupPyDistFlags ? []`: List of flags passed to `setup.py` command. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix index 38f2f67bfcd..86c450fcf92 100644 --- a/pkgs/development/interpreters/python/build-python-package-pyproject.nix +++ b/pkgs/development/interpreters/python/build-python-package-pyproject.nix @@ -5,12 +5,10 @@ }: { -# passed to "python setup.py" - setupPyDistFlags ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 # Rename to `buildOptions` because it is not setuptools specific? -, setupPyBuildFlags ? [] + setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -18,14 +16,13 @@ , ... } @ attrs: let - installOptions = lib.concatMapStringsSep " " (option: "--install-option ${option}") setupPyDistFlags; options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags; in attrs // { buildPhase = attrs.buildPhase or '' runHook preBuild mkdir -p dist echo "Creating a wheel..." - ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${installOptions} ${options} . + ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} . echo "Finished creating a wheel..." runHook postBuild ''; @@ -53,4 +50,4 @@ in attrs // { ${postShellHook} ''; -} +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index ecb3fed6a04..4c66fdec5f6 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -5,11 +5,9 @@ }: { -# passed to "python setup.py" - setupPyDistFlags ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 -, setupPyBuildFlags ? [] + setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -21,16 +19,13 @@ let # pip does the same thing: https://github.com/pypa/pip/pull/3265 setuppy = ./run_setup.py; - setupPyDistFlagsString = lib.concatStringsSep " " setupPyDistFlags; - setupPyBuildExtString = lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags)); - in attrs // { # we copy nix_run_setup over so it's executed relative to the root of the source # many project make that assumption buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup - ${python.pythonForBuild.interpreter} nix_run_setup ${setupPyDistFlagsString} ${setupPyBuildExtString} bdist_wheel + ${python.pythonForBuild.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel runHook postBuild ''; From 7da15d9b36ea115d5cd25a2c837867fffac3c192 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Jul 2019 13:26:39 +0200 Subject: [PATCH 15/46] buildPythonPackage: add support for setupPyGlobalFlags (2) --- doc/languages-frameworks/python.section.md | 1 + .../python/build-python-package-pyproject.nix | 13 ++++++++----- .../python/build-python-package-setuptools.nix | 11 ++++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 77b387dd302..4963c97a6c9 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -603,6 +603,7 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. +* `setupPyGlobalFlags ? []`: List of flags passed to `setup.py` command. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix index 86c450fcf92..085db44f3e8 100644 --- a/pkgs/development/interpreters/python/build-python-package-pyproject.nix +++ b/pkgs/development/interpreters/python/build-python-package-pyproject.nix @@ -5,10 +5,12 @@ }: { -# passed to "python setup.py build_ext" +# Global options passed to "python setup.py" + setupPyGlobalFlags ? [] +# Build options passed to "build_ext" # https://github.com/pypa/pip/issues/881 # Rename to `buildOptions` because it is not setuptools specific? - setupPyBuildFlags ? [] +, setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -16,13 +18,14 @@ , ... } @ attrs: let - options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags; + pipGlobalFlagsString = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyGlobalFlags; + pipBuildFlagsString = lib.concatMapStringsSep " " (option: "--build-option ${option}") setupPyBuildFlags; in attrs // { buildPhase = attrs.buildPhase or '' runHook preBuild mkdir -p dist echo "Creating a wheel..." - ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} . + ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${pipGlobalFlagsString} ${pipBuildFlagsString} . echo "Finished creating a wheel..." runHook postBuild ''; @@ -50,4 +53,4 @@ in attrs // { ${postShellHook} ''; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index 4c66fdec5f6..7738ea2f66a 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -5,9 +5,11 @@ }: { -# passed to "python setup.py build_ext" +# Global options passed to "python setup.py" + setupPyGlobalFlags ? [] +# Build options passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 - setupPyBuildFlags ? [] +, setupPyBuildFlags ? [] # Execute before shell hook , preShellHook ? "" # Execute after shell hook @@ -19,13 +21,16 @@ let # pip does the same thing: https://github.com/pypa/pip/pull/3265 setuppy = ./run_setup.py; + setupPyGlobalFlagsString = lib.concatStringsSep " " setupPyGlobalFlags; + setupPyBuildExtString = lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags)); + in attrs // { # we copy nix_run_setup over so it's executed relative to the root of the source # many project make that assumption buildPhase = attrs.buildPhase or '' runHook preBuild cp ${setuppy} nix_run_setup - ${python.pythonForBuild.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + ${python.pythonForBuild.interpreter} nix_run_setup ${setupPyGlobalFlagsString} ${setupPyBuildExtString} bdist_wheel runHook postBuild ''; From 941a1f37c25ffd0727cd2e951e747124f5c3c1a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 22:16:27 -0700 Subject: [PATCH 16/46] webkitgtk: 2.24.2 -> 2.24.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/webkitgtk/versions --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 91848ce1fb6..927301589b4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.24.2"; + version = "2.24.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "071jnjvjq6wsxx1jh4ql3j53h1nhphs5ga67fa5i9xjvs3qb3701"; + sha256 = "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl"; }; patches = optionals stdenv.isDarwin [ From d01362bba99173aae54ecec9e5e81fae61916af9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jul 2019 15:53:09 -0700 Subject: [PATCH 17/46] libwebp: 1.0.2 -> 1.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwebp/versions --- pkgs/development/libraries/libwebp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index b0457e76f2f..c11f70290a4 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "1cb4sm6h1czvk9kqqgld3g5f0d9qv60xnbbv0kl7cr7d826b8irx"; + sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; }; configureFlags = [ From 3f3403bfcf1ac98b1fbdb6c1f993047e7414131c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jul 2019 20:26:54 -0700 Subject: [PATCH 18/46] x265: 3.0 -> 3.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/x265/versions --- pkgs/development/libraries/x265/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 398c309d938..f2189cb014e 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -17,14 +17,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "3.0"; + version = "3.1.1"; src = fetchurl { urls = [ "https://get.videolan.org/x265/x265_${version}.tar.gz" "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz" ]; - sha256 = "0qh65wdpasrspkm1y0dlfa123myax568yi0sas0lmg5b1hkgrff5"; + sha256 = "1l68lgdbsi4wjz5vad98ggx7mf92rnvzlq34m6w0a08ark3h0yc2"; }; enableParallelBuilding = true; From 0238946872c1c63709790f6285bf9cc5585a6704 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 16:01:25 +0200 Subject: [PATCH 19/46] unzip: CVE-2019-13232 --- pkgs/tools/archivers/unzip/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index cdf189e82df..749f481d890 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation { ./CVE-2016-9844.patch ./CVE-2018-18384.patch ./dont-hardcode-cc.patch + (fetchurl { + url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch"; + name = "CVE-2019-13232.patch"; + sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32"; + }) ] ++ stdenv.lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; From 3aefa761066766c10d9f1981d5d6d65d6fd825ae Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 18:10:13 +0200 Subject: [PATCH 20/46] libxslt: CVE-2019-13117 --- pkgs/development/libraries/libxslt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 41633d91f3b..4b7d0a385fd 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1.patch"; + name = "CVE-2019-13117.patch"; + sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; From 9a6bd5911158d8167573500e1f3a3aeeef6a8aff Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 16 Jul 2019 18:12:05 +0200 Subject: [PATCH 21/46] libxslt: CVE-2019-13118 --- pkgs/development/libraries/libxslt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 4b7d0a385fd..2dde7fe32ef 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { name = "CVE-2019-13117.patch"; sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15"; }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b.patch"; + name = "CVE-2019-13118.patch"; + sha256 = "0bglz9m9sh2vi50qxcm06iqrazw3h45ycgxnp15iankq95z283iq"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; From da295a1206735edd4c24fbe8dc34e8280d78b505 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 16 Jul 2019 14:59:38 +0300 Subject: [PATCH 22/46] python2: backport fix for pyc race condition, part 2 Turns out fixing this only in importlib is not sufficient and we need to backport CPython part of the fix too. This patch is based on https://hg.python.org/cpython/rev/c16063765d3a but because the code around is different there are some changes (C-strings instead of Python objects etc.) With this patch Tensorflow builds successfully on many-core machine. --- .../python/cpython/2.7/atomic_pyc.patch | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch index 56c75cbdeea..06d3718d499 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch @@ -1,5 +1,5 @@ diff --git a/Lib/py_compile.py b/Lib/py_compile.py -index 978da73..3559eb9 100644 +index 978da73d74..3559eb95ca 100644 --- a/Lib/py_compile.py +++ b/Lib/py_compile.py @@ -120,16 +120,27 @@ def compile(file, cfile=None, dfile=None, doraise=False): @@ -39,3 +39,78 @@ index 978da73..3559eb9 100644 def main(args=None): """Compile several source files. +diff --git a/Python/import.c b/Python/import.c +index 1e31d79279..f78a1efcf0 100644 +--- a/Python/import.c ++++ b/Python/import.c +@@ -951,6 +951,8 @@ static void + write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat, time_t mtime) + { + FILE *fp; ++ size_t cpathname_len; ++ char *cpathname_tmp; + #ifdef MS_WINDOWS /* since Windows uses different permissions */ + mode_t mode = srcstat->st_mode & ~S_IEXEC; + /* Issue #6074: We ensure user write access, so we can delete it later +@@ -963,11 +965,28 @@ write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat, t + mode_t mode = srcstat->st_mode & ~S_IXUSR & ~S_IXGRP & ~S_IXOTH; + #endif + ++#ifdef MS_WINDOWS + fp = open_exclusive(cpathname, mode); ++#else ++ /* Under POSIX, we first write to a tmp file and then take advantage ++ of atomic renaming. */ ++ cpathname_len = strlen(cpathname); ++ cpathname_tmp = PyMem_MALLOC(cpathname_len + 5); ++ if (cpathname_tmp == NULL) { ++ PyErr_Clear(); ++ return; ++ } ++ memcpy(cpathname_tmp, cpathname, cpathname_len); ++ memcpy(cpathname_tmp + cpathname_len, ".tmp", 5); ++ fp = open_exclusive(cpathname_tmp, mode); ++#endif + if (fp == NULL) { + if (Py_VerboseFlag) + PySys_WriteStderr( + "# can't create %s\n", cpathname); ++#ifndef MS_WINDOWS ++ PyMem_FREE(cpathname_tmp); ++#endif + return; + } + PyMarshal_WriteLongToFile(pyc_magic, fp, Py_MARSHAL_VERSION); +@@ -979,7 +998,12 @@ write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat, t + PySys_WriteStderr("# can't write %s\n", cpathname); + /* Don't keep partial file */ + fclose(fp); ++#ifdef MS_WINDOWS + (void) unlink(cpathname); ++#else ++ (void) unlink(cpathname_tmp); ++ PyMem_FREE(cpathname_tmp); ++#endif + return; + } + /* Now write the true mtime (as a 32-bit field) */ +@@ -989,6 +1013,19 @@ write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat, t + PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION); + fflush(fp); + } ++ /* Under POSIX, do an atomic rename */ ++#ifndef MS_WINDOWS ++ if (rename(cpathname_tmp, cpathname)) { ++ if (Py_VerboseFlag) ++ PySys_WriteStderr("# can't write %s\n", cpathname); ++ /* Don't keep tmp file */ ++ fclose(fp); ++ (void) unlink(cpathname_tmp); ++ PyMem_FREE(cpathname_tmp); ++ return; ++ } ++ PyMem_FREE(cpathname_tmp); ++#endif + fclose(fp); + if (Py_VerboseFlag) + PySys_WriteStderr("# wrote %s\n", cpathname); From 97ea621a560b779307cc3121992089707a984236 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 14 Jul 2019 22:15:57 +0000 Subject: [PATCH 23/46] perlPackages.buildPerlModule: allow pre/post hooks buildPerlModule did not allow to specify hooks like preCheck or postInstall it also did not allow to override buildPhase or installPhase --- pkgs/top-level/perl-packages.nix | 36 +++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f78cacd08be..dd75f4e5b20 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -41,13 +41,29 @@ let }; # Helper functions for packages that use Module::Build to build. - buildPerlModule = { buildInputs ? [], ... } @ args: - buildPerlPackage (args // { - buildInputs = buildInputs ++ [ ModuleBuild ]; - preConfigure = "touch Makefile.PL"; - buildPhase = "perl Build.PL --prefix=$out; ./Build build"; - installPhase = "./Build install"; - checkPhase = "./Build test"; + buildPerlModule = args: + buildPerlPackage ({ + buildPhase = '' + runHook preBuild + perl Build.PL --prefix=$out; ./Build build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ./Build install + runHook postInstall + ''; + checkPhase = '' + runHook preCheck + ./Build test + runHook postCheck + ''; + } // args // { + preConfigure = '' + touch Makefile.PL + ${args.preConfigure or ""} + ''; + buildInputs = (args.buildInputs or []) ++ [ ModuleBuild ]; }); /* Construct a perl search path (such as $PERL5LIB) @@ -432,10 +448,6 @@ let buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; - preConfigure = '' - patchShebangs . - ''; - doCheck = false; meta = { @@ -6119,7 +6131,7 @@ let sha256 = "c065fcd3e2f22ae769937bcc971b91f80294d5009fac140bfba83bf7d35305e3"; }; configurePhase = '' - preConfigure || true + runHook preConfigure perl Build.PL PREFIX="$out" prefix="$out" ''; propagatedBuildInputs = [ IPCSystemSimple ]; From c9965679489f7a8bf1bac0d4a8983d7372186832 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Jul 2019 16:45:41 +0100 Subject: [PATCH 24/46] zeromq: 4.3.1 -> 4.3.2 --- pkgs/development/libraries/zeromq/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fc0c4ac230..1d56742ba1c 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "0z7ka82ihlsncqmf8jj4lnjyr418dzxfs0psx5mccqb09yx9shgm"; + sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9"; }; nativeBuildInputs = [ cmake asciidoc ]; From 325f37f93512fccbcfd8b60b7f3d9a15708d0372 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 11 Jul 2019 20:09:55 -0400 Subject: [PATCH 25/46] llvm_*,clang_*: allow src overrides --- pkgs/development/compilers/llvm/3.5/clang.nix | 4 +++- pkgs/development/compilers/llvm/3.5/llvm.nix | 10 ++++------ .../development/compilers/llvm/3.8/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/3.8/llvm.nix | 10 ++++------ .../development/compilers/llvm/3.9/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/3.9/llvm.nix | 8 +++----- pkgs/development/compilers/llvm/4/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/4/llvm.nix | 8 +++----- pkgs/development/compilers/llvm/5/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/5/llvm.nix | 8 +++----- pkgs/development/compilers/llvm/6/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/6/llvm.nix | 8 +++----- pkgs/development/compilers/llvm/7/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/7/llvm.nix | 12 +++++------- pkgs/development/compilers/llvm/8/clang/default.nix | 4 +++- pkgs/development/compilers/llvm/8/llvm.nix | 12 +++++------- 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 7e0163577ba..132cd67a4ae 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -4,8 +4,10 @@ let in stdenv.mkDerivation { name = "clang-${version}"; + src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"} + unpackFile $src mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 2645469767a..6eec9971778 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -17,13 +17,13 @@ , enableSharedLibraries ? !stdenv.isDarwin }: -let - src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llvm-${version}"; + src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}.src llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -85,8 +85,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index cc25a41b040..47a1bed126d 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -5,8 +5,10 @@ let self = stdenv.mkDerivation { name = "clang-${version}"; + src = fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"; + unpackPhase = '' - unpackFile ${fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"} + unpackFile $src mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 261a1d0f94c..a73b73137dd 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -16,13 +16,13 @@ , enableSharedLibraries ? true }: -let - src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "llvm-${version}"; + src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}.src llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -105,8 +105,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index f597c559dba..e2cf437e19e 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -5,8 +5,10 @@ let self = stdenv.mkDerivation { name = "clang-${version}"; + src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"} + unpackFile $src mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 174cb17908c..c8d819cc963 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -20,8 +20,6 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries; let - src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." version; in @@ -31,8 +29,10 @@ in stdenv.mkDerivation { name = "llvm-${version}"; + src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}.src llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -163,8 +163,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index c6538282f23..f50da39a624 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"; + unpackPhase = '' - unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index ecb18a58054..ea70382d2ac 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -17,8 +17,6 @@ }: let - src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -28,8 +26,10 @@ in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm unpackFile ${compiler-rt_src} @@ -150,8 +150,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 5fd0271f026..7a3b151f835 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 122576cc726..23b7bf4e246 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -15,8 +15,6 @@ }: let - src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -26,8 +24,10 @@ in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm ''; @@ -132,8 +132,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 84056749678..ff9064f455e 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 9237d442b77..e104d051fed 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -19,8 +19,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -30,8 +28,10 @@ in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm ''; @@ -146,8 +146,6 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index a4877b3fe6f..e49c8387f7e 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index dc10de26ba1..a9caa88141a 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -24,9 +24,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; - polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h"; - # Used when creating a versioned symlinks of libLLVM.dylib versionSuffixes = with stdenv.lib; let parts = splitString "." release_version; in @@ -35,12 +32,15 @@ let in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; + polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm '' + optionalString enablePolly '' - unpackFile ${polly_src} + unpackFile $polly_src mv polly-* $sourceRoot/tools/polly ''; @@ -164,8 +164,6 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 5a8b8922eb0..0b38660c4c4 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -8,8 +8,10 @@ let self = stdenv.mkDerivation ({ name = "clang-${version}"; + src = fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"; + unpackPhase = '' - unpackFile ${fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"} + unpackFile $src mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 18013a9cfad..1827273d57e 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -23,9 +23,6 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; - polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; - # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); @@ -33,12 +30,15 @@ let in stdenv.mkDerivation (rec { name = "llvm-${version}"; + src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; + polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; + unpackPhase = '' - unpackFile ${src} + unpackFile $src mv llvm-${version}* llvm sourceRoot=$PWD/llvm '' + optionalString enablePolly '' - unpackFile ${polly_src} + unpackFile $polly_src mv polly-* $sourceRoot/tools/polly ''; @@ -142,8 +142,6 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; - passthru.src = src; - meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; From 3e867d16cde4ecf81d04d41acb99ea464f5c4663 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 9 Jul 2019 20:53:25 +0200 Subject: [PATCH 26/46] strip setup hook: Strip using --strip-unneeded instead of --strip-debug. --- pkgs/build-support/setup-hooks/strip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index fc4c7bfbaf9..a36caa26810 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -25,7 +25,7 @@ _doStrip() { stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" + stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:---strip-unneeded}" fi stripAllList=${stripAllList:-} From d5dc9a2140d82e8d3fa367d12f3ac562b93d9f4a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jul 2019 18:45:21 -0500 Subject: [PATCH 27/46] iputils: 20190515 -> 20190709 https://github.com/iputils/iputils/releases/tag/s20190709 See release notes for details, but of particular note is that this expression is now quite simpler due to the following: * ninfod now builds w/nettle! * update includes patches we fetched from upstream * cross should be handled now, during move to meson * prelim testing confirms, meson makes it much easier to get things right re:explanation given in comment (not propagating host/target info) * issue re:musl+idn2 appears resolved re:compilation, but results in unclear runtime errors regarding "invalid flags". Keep disabled as before as this is clearer at the expression level and reports failure to resolve instead which is a bit clearer. (testing with systemd-less iputils) This also means our iputils is openssl-free, which if nothing else is a nice reduction in trans. size :). (quick imperfect comparison shows: 39MB -> 35MB w/glibc 11.4 -> 7.9 w/musl ) iputils: nvm no IDN w/musl iputils: nvm keep idn disabled w/musl --- .../iputils/build-ninfod-with-openssl.patch | 13 ------- pkgs/os-specific/linux/iputils/default.nix | 39 ++++++------------- 2 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch diff --git a/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch b/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch deleted file mode 100644 index 7ce1b4f527e..00000000000 --- a/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ninfod/meson.build b/ninfod/meson.build -index ea7ec1b..fada05b 100644 ---- a/ninfod/meson.build -+++ b/ninfod/meson.build -@@ -10,7 +10,7 @@ ninfod_sources = files(''' - ninfod_name.c - '''.split()) - executable('ninfod', [ninfod_sources, git_version_h], -- dependencies : [cap_dep, crypto_dep, rt_dep, threads], -+ dependencies : [cap_dep, dependency('openssl'), rt_dep, threads], - link_with : [libcommon], - include_directories : inc, - install: true, diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 0d27d5d97fc..3944a7b37fb 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,42 +1,27 @@ { stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns -, libcap, nettle, libidn2, openssl, systemd +, libcap, nettle, libidn2, systemd }: with stdenv.lib; let - time = "20190515"; - # ninfod probably could build on cross, but the Makefile doesn't pass --host - # etc to the sub configure... - withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; + version = "20190709"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; - url = "https://github.com/iputils/iputils/blob/s${time}/rdisc.c"; + url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; }; -in stdenv.mkDerivation { - name = "iputils-${time}"; +in stdenv.mkDerivation rec { + pname = "iputils"; + inherit version; src = fetchFromGitHub { - owner = "iputils"; - repo = "iputils"; - rev = "s${time}"; - sha256 = "1k2wzgk0d47d1g9k8c1a5l24ml8h8xxz1vrs0vfbyxr7qghdhn4i"; + owner = pname; + repo = pname; + rev = "s${version}"; + sha256 = "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693"; }; - # ninfod cannot be build with nettle yet: - patches = - [ ./build-ninfod-with-openssl.patch - (fetchpatch { # build-sys/doc: Fix the dependency on xsltproc - url = "https://github.com/iputils/iputils/commit/3b013f271931c3fe771e5a2c591f35d617de90f3.patch"; - sha256 = "0ilhlgiqdflry7km3ik8i4h1yymm5f5zmwyl5r029q7x1p8kinfw"; - }) - (fetchpatch { # build-sys: Make setcap really optional - url = "https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551.patch"; - sha256 = "0781147qaf0jwa177jbmh474r8hqs0jwgi5vgx9csb43jzdm8hqf"; - }) - ]; - mesonFlags = [ "-DUSE_CRYPTO=nettle" "-DBUILD_RARPD=true" @@ -44,14 +29,12 @@ in stdenv.mkDerivation { "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" ] - ++ optional (!withNinfod) "-DBUILD_NINFOD=false" # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap nettle systemd ] - ++ optional (!stdenv.hostPlatform.isMusl) libidn2 - ++ optional withNinfod openssl; # TODO: Build with nettle + ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { homepage = https://github.com/iputils/iputils; From ea688c051d4c5daf14007440dea4664d759adcda Mon Sep 17 00:00:00 2001 From: Demin Dmitriy Date: Sat, 6 Jul 2019 20:29:00 +0300 Subject: [PATCH 28/46] git: remove runtime dependency on gcc Reduces gitMinimal closure size from 329.6M to 174.8M. Fixes the issue https://github.com/NixOS/nixpkgs/issues/64350. In git 2.22.0 git-stash is no longer a shell script and now it is just a symlink to git. `postInstall` assumed that it was a shell script, tried to patch it and ended up corrupting the file and made `strip` refuse stripping it. --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3acfd4bc400..67125458c72 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation { EOS )" perl -0777 -i -pe "$SCRIPT" \ - $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,stash,submodule,subtree,web--browse} + $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} # Also put git-http-backend into $PATH, so that we can use smart From 5c85b24edce67464f8f8bc6cd881fad732e65fbc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Jul 2019 18:36:21 +0100 Subject: [PATCH 29/46] pythonPackages.jpylyzer: init at 1.18.0 include as application too --- .../python-modules/jpylyzer/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/jpylyzer/default.nix diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix new file mode 100644 index 00000000000..0d6398a768a --- /dev/null +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, six +}: + +buildPythonPackage rec { + pname = "jpylyzer"; + version = "1.18.0"; + + src = fetchFromGitHub { + owner = "openpreserve"; + repo = pname; + rev = version; + sha256 = "0vhrq15l6jd5fm6vj7mczjzjpl2ph1dk8jp89dw4vlccky8660ll"; + }; + + propagatedBuildInputs = [ six ]; + + # there don't appear to be any in-tree tests as such, but the builder's automatic + # runner seems to be upset by the project layout + doCheck = false; + + meta = with stdenv.lib; { + description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; + homepage = "https://jpylyzer.openpreservation.org/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c4f43d7090..8efb148aa63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,6 +3944,8 @@ in jpegrescan = callPackage ../applications/graphics/jpegrescan { }; + jpylyzer = with pythonPackages; toPythonApplication jpylyzer; + jq = callPackage ../development/tools/jq { }; jo = callPackage ../development/tools/jo { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43d76a7fa4e..109dd8f5b83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2363,6 +2363,8 @@ in { JPype1 = callPackage ../development/python-modules/JPype1 {}; + jpylyzer = callPackage ../development/python-modules/jpylyzer {}; + josepy = callPackage ../development/python-modules/josepy {}; jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; From 3e5ccd43003c59fd61fd060ab1e4e5839d832e7f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Jul 2019 18:36:43 +0100 Subject: [PATCH 30/46] openjpeg: enable tests --- pkgs/development/libraries/openjpeg/generic.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index d3130a64b03..9cd645ed1d4 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, libpng, libtiff, lcms2 +, libpng, libtiff, lcms2, jpylyzer , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables , jpipLibSupport ? false # JPIP library & executables @@ -8,7 +8,7 @@ , openjpegJarSupport ? false # Openjpeg jar (Java) , jp3dSupport ? true # # JP3D comp , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build -, testsSupport ? false +, testsSupport ? true , jdk ? null # Inherit generics , branch, version, revision, sha256, patches ? [], extraFlags ? [], ... @@ -62,6 +62,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng libtiff lcms2 ]; + doCheck = testsSupport; + checkPhase = '' + substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ + --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " + OPJ_SOURCE_DIR=.. ctest -S ../tools/ctest_scripts/travis-ci.cmake + ''; + passthru = { incDir = "openjpeg-${branch}"; }; From b62679839feb9e41b3d8d1d46ec482a600d8ee80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 14:41:28 -0700 Subject: [PATCH 31/46] libev: 4.25 -> 4.27 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libev/versions --- pkgs/development/libraries/libev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 922207f1cce..365c128239d 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.25"; + version="4.27"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq"; + sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d"; }; meta = { From db0655886d1686c9f60c747fc353ff199d083592 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 08:27:17 -0700 Subject: [PATCH 32/46] glib: 2.60.3 -> 2.60.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/glib/versions --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 1de54becb5b..ecbcbea1394 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.60.3"; + version = "2.60.4"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1fb0nx9fcmic8rsh0fbp79lqpasfjxljvnshbw2hsya51mb0vaq4"; + sha256 = "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch From a7edafd0d372ea3f9ae7cadfcd098adac8ab1a4d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 25 Jun 2019 16:05:17 -0400 Subject: [PATCH 33/46] gtk3: cleanup expression --- pkgs/development/libraries/gtk+/3.x.nix | 112 +++++++++++++++++------- 1 file changed, 81 insertions(+), 31 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 378f3904d5d..52d792b966b 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,33 +1,57 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes -, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, gettext +, perl +, makeWrapper +, shared-mime-info +, isocodes +, expat +, glib +, cairo +, pango +, gdk_pixbuf +, atk +, at-spi2-atk +, gobject-introspection +, fribidi +, xorg +, epoxy +, json-glib +, libxkbcommon +, gmp +, gnome3 +, autoreconfHook +, gsettings-desktop-schemas , x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux, mesa, wayland, wayland-protocols +, waylandSupport ? stdenv.isLinux +, mesa +, wayland +, wayland-protocols , xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux, cups ? null -, AppKit, Cocoa +, cupsSupport ? stdenv.isLinux +, cups ? null +, AppKit +, Cocoa }: assert cupsSupport -> cups != null; with stdenv.lib; -let - version = "3.24.8"; -in stdenv.mkDerivation rec { - name = "gtk+3-${version}"; + pname = "gtk+3"; + version = "3.24.8"; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; sha256 = "16f71bbkhwhndcsrpyhjia3b77cb5ksf5c45lyfgws4pkgg64sb6"; }; - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper autoreconfHook ]; - patches = [ ./3.0-immodules.cache.patch (fetchpatch { @@ -42,23 +66,53 @@ stdenv.mkDerivation rec { ./3.0-darwin-x11.patch ]; - buildInputs = [ libxkbcommon epoxy json-glib isocodes ] - ++ optional stdenv.isDarwin AppKit; - propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi - libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] - ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed - ++ optionals waylandSupport [ mesa wayland wayland-protocols ] - ++ optional xineramaSupport libXinerama - ++ optional cupsSupport cups; + nativeBuildInputs = [ + autoreconfHook + gettext + gobject-introspection + makeWrapper + perl + pkgconfig + ]; + + buildInputs = [ + libxkbcommon + epoxy + json-glib + isocodes + ] + ++ optional stdenv.isDarwin AppKit + ; + + propagatedBuildInputs = with xorg; [ + at-spi2-atk + atk + cairo + expat + fribidi + gdk_pixbuf + glib + gsettings-desktop-schemas + libICE + libSM + libXcomposite + libXcursor + libXi + libXrandr + libXrender + pango + ] + ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed + ++ optionals waylandSupport [ mesa wayland wayland-protocols ] + ++ optional xineramaSupport libXinerama + ++ optional cupsSupport cups + ; #TODO: colord? ## (2019-06-12) Demos seem to install fine now. Keeping this around in case it fails again. ## (2014-03-27) demos fail to install, no idea where's the problem #preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; - enableParallelBuilding = true; - configureFlags = optional stdenv.isDarwin [ "--disable-debug" "--disable-dependency-tracking" @@ -94,9 +148,8 @@ stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; - longDescription = '' GTK+ is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform @@ -107,11 +160,8 @@ stdenv.mkDerivation rec { proprietary software with GTK+ without any license fees or royalties. ''; - homepage = https://www.gtk.org/; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman ]; platforms = platforms.all; }; From 638c39e65bce5adcea7b7bebf3586c7ee371563f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 25 Jun 2019 21:07:28 -0400 Subject: [PATCH 34/46] gtk3: 3.24.8 -> 3.24.10, meson! We now build gtk3 with the meson build system. Notably, at least for the expression, all the platforms logic for we had for configureFlags should be unneeded with meson. --- pkgs/development/libraries/gtk+/3.x.nix | 57 +++++++++++-------- .../libraries/gtk+/gtk3-setup-hook.sh | 10 ++++ 2 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/libraries/gtk+/gtk3-setup-hook.sh diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 52d792b966b..d2e6a6bb15e 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -3,7 +3,9 @@ , fetchpatch , pkgconfig , gettext -, perl +, meson +, ninja +, python3 , makeWrapper , shared-mime-info , isocodes @@ -22,7 +24,7 @@ , libxkbcommon , gmp , gnome3 -, autoreconfHook +, hicolor-icon-theme , gsettings-desktop-schemas , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux @@ -42,14 +44,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.8"; + version = "3.24.10"; outputs = [ "out" "dev" ]; outputBin = "dev"; + setupHook = ./gtk3-setup-hook.sh; + src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "16f71bbkhwhndcsrpyhjia3b77cb5ksf5c45lyfgws4pkgg64sb6"; + sha256 = "00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m"; }; patches = [ @@ -66,13 +70,36 @@ stdenv.mkDerivation rec { ./3.0-darwin-x11.patch ]; + mesonFlags = [ + "-Dtests=false" + ]; + + postPatch = '' + files=( + build-aux/meson/post-install.py + demos/gtk-demo/geninclude.py + gdk/broadway/gen-c-array.py + gdk/gen-gdk-gresources-xml.py + gtk/cursor/dnd-copy.png + gtk/gen-gtk-gresources-xml.py + gtk/gen-rc.py + gtk/gentypefuncs.py + ) + + chmod +x ''${files[@]} + patchShebangs ''${files[@]} + ''; + nativeBuildInputs = [ - autoreconfHook gettext gobject-introspection + hicolor-icon-theme # setup-hook makeWrapper - perl + meson + ninja pkgconfig + python3 + setupHook ]; buildInputs = [ @@ -109,27 +136,9 @@ stdenv.mkDerivation rec { ; #TODO: colord? - ## (2019-06-12) Demos seem to install fine now. Keeping this around in case it fails again. - ## (2014-03-27) demos fail to install, no idea where's the problem - #preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; - - configureFlags = optional stdenv.isDarwin [ - "--disable-debug" - "--disable-dependency-tracking" - "--disable-glibtest" - ] ++ optional (stdenv.isDarwin && !x11Support) - "--enable-quartz-backend" - ++ optional x11Support [ - "--enable-x11-backend" - ] ++ optional waylandSupport [ - "--enable-wayland-backend" - ]; - doCheck = false; # needs X11 postInstall = optionalString (!stdenv.isDarwin) '' - substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \ - --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' # The updater is needed for nixos env and it's tiny. moveToOutput bin/gtk-update-icon-cache "$out" # Launcher diff --git a/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh b/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh new file mode 100644 index 00000000000..bddeb2d25d5 --- /dev/null +++ b/pkgs/development/libraries/gtk+/gtk3-setup-hook.sh @@ -0,0 +1,10 @@ +fixupOutputHooks+=(_gtk3CleanComments) + +# Clean comments that link to generator of the file +_gtk3CleanComments() { + local f="$prefix/lib/gtk-3.0/3.0.0/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} + From 6e4fed00bf44c69eeaf434f03d170f9075451493 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 14:27:36 -0400 Subject: [PATCH 35/46] gtk3: add sassc This makes us generate the .css instead of using the pregenerated ones. --- pkgs/development/libraries/gtk+/3.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index d2e6a6bb15e..7db4037e476 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -26,6 +26,7 @@ , gnome3 , hicolor-icon-theme , gsettings-desktop-schemas +, sassc , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux , mesa @@ -99,6 +100,7 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 + sassc setupHook ]; From ff1be88e38a933b5d5a4c040c1095257e4cf957c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:46:10 -0400 Subject: [PATCH 36/46] gtk3: wrap demos, cleanup output --- pkgs/development/libraries/gtk+/3.x.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 7db4037e476..60c04bf8a59 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -152,6 +152,20 @@ stdenv.mkDerivation rec { done ''; + # Make all demo related things in dev + postFixup = '' + moveToOutput share/icons/hicolor "$dev" + moveToOutput share/applications "$dev" + moveToOutput share/gsettings-schemas "$dev" + + demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) + + for program in ''${demos[@]}; do + wrapProgram $dev/bin/$program \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$dev/share/gsettings-schemas/${pname}-${version}" + done + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "gtk+"; From 0596ac9667b19a9dabd42d5a8e8fe3d6265b2099 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 6 Jul 2019 10:40:29 +0200 Subject: [PATCH 37/46] openjpeg: CVE-2019-12973 --- pkgs/development/libraries/openjpeg/2.x.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index e865e2e8549..24f3752ef43 100644 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -13,5 +13,15 @@ callPackage ./generic.nix (args // rec { patches = [ ./fix-cmake-config-includedir.patch + (fetchpatch { + url = "https://github.com/uclouvain/openjpeg/commit/21399f6b7d318fcdf4406d5e88723c4922202aa3.patch"; + name = "CVE-2019-12973-1.patch"; + sha256 = "161yvnfbzy2016qqapm0ywfgglgs1v8ljnk6fj8d2bwdh1cxxz8f"; + }) + (fetchpatch { + url = "https://github.com/uclouvain/openjpeg/commit/3aef207f90e937d4931daf6d411e092f76d82e66.patch"; + name = "CVE-2019-12973-2.patch"; + sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq"; + }) ]; }) From 8cee72bceff6a229c2ff729d4c406df00be22320 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 21:12:53 -0500 Subject: [PATCH 38/46] libevdev: 1.6.0 -> 1.7.0 https://lists.freedesktop.org/archives/input-tools/2019-June/001512.html --- pkgs/development/libraries/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 7998655e46b..b0383b7f742 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.6.0"; + name = "libevdev-1.7.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "057qdrwbhql2lvr4kxljk3yqjsmh65hyrfbr2b681nc7b635q07m"; + sha256 = "0sg3lbjn68qaq3yz2k735h29kaf3fmx7b5m1x7rm2fnhn7rf3nqi"; }; buildInputs = [ python ]; From 3b24d6e187f6c59cd33003aeeea54cdadc16f180 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 19 Jul 2019 13:40:25 -0400 Subject: [PATCH 39/46] gtk3: fix pkgconfig paths MR Upstream: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 --- ...build-Fix-path-handling-in-pkgconfig.patch | 30 +++++++++++++++++++ pkgs/development/libraries/gtk+/3.x.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch new file mode 100644 index 00000000000..ec69a12514f --- /dev/null +++ b/pkgs/development/libraries/gtk+/01-build-Fix-path-handling-in-pkgconfig.patch @@ -0,0 +1,30 @@ +From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Fri, 19 Jul 2019 13:32:57 -0400 +Subject: [PATCH] build: Fix path handling in pkgconfig + +--- + meson.build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 36913b3f04..161b378ba5 100644 +--- a/meson.build ++++ b/meson.build +@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson', + # pkg-config files - bit of a mess all of this + pkgconf = configuration_data() + +-pkgconf.set('prefix', get_option('prefix')) ++pkgconf.set('prefix', gtk_prefix) + pkgconf.set('exec_prefix', '${prefix}') +-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) +-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) ++pkgconf.set('libdir', gtk_libdir) ++pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir)) + pkgconf.set('GTK_API_VERSION', gtk_api_version) + pkgconf.set('VERSION', meson.project_version()) + pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) +-- +2.22.0 + diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 60c04bf8a59..8c3df083087 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { 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 ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it From ecfb397e8a161be74755bad2d5b778c45346ee34 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 19 Jul 2019 10:51:02 -0400 Subject: [PATCH 40/46] libxkbcommon: fix build on darwin with upstream patch --- pkgs/development/libraries/libxkbcommon/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index ec4c904795f..44530b38150 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { "-Dx-locale-root=${libX11.out}/share/X11/locale" ]; - # Remove example program which fail on Darwin - postPatch = if stdenv.isDarwin then '' - substituteInPlace meson.build \ - --replace "executable('rmlvo-to-keymap', 'test/rmlvo-to-keymap.c', dependencies: test_dep)" "" - '' else null; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Fix build on darwin + (fetchpatch { + url = "https://github.com/xkbcommon/libxkbcommon/commit/32d178b50fe0da05e51e4fe8903c84371d133331.patch"; + sha256 = "1wqdjla8hmgdqr8xc2manw363sxrqqsn3s8bd397h3cd7fj3hh1v"; + }) + ]; doCheck = false; # fails, needs unicode locale From 5e9f1bb343fd7ec4bf3e5541c87dca9d0ba1d82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Jul 2019 12:39:16 +0200 Subject: [PATCH 41/46] docbook5: 5.0 -> 5.0.1 Main reason: the previous source would not unpack with patched unzip: https://github.com/NixOS/nixpkgs/commit/0238946872c1 --- pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 4986101584e..17303e682b9 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "docbook5-5.0"; +stdenv.mkDerivation rec { + pname = "docbook5"; + version = "5.0.1"; src = fetchurl { - url = http://www.docbook.org/xml/5.0/docbook-5.0.zip; - sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; + url = "http://www.docbook.org/xml/${version}/docbook-${version}.zip"; + sha256 = "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs"; }; nativeBuildInputs = [ unzip ]; From 8438e3e67f05f2600e2def07f5cc58ae214b6267 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 15:04:45 -0400 Subject: [PATCH 42/46] gtk3: don't multiout demos --- pkgs/development/libraries/gtk+/3.x.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 8c3df083087..d814bb58fbc 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -154,17 +154,13 @@ stdenv.mkDerivation rec { done ''; - # Make all demo related things in dev - postFixup = '' - moveToOutput share/icons/hicolor "$dev" - moveToOutput share/applications "$dev" - moveToOutput share/gsettings-schemas "$dev" - + # Wrap demos + postFixup = optionalString (!stdenv.isDarwin) '' demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory) for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$dev/share/gsettings-schemas/${pname}-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" done ''; From 950b7ed61ac340fa7810daa76e8b5eb438e10d33 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 22 Jul 2019 03:06:59 -0400 Subject: [PATCH 43/46] dee: fix build See https://gitlab.gnome.org/GNOME/vala/issues/803. --- pkgs/development/libraries/dee/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index f0f31ae1ffc..04ecadadefa 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -5,7 +5,7 @@ , icu , gobject-introspection , dbus-glib -, vala +, vala_0_40 , python3 , autoreconfHook }: @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig - vala + # https://gitlab.gnome.org/GNOME/vala/issues/803 + vala_0_40 autoreconfHook gobject-introspection python3 From 835f6b67bf65545db0259b6261aaae5a890be51f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 22 Jul 2019 09:15:01 +0200 Subject: [PATCH 44/46] Revert "strip setup hook: Strip using --strip-unneeded instead of --strip-debug." This broke the bootstrapping of Darwin. This reverts commit 3e867d16cde4ecf81d04d41acb99ea464f5c4663. --- pkgs/build-support/setup-hooks/strip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index a36caa26810..fc4c7bfbaf9 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -25,7 +25,7 @@ _doStrip() { stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:---strip-unneeded}" + stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" fi stripAllList=${stripAllList:-} From 16dec3974696dd2a83865f017402ac9fdfb8cf8a Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 21 Jul 2019 11:53:23 +0200 Subject: [PATCH 45/46] haskellPackages.zip-archive: disable tests (cherry picked from commit d6059ae25c6a8e4f4191b568e74087640e07b93f) --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c975b1e2a2c..5cddf2f3672 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -386,6 +386,7 @@ self: super: { xsd = dontCheck super.xsd; snap-core = dontCheck super.snap-core; sourcemap = dontCheck super.sourcemap; + zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; From 3d00d8e4eebbaf41b28163aa1bcf344084b084a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Jul 2019 11:51:55 +0200 Subject: [PATCH 46/46] pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides Temporary attribute until we can get rid of it everywhere. This was triggered due to the libyaml 0.2.2 incompatibilty requiring patches and still not building. --- .../tools/build-managers/conan/default.nix | 8 +------- pkgs/servers/home-assistant/appdaemon.nix | 9 --------- pkgs/servers/home-assistant/default.nix | 8 +++++--- pkgs/servers/home-assistant/esphome.nix | 7 ------- pkgs/tools/admin/awscli/default.nix | 13 +------------ pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 6 files changed, 22 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c5d22ee07b..ce7b0871044 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -37,13 +37,7 @@ let newPython = python3.override { sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; }; }); - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - }); + pyyaml = super.pyyaml_3; }; }; diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 82df1f6b988..5f8884cbd3b 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -38,15 +38,6 @@ let sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83"; }; }); - - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; - }; - }); - }; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d778e8df18f..511aff05dea 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -36,8 +36,6 @@ let "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af") (mkOverride "python-slugify" "3.0.2" "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758") - (mkOverride "pyyaml" "3.13" - "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") (mkOverride "ruamel_yaml" "0.15.94" @@ -63,6 +61,10 @@ let }; }) + (self: super: { + pyyaml = super.pyyaml_3; + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -78,7 +80,7 @@ let }; }); }; - + py = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index 895b089f991..bd657067939 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -3,13 +3,6 @@ let python = python3.override { packageOverrides = self: super: { - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; - }; - }); tornado = super.tornado.overridePythonAttrs (oldAttrs: rec { version = "5.1.1"; src = oldAttrs.src.override { diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f8a68bc6f64..b07db447262 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -22,18 +22,7 @@ let sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; }; }); - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - patches = lib.singleton (fetchpatch { - url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; - sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; - }); - }); + pyyaml = super.pyyaml_3; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c932c721ae..1151e61d7b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4434,6 +4434,21 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec { + version = "3.13"; + src = oldAttrs.src.override { + inherit version; + sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; + }; + # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 + patches = singleton (pkgs.fetchpatch { + url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; + sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; + }); + # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 + doCheck = false; + }); + rabbitpy = callPackage ../development/python-modules/rabbitpy { }; rasterio = callPackage ../development/python-modules/rasterio {