From 8eccb7d2c740b14a38c05f3993c5c7d96eb5b1a0 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 30 Nov 2017 15:11:42 +0000 Subject: [PATCH 01/35] wordpress: 4.9 -> 4.9.1 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index d8dde97a096..57254713f4b 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.9"; - sha256 = "1qffh413k8c1mf3jj9hys3a7y1qfjcg2w96w4c9x3ida3lchg7ln"; + rev = "4.9.1"; + sha256 = "0d931mv6wbgnc7f15nisnn5al0ffi19zya2iwdzw98s4klpaq955"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; From bd71d3aef7a61f1c01e14fa5c0ec7f6f6a7dc56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 1 Dec 2017 13:28:04 +0100 Subject: [PATCH 02/35] qt5: 5.9.2 -> 5.9.3 --- .../libraries/qt-5/5.9/default.nix | 4 +- pkgs/development/libraries/qt-5/5.9/fetch.sh | 2 +- .../libraries/qt-5/5.9/qtbase.patch | 115 ++++--- pkgs/development/libraries/qt-5/5.9/srcs.nix | 312 +++++++++--------- .../libraries/qt-5/modules/qtbase.nix | 4 +- 5 files changed, 232 insertions(+), 205 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 879f7f198c9..0582a9f3f82 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -6,9 +6,9 @@ Before a major version update, make a copy of this directory. (We like to keep the old version around for a short time after major updates.) Add a top-level attribute to `top-level/all-packages.nix`. -1. Update the URL in `maintainers/scripts/generate-qt.sh`. +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. 3. Update `qtCompatVersion` below if the minor version number changes. 4. Check that the new packages build correctly. 5. Commit the changes and open a pull request. diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 2ae85bba391..103fa4e09ab 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch index 96c9b029312..69e389a5a6d 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase.patch @@ -101,7 +101,7 @@ index bb5083c925..da8e2cb386 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 17da8b979e..d648ab4058 100644 +index 55c74aad66..0bbc8718eb 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) @@ -261,10 +261,10 @@ index 17da8b979e..d648ab4058 100644 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 395ac34001..a0e5c68b7e 100644 +index e645ba5803..a0e5c68b7e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -24,165 +24,3 @@ qt { +@@ -24,166 +24,3 @@ qt { } } } @@ -427,17 +427,18 @@ index 395ac34001..a0e5c68b7e 100644 -} - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --cache(QMAKE_XCODE_VERSION, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e21e749ee9..3b01424e67 100644 +index 44636f2288..61ed486a76 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,51 +1,2 @@ +@@ -1,56 +1,3 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) -- + -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { - # Get path of Xcode's Developer directory - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") @@ -447,18 +448,23 @@ index e21e749ee9..3b01424e67 100644 - # Make sure Xcode path is valid - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode is set up properly -- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ -- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") -} - --isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } -} - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { @@ -487,11 +493,11 @@ index e21e749ee9..3b01424e67 100644 -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 68ab7e4053..e69de29bb2 100644 +index 3f6dc076ca..8b13789179 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,49 +0,0 @@ -- +@@ -1,58 +1 @@ + -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") - @@ -500,13 +506,22 @@ index 68ab7e4053..e69de29bb2 100644 - -defineReplace(xcodeSDKInfo) { - info = $$1 +- equals(info, "Path"): \ +- info = --show-sdk-path +- equals(info, "PlatformPath"): \ +- info = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- info = --show-sdk-version - sdk = $$2 - isEmpty(sdk): \ - sdk = $$QMAKE_MAC_SDK - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\'") - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) - } - @@ -581,10 +596,10 @@ index d49f4c49c1..097dcd7d39 100644 target.path = $$instbase/$$TARGETPATH INSTALLS += target diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index cb84ae0da8..45e16f4302 100644 +index 883f8ca215..81db8eb2d4 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf -@@ -29,7 +29,7 @@ host_build:force_bootstrap { +@@ -33,7 +33,7 @@ host_build:force_bootstrap { target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -607,7 +622,7 @@ index 1848f00e90..2af93675c5 100644 + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 1e138730b3..b7ba74dc3f 100644 +index fb96d1b6a0..508ed17d30 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { @@ -661,20 +676,32 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 0a008374e5..5e7cd92f6f 100644 +index 668669e4cd..30f7fbac41 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -73,7 +73,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) -- sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources +@@ -77,13 +77,13 @@ for(extra, extras): \ + # Just for Qt Creator + OTHER_FILES += $$sourcefiles - check_examples { +-sourcefiles += \ +- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ +- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ +- $$DBUS_ADAPTORS $$DBUS_INTERFACES +-addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase +-INSTALLS += sources ++ sourcefiles += \ ++ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ ++ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ ++ $$DBUS_ADAPTORS $$DBUS_INTERFACES ++ addInstallFiles(sources.files, $$sourcefiles) ++ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase ++ INSTALLS += sources + + check_examples { + srcfiles = $$sources.files diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index c00fdb73f8..5789cd0c06 100644 +index 1903e509c8..ae7b585989 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -836,7 +863,7 @@ index 706304cf34..546420f6ad 100644 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 39e7c71a9c..dced1f2811 100644 +index cba279c184..5ae3fd62e5 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths() @@ -856,7 +883,7 @@ index 39e7c71a9c..dced1f2811 100644 if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 1714c9802f..fd2ebb1336 100644 +index 4fdc2e36ac..d3ec222543 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; @@ -872,7 +899,7 @@ index 1714c9802f..fd2ebb1336 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -645,12 +649,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -967,7 +994,7 @@ index 1da00813ce..0bf877afcb 100644 return false; } diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index cf08a15f96..2310488298 100644 +index 9a24938284..74962b4ae2 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -102,7 +102,7 @@ static bool resolveLibraryInternal() @@ -1024,7 +1051,7 @@ index 341d3bccf2..3368234c26 100644 scanThread->interfaceName = QString::fromNSString(ifName); scanThread->start(); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index ca9f7af127..a337ad73bf 100644 +index b5a0a5bbeb..6c20305f4d 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() @@ -1042,7 +1069,7 @@ index ca9f7af127..a337ad73bf 100644 QString TableGenerator::findComposeFile() diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index 59b76370ae..b91139ded9 100644 +index 5cd4beb4f0..84919e6d6a 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -320,7 +320,7 @@ static void qt_closePopups() @@ -1055,7 +1082,7 @@ index 59b76370ae..b91139ded9 100644 #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index 7640a711a9..ef9a14d38b 100644 +index e2e573f0e1..1c8289f81e 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) @@ -1074,11 +1101,11 @@ index 7640a711a9..ef9a14d38b 100644 #endif } diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index d257ab1242..75853af4e4 100644 +index 7c62c2e2b3..fefa40e0f6 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if defined(XCB_USE_XLIB) && QT_CONFIG(library) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index 247800b7578..df7846ca386 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,275 @@ { qt3d = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; - sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; - name = "qt3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz"; + sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp"; + name = "qt3d-opensource-src-5.9.3.tar.xz"; }; }; qtactiveqt = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; - sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; - name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz"; + sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r"; + name = "qtactiveqt-opensource-src-5.9.3.tar.xz"; }; }; qtandroidextras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; - name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz"; + sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n"; + name = "qtandroidextras-opensource-src-5.9.3.tar.xz"; }; }; qtbase = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; - sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; - name = "qtbase-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz"; + sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y"; + name = "qtbase-opensource-src-5.9.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; - sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; - name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz"; + sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y"; + name = "qtcanvas3d-opensource-src-5.9.3.tar.xz"; }; }; qtcharts = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; - sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; - name = "qtcharts-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz"; + sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc"; + name = "qtcharts-opensource-src-5.9.3.tar.xz"; }; }; qtconnectivity = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; - sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; - name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz"; + sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2"; + name = "qtconnectivity-opensource-src-5.9.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; - sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; - name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz"; + sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh"; + name = "qtdatavis3d-opensource-src-5.9.3.tar.xz"; }; }; qtdeclarative = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; - sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; - name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz"; + sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh"; + name = "qtdeclarative-opensource-src-5.9.3.tar.xz"; }; }; qtdoc = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; - sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; - name = "qtdoc-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz"; + sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5"; + name = "qtdoc-opensource-src-5.9.3.tar.xz"; }; }; qtgamepad = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; - sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; - name = "qtgamepad-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz"; + sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6"; + name = "qtgamepad-opensource-src-5.9.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; - sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; - name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; + sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr"; + name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; }; }; qtimageformats = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; - sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; - name = "qtimageformats-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz"; + sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl"; + name = "qtimageformats-opensource-src-5.9.3.tar.xz"; }; }; qtlocation = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; - sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; - name = "qtlocation-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz"; + sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0"; + name = "qtlocation-opensource-src-5.9.3.tar.xz"; }; }; qtmacextras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; - name = "qtmacextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz"; + sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy"; + name = "qtmacextras-opensource-src-5.9.3.tar.xz"; }; }; qtmultimedia = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; - sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; - name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz"; + sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7"; + name = "qtmultimedia-opensource-src-5.9.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; - sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; - name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz"; + sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz"; + name = "qtnetworkauth-opensource-src-5.9.3.tar.xz"; }; }; qtpurchasing = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; - sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; - name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz"; + sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j"; + name = "qtpurchasing-opensource-src-5.9.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; - sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; - name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz"; + sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih"; + name = "qtquickcontrols-opensource-src-5.9.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; - sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; - name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz"; + sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1"; + name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; - sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; - name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz"; + sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk"; + name = "qtremoteobjects-opensource-src-5.9.3.tar.xz"; }; }; qtscript = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; - sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; - name = "qtscript-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz"; + sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq"; + name = "qtscript-opensource-src-5.9.3.tar.xz"; }; }; qtscxml = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; - sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; - name = "qtscxml-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz"; + sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq"; + name = "qtscxml-opensource-src-5.9.3.tar.xz"; }; }; qtsensors = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; - sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; - name = "qtsensors-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz"; + sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr"; + name = "qtsensors-opensource-src-5.9.3.tar.xz"; }; }; qtserialbus = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; - sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; - name = "qtserialbus-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz"; + sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg"; + name = "qtserialbus-opensource-src-5.9.3.tar.xz"; }; }; qtserialport = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; - sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; - name = "qtserialport-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz"; + sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac"; + name = "qtserialport-opensource-src-5.9.3.tar.xz"; }; }; qtspeech = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; - sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; - name = "qtspeech-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz"; + sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1"; + name = "qtspeech-opensource-src-5.9.3.tar.xz"; }; }; qtsvg = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; - sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; - name = "qtsvg-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz"; + sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz"; + name = "qtsvg-opensource-src-5.9.3.tar.xz"; }; }; qttools = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; - sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; - name = "qttools-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz"; + sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24"; + name = "qttools-opensource-src-5.9.3.tar.xz"; }; }; qttranslations = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; - sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; - name = "qttranslations-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz"; + sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20"; + name = "qttranslations-opensource-src-5.9.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; - sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; - name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; + sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr"; + name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; }; }; qtwayland = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; - sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; - name = "qtwayland-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz"; + sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih"; + name = "qtwayland-opensource-src-5.9.3.tar.xz"; }; }; qtwebchannel = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; - sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; - name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz"; + sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3"; + name = "qtwebchannel-opensource-src-5.9.3.tar.xz"; }; }; qtwebengine = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; - sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; - name = "qtwebengine-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz"; + sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5"; + name = "qtwebengine-opensource-src-5.9.3.tar.xz"; }; }; qtwebkit = { @@ -291,43 +291,43 @@ }; }; qtwebsockets = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; - sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; - name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz"; + sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf"; + name = "qtwebsockets-opensource-src-5.9.3.tar.xz"; }; }; qtwebview = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; - sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; - name = "qtwebview-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz"; + sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf"; + name = "qtwebview-opensource-src-5.9.3.tar.xz"; }; }; qtwinextras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; - sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; - name = "qtwinextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz"; + sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl"; + name = "qtwinextras-opensource-src-5.9.3.tar.xz"; }; }; qtx11extras = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; - sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; - name = "qtx11extras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz"; + sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74"; + name = "qtx11extras-opensource-src-5.9.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; - sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; - name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz"; + sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g"; + name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 36238b5fadd..172b20bc51b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,7 +3,7 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, + ruby, which, # darwin support darwin, libiconv, libcxx, @@ -84,7 +84,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 ] + [ bison flex gperf lndir perl pkgconfig python2 which ] ++ lib.optional (!stdenv.isDarwin) patchelf; propagatedNativeBuildInputs = [ lndir ]; From ce777a26f6b051eedf412dd3bd497de03ff3cac9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Nov 2017 03:00:35 +0100 Subject: [PATCH 03/35] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.7 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/766fbc64fb4dc00123e0c4129b3b920b80b24a1b. --- .../haskell-modules/hackage-packages.nix | 630 +++++++++++++----- 1 file changed, 473 insertions(+), 157 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3107d29b090..d8b9b42e2cd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4274,8 +4274,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "Dish"; - version = "0.0.0.5"; - sha256 = "1xhz0yb8xrjdznvx5prpl7r8k73n78n6gmshqbraq5jdh3vcnisx"; + version = "0.0.0.6"; + sha256 = "1adrlc00assbr7sl0bvnkl452k7hnf663y32ih4wdg3p2sb0dhci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -11123,8 +11123,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "LParse"; - version = "0.2.1.0"; - sha256 = "0sck36lfmfgb16nhfwm13mnsqa9d7m1fx1xl6x5wln9w6q3rhrls"; + version = "0.2.2.2"; + sha256 = "0cgmbn6c7fgk6dngx7j1l56sizi37shs5mrdkiqy2k4imb7bc4hl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/MarcusVoelker/LParse#readme"; @@ -13488,6 +13488,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Octree_0_5_4_4" = callPackage + ({ mkDerivation, AC-Vector, base, QuickCheck }: + mkDerivation { + pname = "Octree"; + version = "0.5.4.4"; + sha256 = "0a5mikif0pd2ps5na2wahbl4l0259sdgih34m417j6a24qr1skjs"; + libraryHaskellDepends = [ AC-Vector base QuickCheck ]; + testHaskellDepends = [ AC-Vector base QuickCheck ]; + homepage = "https://github.com/mgajda/octree"; + description = "Simple unbalanced Octree for storing data about 3D points"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "OddWord" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -20194,14 +20208,14 @@ self: { }) {}; "accelerate-fourier" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda - , accelerate-utility, base, containers, criterion, QuickCheck - , transformers, utility-ht + ({ mkDerivation, accelerate, accelerate-arithmetic + , accelerate-llvm-native, accelerate-utility, base, containers + , criterion, QuickCheck, transformers, utility-ht }: mkDerivation { pname = "accelerate-fourier"; - version = "1.0"; - sha256 = "0am0sfjaz8zgmpfwyv34fcrpfwdgj8xygnhk8nl5i9xbbvlkhjjk"; + version = "1.0.0.2"; + sha256 = "1rcbxrhh55jrp8f8g7pb8a4mq0cmhrhfx6q8z8n1hlyazswfdw1d"; libraryHaskellDepends = [ accelerate accelerate-arithmetic accelerate-utility base containers QuickCheck transformers utility-ht @@ -20211,8 +20225,8 @@ self: { utility-ht ]; benchmarkHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cuda accelerate-utility - base criterion utility-ht + accelerate accelerate-arithmetic accelerate-llvm-native + accelerate-utility base criterion utility-ht ]; homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; @@ -22607,7 +22621,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "airship_0_9_0" = callPackage + "airship_0_9_1" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers , cryptohash, directory, either, filepath, http-date, http-media @@ -22618,8 +22632,8 @@ self: { }: mkDerivation { pname = "airship"; - version = "0.9.0"; - sha256 = "1hpm99jyb5v131352y1wlja59sp3c3wqw0p935xg142zw4qckacx"; + version = "0.9.1"; + sha256 = "09kjgb3zv03n0h1brw61xccrs37219pdphah3cwa397vhlncmlgq"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory @@ -23195,8 +23209,8 @@ self: { ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { pname = "algebraic-prelude"; - version = "0.1.0.1"; - sha256 = "0b8rwbyy9ilykd847rxv37k1hbrhkmzv2kni0dyc1m3ijnr55c4b"; + version = "0.1.1.0"; + sha256 = "0b0fbwxnlm91dlkg3qs27w5iz0ibf7bpzj7m3h0i6v6s1dgr29l9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35315,8 +35329,8 @@ self: { ({ mkDerivation, base, bytestring, cborg, serialise }: mkDerivation { pname = "binary-serialise-cbor"; - version = "0.1.1.0"; - sha256 = "0wrf9skl99aalf9pbb8a43i80r8vimn6vih4sidw615cw3k4yapg"; + version = "0.2.0.0"; + sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = stdenv.lib.licenses.bsd3; @@ -37460,8 +37474,8 @@ self: { pname = "blank-canvas"; version = "0.6.1"; sha256 = "06jsbqbd67hyb1k2yv0iqn11rhqhycl1c9afrnmwh05bic9wsdf6"; - revision = "1"; - editedCabalFile = "16r1hhdk592da4xpzhscn7zcxczla4vmr2klj968wgnrx8ky5kqy"; + revision = "2"; + editedCabalFile = "1lb4q70s3xgwzkirgci6b5flq8y9lfj8qspx52hl20zrwvhi6h1n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour @@ -38644,14 +38658,14 @@ self: { }) {}; "boolean-normal-forms" = callPackage - ({ mkDerivation, base, cond, containers, QuickCheck, tasty + ({ mkDerivation, base, cond, containers, deepseq, QuickCheck, tasty , tasty-quickcheck }: mkDerivation { pname = "boolean-normal-forms"; - version = "0.0.0.2"; - sha256 = "0ml81qmi3m9nkvw8m1pslw270y1li52cwhw0ahz414zcjysgzcih"; - libraryHaskellDepends = [ base cond containers ]; + version = "0.0.1"; + sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b"; + libraryHaskellDepends = [ base cond containers deepseq ]; testHaskellDepends = [ base cond containers QuickCheck tasty tasty-quickcheck ]; @@ -40074,8 +40088,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.2.4.0"; - sha256 = "1vvyjs8lgqn97li68kvy971m4rbzfk30y40li59jzzy35533lhw2"; + version = "0.3.0.0"; + sha256 = "03z27wx9g8pmx07r2cc5mzp3p7qpzq7gp590k9kd3kq1q9dx2096"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40339,6 +40353,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-handle_0_1_0_6" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "bytestring-handle"; + version = "0.1.0.6"; + sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; + description = "ByteString-backed Handles"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-lexing" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -43823,8 +43856,8 @@ self: { }: mkDerivation { pname = "cbor-tool"; - version = "0.1.0.0"; - sha256 = "1jx51l75hm76fsk9wsc7jhqg857n77s8xb8bcjbkr698qwfbf14m"; + version = "0.2.0.0"; + sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -43842,10 +43875,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.1.1.0"; - sha256 = "120ljrwm15zl49nlsn9wb702sb97d2p300mzbpx8wxr2zdzlffpj"; - revision = "1"; - editedCabalFile = "0qqg1gfjf869ynrh20fbrpfhjf2yh6v3i5s6w327sirbhw9ajk6v"; + version = "0.2.0.0"; + sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340"; libraryHaskellDepends = [ array base bytestring containers ghc-prim half integer-gmp primitive text @@ -43860,8 +43891,8 @@ self: { }: mkDerivation { pname = "cborg-json"; - version = "0.1.0.0"; - sha256 = "1dx7ap8ks8g3c68jdkni958v2g04swphfi0nkyjznyz0dl6vs9mz"; + version = "0.2.0.0"; + sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -50086,14 +50117,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_2_0" = callPackage + "concurrency_1_2_3_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.2.0"; - sha256 = "1cnr7c3w09f24rmcgyhj24w2gz84i0dw6y2ncyv3c6jw7fg7vpvw"; + version = "1.2.3.0"; + sha256 = "1abrl3qab0gq1a2v4wjvmfzfmyainbj2qwf67h46pcrnd7va0ddq"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -50960,9 +50991,9 @@ self: { ({ mkDerivation, base, hspec, lens, parsec, text }: mkDerivation { pname = "config-parser"; - version = "0.2.0.0"; - sha256 = "0mpqk41inrb7p16bwhxcffvpl7v5ix1qim28bp4j1s00bjyn9n4i"; - libraryHaskellDepends = [ base parsec ]; + version = "1.0.0.0"; + sha256 = "0ak3yhlfnw24d8rbv0z8mpkg839048ywp0c64slbxam3sxs8g170"; + libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base hspec lens parsec text ]; homepage = "https://github.com/protoben/config-parser"; description = "Parse config files using parsec and generate parse errors on unhandled keys"; @@ -53563,8 +53594,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "3.0"; - sha256 = "0irwrabvfm90jd24kjv1yzrnkdf57sk4m5y5cn907ns4ylwyalhg"; + version = "4.0"; + sha256 = "16lsyvcnz8qjy5lakf4dxzz9b4rcgz8bk6wzf3cmxn51kpxyc0rn"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl QuickCheck tasty tasty-discover @@ -71053,14 +71084,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_6" = callPackage + "extra_1_6_1" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: mkDerivation { pname = "extra"; - version = "1.6"; - sha256 = "1pqlggdbbhfj71yaby5595shf4hpzv9700sczksgy36qz9bfcrh7"; + version = "1.6.1"; + sha256 = "0x2byc1k8lznrq226pg1xrd48q6x9l7id6b2cdah0b6xigr0mya2"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -73404,12 +73435,12 @@ self: { pname = "fin"; version = "0"; sha256 = "0nzjqw6q01rc6faqp30771v8mxz6cndzskkvfaj55ygp34faycih"; - revision = "1"; - editedCabalFile = "0lin85p7gwdj96liwq5g2fpfmk3d23239zn99ghz12i6l8xwigxh"; + revision = "2"; + editedCabalFile = "1fha5i24k3lh2ncg39dgki0fh7mg3k1p21bngmiqvnika8dnin5h"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base inspection-testing tagged ]; homepage = "https://github.com/phadej/vec"; - description = "Nat and Fin"; + description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80934,19 +80965,23 @@ self: { "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, equational-reasoning, ghc - , ghc-tcplugins-extra, presburger, reflection + , ghc-tcplugins-extra, presburger, reflection, singletons }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.1.1.0"; - sha256 = "14jg5lny0rcrv9ml42f41lzx50i2bfz4ld7grrsrlq5fqkl0bc5w"; + version = "0.1.1.1"; + sha256 = "0h02yim6qif49f3z853mzhmrgj9g6wik07qm3ddjcgn96sp7pylw"; + revision = "1"; + editedCabalFile = "1ilb7z5ci960qbxi26a03v80ply6qdgh3jzk20ipsykn5nf05in8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base equational-reasoning ghc ghc-tcplugins-extra presburger reflection ]; - executableHaskellDepends = [ base equational-reasoning ]; + executableHaskellDepends = [ + base equational-reasoning singletons + ]; homepage = "https://github.com/konn/ghc-typelits-presburger#readme"; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -84401,8 +84436,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.23"; - sha256 = "1czvb4jvlrb93z7wzlr68gp2x6gzdrkbwcc2ri561v2hc7w06xi2"; + version = "0.3.24"; + sha256 = "18m2mw0pzry3hkq0w3gcky45na5z600wkni856k3fc97w050qym3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89195,6 +89230,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hPDB_1_2_0_10" = callPackage + ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq + , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel + , QuickCheck, tagged, template-haskell, text, unordered-containers + , vector, zlib + }: + mkDerivation { + pname = "hPDB"; + version = "1.2.0.10"; + sha256 = "10a5995872n6y849nhs9yl7zwp7ywfma3mabgywq7acmpppl5ka0"; + libraryHaskellDepends = [ + AC-Vector base bytestring containers deepseq directory ghc-prim + iterable mmap mtl Octree parallel QuickCheck tagged + template-haskell text unordered-containers vector zlib + ]; + homepage = "https://github.com/BioHaskell/hPDB"; + description = "Protein Databank file format library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB-examples" = callPackage ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree @@ -89221,6 +89277,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hPDB-examples_1_2_0_8" = callPackage + ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq + , directory, ghc-prim, GLUT, hPDB, IfElse, iterable, mtl, Octree + , OpenGL, process, QuickCheck, template-haskell, text, text-format + , time, vector + }: + mkDerivation { + pname = "hPDB-examples"; + version = "1.2.0.8"; + sha256 = "0zyfh2693cirr69qcmiwsmk4p8w8v6yacidcs22jcisay95v4qf6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + AC-Vector base bytestring containers deepseq directory ghc-prim + GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell + text text-format vector + ]; + testHaskellDepends = [ + AC-Vector base bytestring containers deepseq directory ghc-prim + hPDB IfElse iterable mtl process template-haskell text time vector + ]; + homepage = "https://github.com/BioHaskell/hPDB-examples"; + description = "Examples for hPDB library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPushover" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, network , text @@ -102983,6 +103066,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlint_2_0_11" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, filepath + , haskell-src-exts, haskell-src-exts-util, hscolour, process + , refact, text, transformers, uniplate, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "2.0.11"; + sha256 = "040p4rr7jjr40i6239vwkr2qqva7r9ccksg5n9k9r7ljbh8rf66b"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra filepath haskell-src-exts + haskell-src-exts-util hscolour process refact text transformers + uniplate unordered-containers vector yaml + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/ndmitchell/hlint#readme"; + description = "Source code suggestions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -103827,15 +103937,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_5_0" = callPackage + "hoauth2_1_5_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson, wai, warp }: mkDerivation { pname = "hoauth2"; - version = "1.5.0"; - sha256 = "0dfrqdjrvc94f94xl8vqggdvzbkiwj3xfkmwilkskvnfg1s1hg8q"; + version = "1.5.1"; + sha256 = "1lb76084ha2wkhccgcwvn5ffdsrxsqbvhmlhx9aw9dm39ganggva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103952,8 +104062,8 @@ self: { }: mkDerivation { pname = "hocker"; - version = "1.0.0"; - sha256 = "16indvxpf2zzdkb7hp09zfnn1zkjwc1pcg2560x2vj7x4akh25mv"; + version = "1.0.2"; + sha256 = "1bdzbggvin83m778qq6367mpv2cwgwpbahhlzf290iwikmhmhgr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107732,12 +107842,12 @@ self: { license = "LGPL"; }) {}; - "hscolour_1_24_3" = callPackage + "hscolour_1_24_4" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "hscolour"; - version = "1.24.3"; - sha256 = "06divyzjv8q7gfcak96lf5faysqzaxy1xds102amgphq0f038baa"; + version = "1.24.4"; + sha256 = "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -109991,6 +110101,20 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "hsshellscript_3_4_2" = callPackage + ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: + mkDerivation { + pname = "hsshellscript"; + version = "3.4.2"; + sha256 = "04ihi45pi92ykhcn66ni6zybmzvmbl467yfr1dgidvj56xns33jw"; + libraryHaskellDepends = [ base directory parsec random unix ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://www.volker-wysk.de/hsshellscript/"; + description = "Haskell for Unix shell scripting tasks"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hssourceinfo" = callPackage ({ mkDerivation, base, containers, directory, filepath, regexpr }: mkDerivation { @@ -111860,21 +111984,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-types_0_10" = callPackage - ({ mkDerivation, array, base, blaze-builder, bytestring - , case-insensitive, doctest, hspec, QuickCheck - , quickcheck-instances, text + "http-types_0_11" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, doctest + , hspec, QuickCheck, quickcheck-instances, text }: mkDerivation { pname = "http-types"; - version = "0.10"; - sha256 = "1bim98ax7yqhwmq7d5zr7ii5vkx9xjsdqp6wm2ww56lzry1d8i1q"; + version = "0.11"; + sha256 = "08w30rf1i7kbh2j1iajqmj6yhhmglnb8kjggc8kdni3xahhrgcss"; libraryHaskellDepends = [ - array base blaze-builder bytestring case-insensitive text + array base bytestring case-insensitive text ]; testHaskellDepends = [ - base blaze-builder bytestring doctest hspec QuickCheck - quickcheck-instances text + base bytestring doctest hspec QuickCheck quickcheck-instances text ]; homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; @@ -112327,12 +112449,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hunit-dejafu_0_7_0_2" = callPackage + "hunit-dejafu_0_7_1_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.7.0.2"; - sha256 = "1n3vq17rl18kaill8ig30qvmaw60dq8w0phss5v8hhgfij64gmm6"; + version = "0.7.1.1"; + sha256 = "1b9c4v82fzrl88bg13q36smicndi0l7bp73mxniavbnsmccb22yy"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -116679,8 +116801,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.2.2"; - sha256 = "09fabf4yx0k1rb6i2msmlszvx1v318n35gmc9aakvicnzkvxarrm"; + version = "1.2.2.1"; + sha256 = "1dsrj11vcf7jn1xwhjz7jz6fnpxc3k614na0hy5xxfnhib0mvm8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127295,8 +127417,8 @@ self: { pname = "lenz"; version = "0.2.2.1"; sha256 = "0w8imq8x5g71byjv8q00fp688mc02kf19n2i23b8474z6sk1mhg8"; - revision = "1"; - editedCabalFile = "0ib3xxrdi3d06psr6mvf241gx1n03qmi7m03cixj4zv8hgmhls3n"; + revision = "2"; + editedCabalFile = "1znj9hjyk8dqcmq2kjdvkpjrn2vqf388n7bmdhd61lkfhjqx6w3m"; libraryHaskellDepends = [ base base-unicode-symbols hs-functors transformers ]; @@ -131127,14 +131249,15 @@ self: { ({ mkDerivation, aeson, ansi-terminal, async, base, containers , data-default, deepseq, directory, dlist, errors, exceptions , extra, filepath, fmt, formatting, hashable, hspec, HUnit, lens - , mmorph, monad-control, monad-loops, mtl, network, QuickCheck - , text, text-format, time, transformers, transformers-base - , universum, unix, unordered-containers, vector, yaml + , markdown-unlit, mmorph, monad-control, monad-loops, mtl, network + , QuickCheck, text, text-format, time, transformers + , transformers-base, universum, unix, unordered-containers, vector + , yaml }: mkDerivation { pname = "log-warper"; - version = "1.7.1"; - sha256 = "1fxczmxgccmgbccipnvpds77ch0sa0cfmpqc4k00d05icbf58fja"; + version = "1.7.2"; + sha256 = "1qf1686wbad3hr908spd1g5q7n00dg3z8ql4aradkl4lb965dn02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131144,7 +131267,9 @@ self: { transformers transformers-base universum unix unordered-containers vector yaml ]; - executableHaskellDepends = [ base exceptions text universum yaml ]; + executableHaskellDepends = [ + base exceptions markdown-unlit text universum yaml + ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit lens QuickCheck universum unordered-containers @@ -133188,8 +133313,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "3.1.1.21"; - sha256 = "1ai3fgyfpsnbw7f1p242hgva70b0fy4xg6ybfyldg9sghak8b5c7"; + version = "3.1.2.0"; + sha256 = "1g7gm0mmsvfyqf86qilp2p4kbfzpfp4gkcdpd5gc1673g3lxsr5v"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory process ]; @@ -134990,8 +135115,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40000.1.0"; - sha256 = "0zqbaqdvcq45sgkiii7w2y8b3m8fv8zqj1y85rdkycjfy7h8lkjd"; + version = "40400.0.0"; + sha256 = "1qp2d18lhf6j4gq67w1sd5alwhz5zlbmjp26apsvxbvcary0mb0a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135023,8 +135148,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40000.1.0"; - sha256 = "076b5l2hqjbspdm6j321inf141jsr07c9dsckqvq02wxjaz8ws80"; + version = "40400.0.0"; + sha256 = "1n5mv56srq171ql9n7gvpfma8mx9jb61w88ab72v99xhiid3ahdi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135050,8 +135175,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40000.1.0"; - sha256 = "11yxkq19f0iczh69hglv7plv466wfzdskkygp9vh6a7bjwwr8hzk"; + version = "40400.0.0"; + sha256 = "0kp36m2vf3zzfgibzs6kgai1bfsghxpzx7hpw0bywg1jpwqr95ka"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -136233,6 +136358,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_9" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, ghc-prim + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.9"; + sha256 = "1v8fjw0dgnyw6jhrpzfyxf63ky1lyrfapb8x28lj25q2xw6zx8s5"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim + ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -137845,15 +137988,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_9_0_0" = callPackage + "miso_0_10_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.9.0.0"; - sha256 = "09m34q1d65j2rhnnb66z6hmbj3vma8dgj7dbakx9w2w6z9y7bz1z"; + version = "0.10.0.0"; + sha256 = "0p5hnd9k14zbv2gphxwm7a84m3djzybr6awihrb22wk5jyjc9d7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142560,8 +142703,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.5"; - sha256 = "18izqidmhiw2b3xs0q8w7dv73v3300d2xqk3prnk70326bsrvrid"; + version = "1.1.6"; + sha256 = "1n7mdyz781cr0mmfcrj8agx3zdd6qh7hlb98kd63bz9msri4zfrz"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -142744,6 +142887,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "myanimelist-export" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , conduit-extra, containers, directory, http-client + , http-client-tls, network-uri, tagstream-conduit, text, yaml + }: + mkDerivation { + pname = "myanimelist-export"; + version = "0.1.0.1"; + sha256 = "0hmrkw0qyvknsny5vcq5s1mnjmmadn2x8l3gs07qxh58ncw3y4k2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring conduit containers http-client network-uri + tagstream-conduit text + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra directory http-client + http-client-tls network-uri text yaml + ]; + homepage = "https://github.com/mat8913/myanimelist-export#readme"; + description = "Export from MyAnimeList"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mybitcoin-sci" = callPackage ({ mkDerivation, base, cgi, curl, directory, mtl, process, split }: mkDerivation { @@ -155984,8 +156151,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "pidfile"; - version = "0.1.0.1"; - sha256 = "1ps8whs4aapwkl78yp55zfi7yzfgqmmhm7bz0llm4qwn8fcaiwas"; + version = "0.1.0.2"; + sha256 = "1iriansay0vq1b6crd1gc86ghv6iqcrnpflsa5b22x1lrlvxcwmj"; libraryHaskellDepends = [ base unix ]; homepage = "https://github.com/jonpetterbergman/pidfile"; description = "Run an IO action protected by a pidfile"; @@ -157668,8 +157835,8 @@ self: { }: mkDerivation { pname = "playlists"; - version = "0.4.1.0"; - sha256 = "0flcgcppqjv045qp7yc6x2df78c9dqnabm000frnbr7s51dwlzvh"; + version = "0.5.0.0"; + sha256 = "0653aifikinz69wq3d6sfkchcchhwlndh1lf40qrk96941qss0d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157687,18 +157854,18 @@ self: { }) {}; "playlists-http" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, either, exceptions - , http-client, mtl, playlists, text + ({ mkDerivation, attoparsec, base, bytestring, exceptions + , http-client, mtl, playlists, text, transformers }: mkDerivation { pname = "playlists-http"; - version = "0.1.1.0"; - sha256 = "1jr6pcnw652jf07q79drk8h132c31232rdxf552i458i62xawpig"; + version = "0.2.0.0"; + sha256 = "0hx55vqcqfkfjds7hh4l1i60al9d65q55wg9jfns3qml5z8pqik1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring either exceptions http-client mtl - playlists text + attoparsec base bytestring exceptions http-client mtl playlists + text transformers ]; homepage = "https://github.com/pjones/playlists-http"; description = "Library to glue together playlists and http-client"; @@ -159348,8 +159515,8 @@ self: { ({ mkDerivation, base, bytestring, postgresql-simple, text }: mkDerivation { pname = "postgres-tmp"; - version = "0.1.0.1"; - sha256 = "1r3pnqqvq6ar9fxbwya2nn85x15pgczh5gfn2srpgi7j0vdjw0vd"; + version = "0.2.0"; + sha256 = "1zx5inxczzlhyb5f89f92f0ngzln49qahzraqr6ksvi5r7n7gk86"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; homepage = "https://github.com/cocreature/postgres-tmp#readme"; description = "Create a temporary database that is deleted after performing some operation"; @@ -160323,8 +160490,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.53"; - sha256 = "0y0745i8mq803zv73l36k78j36z0h4vb44pwbvc4qsdkh5760nnz"; + version = "0.0.56"; + sha256 = "0bwn4ixhgfrbjf12ahvw2hnkvx4p3818775wxnqfh72r50q54c0l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163219,8 +163386,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.1"; - sha256 = "04f0hywbv7azy3kl3hha1y43fs24f0w2hnd7aqccmfdklskjc6g4"; + version = "0.16.2"; + sha256 = "0sa3akkhydyxr7caig8z6bjwiaarr171qazfbwm9kh8x1pdah5dv"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers @@ -166912,12 +167079,12 @@ self: { }) {}; "rate-limit" = callPackage - ({ mkDerivation, base, time-units }: + ({ mkDerivation, base, stm, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.1.1"; - sha256 = "1d1dfj05vi8jr2cfy42a58wnm84zm6cmx7fabp2rb83qqm4l2riz"; - libraryHaskellDepends = [ base time-units ]; + version = "1.2.0"; + sha256 = "0djjs18ca41z1mx7a6j2cbaryq895qa7wjhyqpzl38l9d2a54p7f"; + libraryHaskellDepends = [ base stm time-units ]; homepage = "http://github.com/acw/rate-limit"; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -171176,7 +171343,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req_0_5_0" = callPackage + "req_1_0_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, data-default-class , hspec, hspec-core, http-api-data, http-client, http-client-tls @@ -171185,8 +171352,8 @@ self: { }: mkDerivation { pname = "req"; - version = "0.5.0"; - sha256 = "0wrlbmix8avvvl3mwijsbzajpbkz4n208gvqim8xyhw0ic5lxf3q"; + version = "1.0.0"; + sha256 = "1s2yd61pw316llxyap7qwi18vrqxl6hhsmbgr79chjv5g119c087"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -171197,7 +171364,7 @@ self: { testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class hspec hspec-core http-client http-types - monad-control mtl QuickCheck retry text time unordered-containers + monad-control mtl QuickCheck text time unordered-containers ]; doCheck = false; homepage = "https://github.com/mrkkrp/req"; @@ -171232,16 +171399,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "req-conduit_0_2_1" = callPackage + "req-conduit_1_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh }: mkDerivation { pname = "req-conduit"; - version = "0.2.1"; - sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; - revision = "3"; - editedCabalFile = "0g56b7jqgz45dk674y8pklcvgsmai8vj3ibdylmajij0b4gcsvwd"; + version = "1.0.0"; + sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -172268,8 +172433,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.2.0.0"; - sha256 = "03vskqdgf52lrqm5fjzhyh6sd05xkpvz6n92vd53piklnpvf25gh"; + version = "0.3.0.0"; + sha256 = "0isah99dzklp8igmapygwy39la03brjvvz2sqw4l3fbja6arpw3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172281,6 +172446,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rhine-gloss" = callPackage + ({ mkDerivation, base, dunai, gloss, rhine }: + mkDerivation { + pname = "rhine-gloss"; + version = "0.3.0.0"; + sha256 = "048f9azvkd1jqak3514h9b8jsrqxnig0xpxqhan7hy4bryfnfhdb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai gloss rhine ]; + executableHaskellDepends = [ base ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -173853,8 +174031,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.10"; - sha256 = "0c4pnmayv4m4cpzp0dpvgcwikpqi6q5n8w5pcgcq7qmx799rlb1f"; + version = "0.2.11"; + sha256 = "01vlj8ilxzyv6rqffpj3il7dcmcyy4vg6ab3mprdgcy6f0rpsv8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175297,8 +175475,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.3.1"; - sha256 = "1iz6ayvb5vrbl6d436x7zfmj15vqq9yyqm1w4322k9j4khnn62hc"; + version = "2.3.2"; + sha256 = "19r6a5sh2shaxzkvcysjk2ibfx85w0s1yvg2zjznka4wpzihfs91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176127,8 +176305,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "6"; - editedCabalFile = "040jqfmaqy6g8hv903kjsd1bx4sr7pxsispj314gsdy8i7cb2n50"; + revision = "7"; + editedCabalFile = "0mn4v7sgnihxvd9wmdqlfhz8818n4r4kgqvrz7sn4raqq5jxkdyr"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -176953,6 +177131,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "search-algorithms_0_3_0" = callPackage + ({ mkDerivation, base, containers, doctest, hspec }: + mkDerivation { + pname = "search-algorithms"; + version = "0.3.0"; + sha256 = "046v424bvfnvf3hw38k9isdn9f05l4jk8k1fb2p3zn5zgb4h77aa"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hspec ]; + homepage = "https://github.com/devonhollowood/search-algorithms#readme"; + description = "Common graph search algorithms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sec" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -178021,29 +178213,29 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring , base64-bytestring, binary, bytestring, cborg, cereal , cereal-vector, containers, criterion, deepseq, directory - , filepath, ghc-prim, half, hashable, old-locale, pretty, primitive - , QuickCheck, quickcheck-instances, scientific, store, tar, tasty - , tasty-hunit, tasty-quickcheck, text, time, unordered-containers - , vector, zlib + , filepath, ghc-prim, half, hashable, pretty, primitive, QuickCheck + , quickcheck-instances, scientific, store, tar, tasty, tasty-hunit + , tasty-quickcheck, text, time, unordered-containers, vector, zlib }: mkDerivation { pname = "serialise"; - version = "0.1.0.0"; - sha256 = "1a28rhnhfgpkpgr9a5c5fvpfj28mfx716kb6rlhziwkm1y675iw3"; + version = "0.2.0.0"; + sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable - old-locale primitive text time unordered-containers vector + primitive text time unordered-containers vector ]; testHaskellDepends = [ aeson array base base16-bytestring base64-bytestring binary bytestring cborg containers deepseq directory filepath ghc-prim - half hashable QuickCheck quickcheck-instances scientific tasty - tasty-hunit tasty-quickcheck text time unordered-containers vector + half hashable primitive QuickCheck quickcheck-instances scientific + tasty tasty-hunit tasty-quickcheck text time unordered-containers + vector ]; benchmarkHaskellDepends = [ aeson array base binary bytestring cborg cereal cereal-vector containers criterion deepseq directory filepath ghc-prim half - old-locale pretty store tar text time vector zlib + pretty store tar text time vector zlib ]; homepage = "https://github.com/well-typed/cborg"; description = "A binary serialisation library for Haskell values"; @@ -192478,13 +192670,16 @@ self: { }) {}; "substring-parser" = callPackage - ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }: + ({ mkDerivation, attoparsec, base, containers, hspec, NoTrace, text + }: mkDerivation { pname = "substring-parser"; - version = "0.2.0.0"; - sha256 = "1bk50vsx9l1bys0fb37k818zh607221mxn6h8fmyl7ql623d6r87"; + version = "0.3.0.0"; + sha256 = "0yfdrmadsra7692zsqm2cnmx0hr2lrkx0swvhk3gw3666453x84j"; libraryHaskellDepends = [ attoparsec base NoTrace text ]; - testHaskellDepends = [ attoparsec base hspec NoTrace text ]; + testHaskellDepends = [ + attoparsec base containers hspec NoTrace text + ]; homepage = "https://gitlab.com/igrep/substring-parser"; description = "Match / replace substrings with a parser combinators"; license = stdenv.lib.licenses.asl20; @@ -195289,6 +195484,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.2"; + sha256 = "1j7gliwn4x6i25zlhc8f704pbc96ddn9gb9czq3a4m0k1sfpm3w8"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring containers deepseq directory process QuickCheck + text time + ]; + homepage = "https://github.com/ndmitchell/tagsoup#readme"; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -195922,12 +196136,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_3" = callPackage + "tasty-dejafu_0_7_1_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.3"; - sha256 = "0xvqlw5w5rwz1xxi277r9w7iad7prds5i1rrmy8wz3x3vh9kbnmm"; + version = "0.7.1.1"; + sha256 = "04qmgvm6z2bfbb8dsbj71famyiacswp7nbjwsa043w4i0hnsgpsl"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -196123,6 +196337,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-hunit_0_10_0_1" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.0.1"; + sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g"; + libraryHaskellDepends = [ base call-stack tasty ]; + homepage = "https://github.com/feuerbach/tasty"; + description = "HUnit support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -205893,10 +206120,10 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.7.1.3"; - sha256 = "1qlyaaq37w2yvxxhk835xansij3kipff20snyxcfiaf7nlprdlsn"; + version = "0.7.1.4"; + sha256 = "1rs0sbkzjlvwjsp4yz7mg4sd2y422vqnzj13fdcssfdmkbs0ybyn"; revision = "1"; - editedCabalFile = "08yv53ia3p97419lab4j6bx934kan53d1ki3y1pjklhgi06w5n4p"; + editedCabalFile = "0g75rszhy7fj3riy0j8y6j78m7gx6pp8h4j67zqax6anq3ry12fn"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell @@ -210568,6 +210795,8 @@ self: { pname = "vec"; version = "0"; sha256 = "1h4s4j10z94mjdifyibpnc7zzq6a8xklbzj164ck8hdq8fp7qj52"; + revision = "1"; + editedCabalFile = "086vxqpskjgjqy65pckivw9flp8vk14zz1cvd3pxdh5hp5dfxlam"; libraryHaskellDepends = [ adjunctions base base-compat boring deepseq distributive fin hashable lens semigroupoids semigroups @@ -210575,7 +210804,7 @@ self: { testHaskellDepends = [ base fin inspection-testing tagged ]; benchmarkHaskellDepends = [ base criterion fin vector ]; homepage = "https://github.com/phadej/vec"; - description = "Nat, Fin and Vec types"; + description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -213291,8 +213520,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.1"; sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "3"; - editedCabalFile = "1k6wvqwckccxdvpfi0cinw7pw907rigvgcsj5mib4wxpfwpg5cam"; + revision = "4"; + editedCabalFile = "0yxrs5dzd79pklvk014nj4dq8arjzyr3bhq432rzqzr4zjijyblf"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -223519,6 +223748,93 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yu-auth" = callPackage + ({ mkDerivation, base, cryptonite, hspec, hspec-wai, memory + , MonadRandom, random, wai, yesod-core, yesod-test, yu-utils + }: + mkDerivation { + pname = "yu-auth"; + version = "0.1.0.0"; + sha256 = "139gbrwzbp9zyx8klqvp07lh1fngs6i17xbrrnkssr85q12s79f9"; + libraryHaskellDepends = [ base cryptonite memory yu-utils ]; + testHaskellDepends = [ + base hspec hspec-wai MonadRandom random wai yesod-core yesod-test + yu-utils + ]; + homepage = "https://github.com/Qinka/Yu"; + description = "Auth module for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "yu-core" = callPackage + ({ mkDerivation, base, blaze-markup, hspec, yu-auth, yu-utils }: + mkDerivation { + pname = "yu-core"; + version = "0.1.0.0"; + sha256 = "1ly4vasf70lm8wns2s8daxd0hpnyjs1cc6vklafk6vvk6g2a01p1"; + libraryHaskellDepends = [ base yu-auth yu-utils ]; + testHaskellDepends = [ base blaze-markup hspec yu-utils ]; + homepage = "https://github.com/Qinka/Yu"; + description = "The core of Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "yu-launch" = callPackage + ({ mkDerivation, base, cmdargs, yaml, yu-auth, yu-core, yu-utils }: + mkDerivation { + pname = "yu-launch"; + version = "0.1.0.6"; + sha256 = "0a4ckivwzgp46a8m68qal5mhblw4k84xnmlsi8701j6n5nmhsxzi"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs yaml yu-auth yu-core yu-utils + ]; + homepage = "https://github.com/Qinka/Yu"; + description = "The launcher for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "yu-tool" = callPackage + ({ mkDerivation, base, cmdargs, directory, echo, filepath, process + , yu-auth, yu-utils + }: + mkDerivation { + pname = "yu-tool"; + version = "0.1.0.0"; + sha256 = "181xqiwzhwaglgj9j307apdzmai5hk1dlrfl8njzy584rsrqjlqx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs directory echo filepath process yu-auth yu-utils + ]; + homepage = "https://github.com/Qinka/Yu"; + description = "Tool for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "yu-utils" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , cmdargs, conduit, fast-logger, gitrev, http-types, monad-control + , monad-logger, mongoDB, mtl, network, parsec, resource-pool + , shakespeare, signal, template-haskell, text, time, transformers + , wai, wai-extra, wai-logger, warp, xml-hamlet, yesod-core + }: + mkDerivation { + pname = "yu-utils"; + version = "0.1.0.0"; + sha256 = "0sr03639mb49s0s2wkl642x9fhvm5qjrrvpqgf08jay5ph6l51g6"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring cmdargs conduit + fast-logger gitrev http-types monad-control monad-logger mongoDB + mtl network parsec resource-pool shakespeare signal + template-haskell text time transformers wai wai-extra wai-logger + warp xml-hamlet yesod-core + ]; + description = "Utils for Yu"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "yuiGrid" = callPackage ({ mkDerivation, base }: mkDerivation { From ae2cf0bee8da88e2f4ecf8e227a7ca56f32c0171 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 2 Dec 2017 11:31:29 +0000 Subject: [PATCH 04/35] tortoisehg: check imports This could have prevented #32245. --- .../applications/version-management/tortoisehg/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 44d1ad0cd35..f06a0c90db1 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; - doCheck = false; + doCheck = true; dontStrip = true; buildPhase = ""; installPhase = '' @@ -23,6 +23,11 @@ python2Packages.buildPythonApplication rec { ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; + checkPhase = '' + echo "test: thg version" + $out/bin/thg version + ''; + meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = http://tortoisehg.bitbucket.org/; From 4a7a497fb6a012be8e2782a523d96aed578d8c3c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 2 Dec 2017 12:19:14 +0000 Subject: [PATCH 05/35] go: add procps for sysctl in tests, print ulimits for debugging resource exhaustion --- pkgs/development/compilers/go/1.8.nix | 6 ++++-- pkgs/development/compilers/go/1.9.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 538c20bac72..210f259df89 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, fetchpatch +, perl, which, pkgconfig, patch, procps , pcre, cacert, llvm , Security, Foundation, bash , makeWrapper, git, subversion, mercurial, bazaar }: @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] + ++ optionals stdenv.isLinux [ procps ]; buildInputs = [ pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -144,6 +145,7 @@ stdenv.mkDerivation rec { export GOROOT=$out/share/go export GOBIN=$GOROOT/bin export PATH=$GOBIN:$PATH + ulimit -a ''; postConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 007b81d995b..8708bd762c4 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, fetchpatch +, perl, which, pkgconfig, patch, procps , pcre, cacert, llvm , Security, Foundation, bash , makeWrapper, git, subversion, mercurial, bazaar }: @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]; + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] + ++ optionals stdenv.isLinux [ procps ]; buildInputs = [ pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -150,6 +151,7 @@ stdenv.mkDerivation rec { export GOROOT=$out/share/go export GOBIN=$GOROOT/bin export PATH=$GOBIN:$PATH + ulimit -a ''; postConfigure = optionalString stdenv.isDarwin '' From 94b7925b30e4b3162401791e2118dd8e45821fb4 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sat, 2 Dec 2017 13:32:45 +0100 Subject: [PATCH 06/35] elm-interface-to-json: init at 0.1 (#32194) elm-interface-to-json -> init at 0.1 --- pkgs/development/compilers/elm/default.nix | 4 +++- .../elm/packages/elm-interface-to-json.nix | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/elm/packages/elm-interface-to-json.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 7cba0cab351..4520363a53b 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -72,7 +72,9 @@ let where foo is a tag for a new version, for example "0.3.1-alpha". */ elm-format = self.callPackage ./packages/elm-format.nix { }; - + elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix { + aeson-pretty = self.aeson-pretty_0_7_2; + }; }; in elmPkgs // { inherit elmPkgs; diff --git a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix new file mode 100644 index 00000000000..3f797b7a236 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix @@ -0,0 +1,24 @@ +{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring +, concatenative, containers, directory, either, elm-compiler +, filemanip, filepath, indents, optparse-applicative, parsec +, stdenv, text, transformers, fetchgit +}: +mkDerivation { + pname = "elm-interface-to-json"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/stoeffel/elm-interface-to-json"; + sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k"; + rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323"; + }; + isLibrary = false; + isExecutable = true; + jailbreak = true; + executableHaskellDepends = [ + aeson aeson-pretty base binary bytestring concatenative containers + directory either elm-compiler filemanip filepath indents + optparse-applicative parsec text transformers + ]; + homepage = "https://github.com/githubuser/elm-interface-to-json#readme"; + license = stdenv.lib.licenses.bsd3; +} From 491e5d8649e8587654a81baf119e3b66bce65102 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 2 Dec 2017 14:46:33 +0200 Subject: [PATCH 07/35] rustc: Support aarch64 --- pkgs/development/compilers/rust/bootstrap.nix | 3 +++ pkgs/development/compilers/rust/default.nix | 4 +++- .../aarch64-disable-test_loading_cosine.patch | 12 ++++++++++++ pkgs/development/compilers/rust/print-hashes.sh | 1 + pkgs/development/compilers/rust/rustc.nix | 3 +++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index da9680943b5..a707fe2e69e 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -9,6 +9,7 @@ let hashes = { i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668"; x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8"; + aarch64-unknown-linux-gnu = "eaab3df489d4d8f976c4327d812b9870730eed6d0bbd52712767083d02be7472"; i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5"; x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5"; }; @@ -18,6 +19,8 @@ let then "i686-unknown-linux-gnu" else if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" + else if stdenv.system == "aarch64-linux" + then "aarch64-unknown-linux-gnu" else if stdenv.system == "i686-darwin" then "i686-apple-darwin" else if stdenv.system == "x86_64-darwin" diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3973eaff187..76dafd95353 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -23,7 +23,9 @@ rec { patches = [ ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch + # https://github.com/rust-lang/rust/issues/45410 + ++ stdenv.lib.optional stdenv.isAarch64 ./patches/aarch64-disable-test_loading_cosine.patch; }; diff --git a/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch b/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch new file mode 100644 index 00000000000..d29eb16cfe5 --- /dev/null +++ b/pkgs/development/compilers/rust/patches/aarch64-disable-test_loading_cosine.patch @@ -0,0 +1,12 @@ +diff --git a/src/librustc_back/dynamic_lib.rs b/src/librustc_back/dynamic_lib.rs +index 1b42fa0..92256dc 100644 +--- a/src/librustc_back/dynamic_lib.rs ++++ b/src/librustc_back/dynamic_lib.rs +@@ -80,6 +80,7 @@ mod tests { + use std::mem; + + #[test] ++ #[ignore] + fn test_loading_cosine() { + if cfg!(windows) { + return diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index f3d094d65a8..dc7e3719355 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,6 +10,7 @@ set -euo pipefail PLATFORMS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu + aarch64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin ) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 4d92566edd4..ec0f100fb56 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -34,6 +34,9 @@ stdenv.mkDerivation { __darwinAllowLocalNetworking = true; + # The build will fail at the very end on AArch64 without this. + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; # Enable nightly features in stable compiles (used for From af9cf7ec77ea9cdd95bf148c8a03eb7d6aaba8e1 Mon Sep 17 00:00:00 2001 From: sg2002 Date: Sat, 2 Dec 2017 18:46:14 +0300 Subject: [PATCH 08/35] lm-sensors: add option to enable sensord (#32172) --- pkgs/os-specific/linux/lm-sensors/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index a1f00531cee..066946d8f0b 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,9 +1,14 @@ -{ stdenv, fetchurl, bison, flex, which, perl }: +{ sensord ? false, + stdenv, fetchurl, bison, flex, which, perl, + rrdtool ? null +}: + +assert sensord -> rrdtool != null; stdenv.mkDerivation rec { name = "lm-sensors-${version}"; version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash - + src = fetchurl { urls = [ "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" @@ -12,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; - buildInputs = [ bison flex which perl ]; + buildInputs = [ bison flex which perl ] + ++ stdenv.lib.optional sensord rrdtool; preBuild = '' - makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) + makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc + ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"}) ''; meta = { From a1b77bfe5ff91a250217b47adbbc961cc61a21e3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 2 Dec 2017 17:20:24 +0000 Subject: [PATCH 09/35] Revert "qt5: 5.9.1 -> 5.9.3" KDE frameworks 5.40 are not compatible with Qt 5.9.3: #32253 This reverts commit bd71d3aef7a61f1c01e14fa5c0ec7f6f6a7dc56e (#32100). --- .../libraries/qt-5/5.9/default.nix | 4 +- pkgs/development/libraries/qt-5/5.9/fetch.sh | 2 +- .../libraries/qt-5/5.9/qtbase.patch | 113 +++---- pkgs/development/libraries/qt-5/5.9/srcs.nix | 312 +++++++++--------- .../libraries/qt-5/modules/qtbase.nix | 4 +- 5 files changed, 204 insertions(+), 231 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 0582a9f3f82..879f7f198c9 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -6,9 +6,9 @@ Before a major version update, make a copy of this directory. (We like to keep the old version around for a short time after major updates.) Add a top-level attribute to `top-level/all-packages.nix`. -1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. +1. Update the URL in `maintainers/scripts/generate-qt.sh`. 2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. + `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. 3. Update `qtCompatVersion` below if the minor version number changes. 4. Check that the new packages build correctly. 5. Commit the changes and open a pull request. diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 103fa4e09ab..2ae85bba391 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch index 69e389a5a6d..96c9b029312 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase.patch @@ -101,7 +101,7 @@ index bb5083c925..da8e2cb386 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 55c74aad66..0bbc8718eb 100644 +index 17da8b979e..d648ab4058 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) @@ -261,10 +261,10 @@ index 55c74aad66..0bbc8718eb 100644 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 e645ba5803..a0e5c68b7e 100644 +index 395ac34001..a0e5c68b7e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -24,166 +24,3 @@ qt { +@@ -24,165 +24,3 @@ qt { } } } @@ -427,18 +427,17 @@ index e645ba5803..a0e5c68b7e 100644 -} - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) +-cache(QMAKE_XCODE_VERSION, stash) - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..61ed486a76 100644 +index e21e749ee9..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,3 @@ +@@ -1,51 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - +- -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { - # Get path of Xcode's Developer directory - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") @@ -448,23 +447,18 @@ index 44636f2288..61ed486a76 100644 - # Make sure Xcode path is valid - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode is set up properly +- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ +- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") -} - --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } +-isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) -} - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { @@ -493,11 +487,11 @@ index 44636f2288..61ed486a76 100644 -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3f6dc076ca..8b13789179 100644 +index 68ab7e4053..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ - +@@ -1,49 +0,0 @@ +- -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") - @@ -506,22 +500,13 @@ index 3f6dc076ca..8b13789179 100644 - -defineReplace(xcodeSDKInfo) { - info = $$1 -- equals(info, "Path"): \ -- info = --show-sdk-path -- equals(info, "PlatformPath"): \ -- info = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- info = --show-sdk-version - sdk = $$2 - isEmpty(sdk): \ - sdk = $$QMAKE_MAC_SDK - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\'") +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) - } - @@ -596,10 +581,10 @@ index d49f4c49c1..097dcd7d39 100644 target.path = $$instbase/$$TARGETPATH INSTALLS += target diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 883f8ca215..81db8eb2d4 100644 +index cb84ae0da8..45e16f4302 100644 --- a/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf -@@ -33,7 +33,7 @@ host_build:force_bootstrap { +@@ -29,7 +29,7 @@ host_build:force_bootstrap { target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -622,7 +607,7 @@ index 1848f00e90..2af93675c5 100644 + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index fb96d1b6a0..508ed17d30 100644 +index 1e138730b3..b7ba74dc3f 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { @@ -676,32 +661,20 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..30f7fbac41 100644 +index 0a008374e5..5e7cd92f6f 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -77,13 +77,13 @@ for(extra, extras): \ - # Just for Qt Creator - OTHER_FILES += $$sourcefiles - --sourcefiles += \ -- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -- $$DBUS_ADAPTORS $$DBUS_INTERFACES --addInstallFiles(sources.files, $$sourcefiles) --sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase --INSTALLS += sources -+ sourcefiles += \ -+ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -+ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -+ $$DBUS_ADAPTORS $$DBUS_INTERFACES -+ addInstallFiles(sources.files, $$sourcefiles) +@@ -73,7 +73,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +- sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase + sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase -+ INSTALLS += sources + INSTALLS += sources - check_examples { - srcfiles = $$sources.files + check_examples { diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 +index c00fdb73f8..5789cd0c06 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -863,7 +836,7 @@ index 706304cf34..546420f6ad 100644 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 cba279c184..5ae3fd62e5 100644 +index 39e7c71a9c..dced1f2811 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths() @@ -883,7 +856,7 @@ index cba279c184..5ae3fd62e5 100644 if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 4fdc2e36ac..d3ec222543 100644 +index 1714c9802f..fd2ebb1336 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; @@ -899,7 +872,7 @@ index 4fdc2e36ac..d3ec222543 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -645,12 +649,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -994,7 +967,7 @@ index 1da00813ce..0bf877afcb 100644 return false; } diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index 9a24938284..74962b4ae2 100644 +index cf08a15f96..2310488298 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -102,7 +102,7 @@ static bool resolveLibraryInternal() @@ -1051,7 +1024,7 @@ index 341d3bccf2..3368234c26 100644 scanThread->interfaceName = QString::fromNSString(ifName); scanThread->start(); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 +index ca9f7af127..a337ad73bf 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() @@ -1069,7 +1042,7 @@ index b5a0a5bbeb..6c20305f4d 100644 QString TableGenerator::findComposeFile() diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index 5cd4beb4f0..84919e6d6a 100644 +index 59b76370ae..b91139ded9 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -320,7 +320,7 @@ static void qt_closePopups() @@ -1082,7 +1055,7 @@ index 5cd4beb4f0..84919e6d6a 100644 #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index e2e573f0e1..1c8289f81e 100644 +index 7640a711a9..ef9a14d38b 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) @@ -1101,11 +1074,11 @@ index e2e573f0e1..1c8289f81e 100644 #endif } diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 7c62c2e2b3..fefa40e0f6 100644 +index d257ab1242..75853af4e4 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + #if defined(XCB_USE_XLIB) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index df7846ca386..247800b7578 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,275 @@ { qt3d = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz"; - sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp"; - name = "qt3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; + sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; + name = "qt3d-opensource-src-5.9.1.tar.xz"; }; }; qtactiveqt = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz"; - sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r"; - name = "qtactiveqt-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; + sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; + name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; }; }; qtandroidextras = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz"; - sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n"; - name = "qtandroidextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; + name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; }; }; qtbase = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz"; - sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y"; - name = "qtbase-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; + sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; + name = "qtbase-opensource-src-5.9.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz"; - sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y"; - name = "qtcanvas3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; + sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; + name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; }; }; qtcharts = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz"; - sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc"; - name = "qtcharts-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; + sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; + name = "qtcharts-opensource-src-5.9.1.tar.xz"; }; }; qtconnectivity = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz"; - sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2"; - name = "qtconnectivity-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; + sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; + name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz"; - sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh"; - name = "qtdatavis3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; + sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; + name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; }; }; qtdeclarative = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz"; - sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh"; - name = "qtdeclarative-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; + sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; + name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; }; }; qtdoc = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz"; - sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5"; - name = "qtdoc-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; + sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; + name = "qtdoc-opensource-src-5.9.1.tar.xz"; }; }; qtgamepad = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz"; - sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6"; - name = "qtgamepad-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; + sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; + name = "qtgamepad-opensource-src-5.9.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; - sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr"; - name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; + name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; }; }; qtimageformats = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz"; - sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl"; - name = "qtimageformats-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; + sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; + name = "qtimageformats-opensource-src-5.9.1.tar.xz"; }; }; qtlocation = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz"; - sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0"; - name = "qtlocation-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; + sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; + name = "qtlocation-opensource-src-5.9.1.tar.xz"; }; }; qtmacextras = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz"; - sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy"; - name = "qtmacextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; + sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; + name = "qtmacextras-opensource-src-5.9.1.tar.xz"; }; }; qtmultimedia = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz"; - sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7"; - name = "qtmultimedia-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; + sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; + name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz"; - sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz"; - name = "qtnetworkauth-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; + sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; + name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; }; }; qtpurchasing = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz"; - sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j"; - name = "qtpurchasing-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; + sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; + name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz"; - sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih"; - name = "qtquickcontrols-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; + sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; + name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz"; - sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1"; - name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; + name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz"; - sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk"; - name = "qtremoteobjects-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; + sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; + name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; }; }; qtscript = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz"; - sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq"; - name = "qtscript-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; + sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; + name = "qtscript-opensource-src-5.9.1.tar.xz"; }; }; qtscxml = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz"; - sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq"; - name = "qtscxml-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; + sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; + name = "qtscxml-opensource-src-5.9.1.tar.xz"; }; }; qtsensors = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz"; - sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr"; - name = "qtsensors-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; + sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; + name = "qtsensors-opensource-src-5.9.1.tar.xz"; }; }; qtserialbus = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz"; - sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg"; - name = "qtserialbus-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; + sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; + name = "qtserialbus-opensource-src-5.9.1.tar.xz"; }; }; qtserialport = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz"; - sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac"; - name = "qtserialport-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; + sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; + name = "qtserialport-opensource-src-5.9.1.tar.xz"; }; }; qtspeech = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz"; - sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1"; - name = "qtspeech-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; + sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; + name = "qtspeech-opensource-src-5.9.1.tar.xz"; }; }; qtsvg = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz"; - sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz"; - name = "qtsvg-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; + sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; + name = "qtsvg-opensource-src-5.9.1.tar.xz"; }; }; qttools = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz"; - sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24"; - name = "qttools-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; + sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; + name = "qttools-opensource-src-5.9.1.tar.xz"; }; }; qttranslations = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz"; - sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20"; - name = "qttranslations-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; + sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; + name = "qttranslations-opensource-src-5.9.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; - sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr"; - name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; + name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; }; }; qtwayland = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz"; - sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih"; - name = "qtwayland-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; + sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; + name = "qtwayland-opensource-src-5.9.1.tar.xz"; }; }; qtwebchannel = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz"; - sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3"; - name = "qtwebchannel-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; + sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; + name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; }; }; qtwebengine = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz"; - sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5"; - name = "qtwebengine-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; + sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; + name = "qtwebengine-opensource-src-5.9.1.tar.xz"; }; }; qtwebkit = { @@ -291,43 +291,43 @@ }; }; qtwebsockets = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz"; - sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf"; - name = "qtwebsockets-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; + sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; + name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; }; }; qtwebview = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz"; - sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf"; - name = "qtwebview-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; + sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; + name = "qtwebview-opensource-src-5.9.1.tar.xz"; }; }; qtwinextras = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz"; - sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl"; - name = "qtwinextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; + sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; + name = "qtwinextras-opensource-src-5.9.1.tar.xz"; }; }; qtx11extras = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz"; - sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74"; - name = "qtx11extras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; + sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; + name = "qtx11extras-opensource-src-5.9.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.3"; + version = "5.9.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz"; - sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g"; - name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; + name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 172b20bc51b..36238b5fadd 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -3,7 +3,7 @@ src, patches, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, which, + ruby, # darwin support darwin, libiconv, libcxx, @@ -84,7 +84,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 which ] + [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; propagatedNativeBuildInputs = [ lndir ]; From 4e7deb7100b9e1378fb8218a7b8c75394af037ca Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 Dec 2017 14:01:14 -0500 Subject: [PATCH 10/35] linux-copperhead: 4.14.2.a -> 4.14.3.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 863b6dcae78..707ed10ea0c 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.2"; + version = "4.14.3"; revision = "a"; - sha256 = "0bpkff1phc68shw6spkhd6zbxgjkgvdglym8b2hp383h14845qhb"; + sha256 = "18pcmi927gw4a0ih09fq1wv0jbzp1z42a8kga8ralcac828i6gi3"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 069124667e0..6be0560abb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12515,7 +12515,6 @@ with pkgs; linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix { kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.tag_hardened From d217cad2ac317254351f279929ac009c9e1508d5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 03:04:31 +0100 Subject: [PATCH 11/35] =?UTF-8?q?gnome3.gnome-video-effects:=200.4.1=20?= =?UTF-8?q?=E2=86=92=200.4.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix index dfeefe0def8..486898a4e1f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix @@ -2,15 +2,14 @@ stdenv.mkDerivation rec { name = "gnome-video-effects-${version}"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; - sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; + sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; From 9d18aa073d676f749f862413694dfd38b7eca801 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 03:25:39 +0100 Subject: [PATCH 12/35] gnome3.cheese: reorganize build inputs --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 7a4cd0e9495..251d34b4a23 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,14 +1,16 @@ { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev +, libgudev, vala, appstream-glib , adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 + nativeBuildInputs = [ + pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib + ]; + buildInputs = [ gtk3 glib gnome-video-effects + gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop gst_all_1.gst-plugins-bad clutter_gtk clutter-gst libcanberra_gtk3 libgudev ]; From d95052a89633d19b42940e1945a84a1e7192fbca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 03:26:06 +0100 Subject: [PATCH 13/35] gnome3.cheese: add effects to path --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 251d34b4a23..826708e8e10 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad clutter_gtk clutter-gst libcanberra_gtk3 libgudev ]; + preFixup = '' + gappsWrapperArgs+=( + # Effects + --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" + ) + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { From a6cd26740baae696115a7b501b6bf449321acebd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 04:10:47 +0100 Subject: [PATCH 14/35] gtk_doc: propagate the respect-xml-catalog-files-var.patch We are patching the xmlcatalog calls in the JH_CHECK_XML_CATALOG macro to use the XML_CATALOG_FILES environment variable instead of a single central catalog file. Since consumers (libraries or applications) are expected to copy the m4 files to their source tree, we need to patch them separately. The files should be identical, though, so we can reuse the patch for gtk_doc. This commit makes the patch available in passthru so the consumer expressions do not need to maintain the long relative path. --- pkgs/development/tools/documentation/gtk-doc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5f31a2dfb7c..b88b8e3c82a 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; patches = [ - ./respect-xml-catalog-files-var.patch + passthru.respect_xml_catalog_files_var_patch ]; outputDevdoc = "out"; @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { configureFlags = "--disable-scrollkeeper"; + passthru = { + # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch + respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; + }; + meta = with stdenv.lib; { homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; From cb447dda85d51d9cc862c856df0094332261fc27 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 03:58:44 +0100 Subject: [PATCH 15/35] gnome3.cheese: build manpage --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 826708e8e10..a211c8d18a8 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,6 +1,7 @@ { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev, vala, appstream-glib +, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib +, libxslt, yelp_tools, gnome_common , adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: stdenv.mkDerivation rec { @@ -8,6 +9,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib + libxslt docbook_xml_dtd_43 docbook_xsl + autoreconfHook yelp_tools gnome_common ]; buildInputs = [ gtk3 glib gnome-video-effects gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer @@ -15,6 +18,12 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad clutter_gtk clutter-gst libcanberra_gtk3 libgudev ]; + outputs = [ "out" "man" ]; + + patches = [ + gtk_doc.respect_xml_catalog_files_var_patch + ]; + preFixup = '' gappsWrapperArgs+=( # Effects From 83df26f180d5775f0df8a64dd3c510a8abecd539 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 04:02:10 +0100 Subject: [PATCH 16/35] gnome3.cheese: build devdoc --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index a211c8d18a8..466456b050f 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib -, libxslt, yelp_tools, gnome_common +, libxslt, yelp_tools, gnome_common, gtk_doc , adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib libxslt docbook_xml_dtd_43 docbook_xsl - autoreconfHook yelp_tools gnome_common + autoreconfHook gtk_doc yelp_tools gnome_common ]; buildInputs = [ gtk3 glib gnome-video-effects gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad clutter_gtk clutter-gst libcanberra_gtk3 libgudev ]; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "devdoc" ]; patches = [ gtk_doc.respect_xml_catalog_files_var_patch From cc4d5520fb78a13311d9c4ead8cb342cdd12ba67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 04:53:34 +0100 Subject: [PATCH 17/35] gnome3.cheese: fix missing vp8enc preset Closes: #11634 --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 466456b050f..63e13debd47 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( # Effects --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" ) ''; From 129aac73ec45a27dc2de1231a6a8eab88d541246 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 05:49:41 +0100 Subject: [PATCH 18/35] gnome3.gnome_desktop: reorganize build inputs --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index e8a7cb8ceb9..27b6413e16e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -10,11 +10,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python libxml2Python libxslt which libX11 - xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile - libseccomp gobjectIntrospection ]; + nativeBuildInputs = [ + pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection + ]; + buildInputs = [ python libxml2Python libX11 + xkeyboard_config isocodes wayland + gtk3 glib libxkbfile libseccomp ]; propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; From f816fe6fd3ff9121862eb849107f3e9dd5e0b42b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 06:55:00 +0100 Subject: [PATCH 19/35] gnome3.gnome_desktop: fix sandboxing --- .../core/gnome-desktop/bubblewrap-paths.patch | 19 +++++++++++++++++++ .../gnome-3/core/gnome-desktop/default.nix | 13 +++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch new file mode 100644 index 00000000000..ee9b012b6e4 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -0,0 +1,19 @@ +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -504,14 +504,10 @@ + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, +- "bwrap", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/lib", "/lib", +- "--ro-bind", "/lib64", "/lib64", ++ "@BUBBLEWRAP_BIN@", ++ "--ro-bind", "/nix/store", "/nix/store", + "--proc", "/proc", + "--dev", "/dev", +- "--symlink", "usr/bin", "/bin", +- "--symlink", "usr/sbin", "/sbin", + "--chdir", "/", + "--setenv", "GIO_USE_VFS", "local", + "--unshare-all", diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 27b6413e16e..68ec28e93b6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib , intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, libseccomp, gobjectIntrospection }: +, libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -13,12 +13,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection ]; - buildInputs = [ python libxml2Python libX11 + buildInputs = [ python libxml2Python libX11 bubblewrap xkeyboard_config isocodes wayland gtk3 glib libxkbfile libseccomp ]; propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + patches = [ + ./bubblewrap-paths.patch + ]; + + postPatch = '' + substituteInPlace libgnome-desktop/gnome-desktop-thumbnail-script.c --subst-var-by \ + BUBBLEWRAP_BIN "${bubblewrap}/bin/bwrap" + ''; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; From e53ebf3a31e1e510bcb786a53250ddb8ede90b7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2017 06:56:33 +0100 Subject: [PATCH 20/35] gnome3.cheese: add thumbnailers Without thumbnailers available, cheese loops endlessly. https://github.com/NixOS/nixpkgs/issues/15790 --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 63e13debd47..e94a89c7f27 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib , libxslt, yelp_tools, gnome_common, gtk_doc -, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: +, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gnome-video-effects}/share" # vp8enc preset --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # Thumbnailers + --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" + --prefix XDG_DATA_DIRS : "${totem}/share" ) ''; From 2dca1a6d6e7c41ae8e46b33902ded2af709c3090 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Dec 2017 00:01:10 +0100 Subject: [PATCH 21/35] quiterss: 0.18.8 -> 0.18.9 --- pkgs/applications/networking/newsreaders/quiterss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 5ebd01f38c4..d527279ab77 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.8"; + version = "0.18.9"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "09mdxpv04zycrip1p5w6947348xfraicijddvxsr7d498r59b7ff"; + sha256 = "0n2rgzyxw6m29i8m8agri3cp5dbpjblhhyklvxsyzmkksnsxpw58"; }; nativeBuildInputs = [ pkgconfig qmake ]; From 70d1c37f77530178ddf1863dd368c036bb3ded2e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Dec 2017 00:11:07 +0100 Subject: [PATCH 22/35] signing-party: 2.5 -> 2.6 --- pkgs/tools/security/signing-party/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index de70b27163a..3ec6abc3eb1 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -12,15 +12,14 @@ let GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader ]; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.5"; + version = "2.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2"; + sha256 = "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"; }; sourceRoot = "."; From 6ebb1354e639700ed9b7f9c18af1f3a09e947d3b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 21 Nov 2017 21:56:14 +0200 Subject: [PATCH 23/35] help2man: 1.47.4 -> 1.47.5 --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index ada2dd1a89a..6e341b577cf 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.4"; + name = "help2man-1.47.5"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; + sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw"; }; nativeBuildInputs = [ makeWrapper gettext LocaleGettext ]; From 27a77af62fea95fcfa27547401da9e62c101af8a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 21 Nov 2017 22:04:33 +0200 Subject: [PATCH 24/35] pam: 1.2.1 -> 1.3.0 --- pkgs/os-specific/linux/pam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 5189b84ff7e..3de7916bff6 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "linux-pam-${version}"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2"; - sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl"; + sha256 = "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4"; }; outputs = [ "out" "doc" "man" /* "modules" */ ]; From 2da5de5479362af578b6662b830534c84cfced62 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 21 Nov 2017 22:08:15 +0200 Subject: [PATCH 25/35] ncurses: 6.0-20170902 -> 6.0-20171125 --- pkgs/development/libraries/ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index b8c7ff2f07d..9aade8b9672 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = if abiVersion == "5" then "5.9" else "6.0-20170902"; + version = if abiVersion == "5" then "5.9" else "6.0-20171125"; name = "ncurses-${version}"; src = fetchurl (if abiVersion == "5" then { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; } else { url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"; - sha256 = "1cks4gsz4148jw6wpqia4w5jx7cfxr29g2kmpvp0ssmvwczh8dr4"; + sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; From 7cf9900b487c04a2d0abdb2a3dbeca1bacd651ed Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 30 Nov 2017 01:42:27 +0200 Subject: [PATCH 26/35] kexectools: 2.0.15 -> 2.0.16 --- pkgs/os-specific/linux/kexectools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 4a68160ce05..3c5a0694a5d 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "1rwl04y1mpb28yq5ynnk8j124dmhj5p8c4hcdn453sri2j37p6w9"; + sha256 = "043hasx5b9zk7r7dzx24z5wybg74dpmh0nyns6nrnb3mmm8k642v"; }; hardeningDisable = [ "format" "pic" "relro" ]; From e36e23acd57e0cd9b785166ed4f215b33683fd54 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 2 Dec 2017 18:31:44 +0200 Subject: [PATCH 27/35] git: 2.15.0 -> 2.15.1 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c0b67206900..3a258543330 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.15.0"; + version = "2.15.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h"; + sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r"; }; hardeningDisable = [ "format" ]; From ff1a8ba304e175274be051cc6db77dd8fe1974f6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 17 Oct 2017 22:42:14 -0400 Subject: [PATCH 28/35] libtool: Enable cross compilation --- pkgs/development/tools/misc/libtool/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 88a33bb5dcc..23cc2c87a51 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { name = "libtool-1.5.26"; - + src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w"; }; - - buildInputs = [m4 perl]; + + nativeBuildInputs = [m4]; + buildInputs = [perl]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! From 92d3c5689db07d05ff96d7c00f7452af0eb6fef6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 17 Oct 2017 23:35:31 -0400 Subject: [PATCH 29/35] libtasn1: Enable cross-compilation [dezgeg amended out a doCheck change] --- pkgs/development/libraries/libtasn1/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 7fa53fe162b..ccdc3aba611 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ perl texinfo ]; + nativeBuildInputs = [ texinfo ]; + buildInputs = [ perl ]; doCheck = true; From dc10c551eba9c3ca2fc1abfb39fd3c94487d29ee Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Oct 2017 17:02:14 -0400 Subject: [PATCH 30/35] lvm2: Enable cross-compilation --- pkgs/os-specific/linux/lvm2/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index e6d5c10341b..310ce51936c 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation { "--enable-pkgconfig" "--enable-applib" "--enable-cmdlib" - ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; + ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd" + ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libudev libuuid thin-provisioning-tools ]; From 080164905c75446319f24def2231d7ea877eb073 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 12:23:11 -0400 Subject: [PATCH 31/35] docbook_xml_dtd_*: unzip is a nativeBuildInput [dezgeg resolved a merge conflict] Conflicts: pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix --- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 373778d43de..7c3db50010c 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -5,8 +5,8 @@ assert unzip != null; stdenv.mkDerivation { inherit src name postInstall; builder = ./builder.sh; - buildInputs = [unzip]; - propagatedBuildInputs = [ findXMLCatalogs ]; + nativeBuildInputs = [unzip]; + propagatedNativeBuildInputs = [ findXMLCatalogs ]; meta = meta // { platforms = stdenv.lib.platforms.unix; From ec405a15796aa66428f0c4344cf9ecec5bc6135c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 29 Oct 2017 13:29:59 -0400 Subject: [PATCH 32/35] docbook_sgml_*: unzip is a nativeBuildInput --- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 4 ++-- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index b7ab83aa577..cc71e002632 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let +let src = fetchurl { url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip; @@ -19,7 +19,7 @@ stdenv.mkDerivation { unpackPhase = "true"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 424a44c1bc7..dc7ebf5959d 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -let +let src = fetchurl { url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip; @@ -19,7 +19,7 @@ stdenv.mkDerivation { unpackPhase = "true"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' From aeed0a9d175d97afddc033f791f54e2468097295 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Nov 2017 20:34:00 +0200 Subject: [PATCH 33/35] docbook5: unzip is a nativeBuildInput --- pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a9d09945d7f..640659a6108 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' From f24d1b7c2cc75950441ecafce48b5f0083b25ed6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Nov 2017 20:34:19 +0200 Subject: [PATCH 34/35] xhtml1: libxml2 is a nativeBuildInput --- pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index f1cad801cdf..54ef5225d2f 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl"; }; - buildInputs = [ libxml2 ]; + nativeBuildInputs = [ libxml2 ]; installPhase = '' From a506d0ac66901e67cac90fe7fdc29564a8518ce2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Nov 2017 20:53:13 +0200 Subject: [PATCH 35/35] docbook_xsl_*: Remove builder.sh --- .../schemas/xml-dtd/docbook-ebnf/builder.sh | 6 ------ .../schemas/xml-dtd/docbook-ebnf/default.nix | 14 +++++++++++--- .../sgml+xml/schemas/xml-dtd/docbook/builder.sh | 7 ------- .../sgml+xml/schemas/xml-dtd/docbook/generic.nix | 15 ++++++++++++--- 4 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh delete mode 100644 pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh deleted file mode 100644 index 939305d486a..00000000000 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/xml/dtd/docbook-ebnf -cd $out/xml/dtd/docbook-ebnf -cp -p $dtd dbebnf.dtd -cp -p $catalog $(stripHash $catalog) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index e9ff03f7843..bc51ceeca43 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,16 +1,24 @@ {stdenv, fetchurl, unzip}: -assert unzip != null; - stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; - builder = ./builder.sh; + dtd = fetchurl { url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; + unpackPhase = '' + mkdir -p $out/xml/dtd/docbook-ebnf + cd $out/xml/dtd/docbook-ebnf + ''; + + installPhase = '' + cp -p $dtd dbebnf.dtd + cp -p $catalog $(stripHash $catalog) + ''; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh deleted file mode 100644 index 8b52ebd70b4..00000000000 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/xml/dtd/docbook -cd $out/xml/dtd/docbook -unpackFile $src -find . -type f -exec chmod -x {} \; -eval "$postInstall" diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 7c3db50010c..10b76f7b2b5 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,13 +1,22 @@ { stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: -assert unzip != null; - stdenv.mkDerivation { inherit src name postInstall; - builder = ./builder.sh; + nativeBuildInputs = [unzip]; propagatedNativeBuildInputs = [ findXMLCatalogs ]; + unpackPhase = '' + mkdir -p $out/xml/dtd/docbook + cd $out/xml/dtd/docbook + unpackFile $src + ''; + + installPhase = '' + find . -type f -exec chmod -x {} \; + runHook postInstall + ''; + meta = meta // { platforms = stdenv.lib.platforms.unix; };