diff options
Diffstat (limited to 'pkgs')
69 files changed, 1972 insertions, 1144 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 45054764a10e..3e9a2d380e27 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.0"; + version = "3.0.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "0p7wi1srfzalb0rl94vqppfbnxdfwqzgg5blkdwkf4sx977aihpv"; + sha256 = "0k25p1j4kgnhm7p90qp1cz79xddgi6nh1nx1y5wz42x8qrpxya0s"; }; runtimeDependencies = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index ca3dac34dca5..9f7fbc8421ba 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,10 +1,33 @@ -{ stdenv, fetchFromGitHub, qt5, libsForQt5 -, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig -, double-conversion, lib3mf, libzip +{ stdenv +, fetchFromGitHub +, qtbase +, qtmultimedia +, qscintilla +, bison +, flex +, eigen +, boost +, libGLU_combined +, glew +, opencsg +, cgal +, mpfr +, gmp +, glib +, pkgconfig +, harfbuzz +, gettext +, freetype +, fontconfig +, double-conversion +, lib3mf +, libzip +, mkDerivation +, qtmacextras +, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "openscad"; version = "2019.05"; @@ -15,14 +38,14 @@ stdenv.mkDerivation rec { sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig gettext qt5.qmake ]; + nativeBuildInputs = [ bison flex pkgconfig gettext qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig + qtbase qtmultimedia qscintilla ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined - ++ (with qt5; [qtbase qtmultimedia] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) - ++ (with libsForQt5; [qscintilla]) + ++ stdenv.lib.optional stdenv.isDarwin qtmacextras ; qmakeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index b5fa1ccc2f41..31c9fb4e7c3f 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonApplication, fetchurl, pythonOlder +{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder , pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig }: buildPythonApplication rec { - name = "poezio-${version}"; - version = "0.12"; + pname = "poezio"; + version = "0.12.1"; disabled = pythonOlder "3.4"; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi ]; nativeBuildInputs = [ pkgconfig ]; - src = fetchurl { - url = "http://dev.louiz.org/attachments/download/129/${name}.tar.gz"; - sha256 = "11n9x82xyjwbqk28lsfnvqwn8qc9flv6w2c64camh6j3148ykpvz"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "04qnsr0l12i55k6xl4q4akx317gai9wv5f1wpkfkq01wp181i5ll"; }; checkPhase = '' - py.test + pytest ''; meta = with lib; { diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix new file mode 100644 index 000000000000..9b475b04511d --- /dev/null +++ b/pkgs/applications/radio/dablin/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, mpg123, SDL2, gnome3, faad2, pcre +} : + +stdenv.mkDerivation rec { + pname = "dablin"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "Opendigitalradio"; + repo = "dablin"; + rev = "${version}"; + sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ]; + + meta = with stdenv.lib; { + description = "Play DAB/DAB+ from ETI-NI aligned stream"; + homepage = https://github.com/Opendigitalradio/dablin; + license = with licenses; [ gpl3 lgpl21 ]; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix new file mode 100644 index 000000000000..c9dbc59323ef --- /dev/null +++ b/pkgs/applications/radio/dabtools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libusb1, rtl-sdr, fftw +} : + +stdenv.mkDerivation rec { + pname = "dabtools"; + version = "20180405"; + + src = fetchFromGitHub { + owner = "Opendigitalradio"; + repo = "dabtools"; + rev = "8b0b2258b02020d314efd4d0d33a56c8097de0d1"; + sha256 = "18nkdybgg2w6zh56g6xwmg49sifalvraz4rynw8w5d8cqi3dm9sm"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ rtl-sdr fftw libusb1 ]; + + meta = with stdenv.lib; { + description = "Commandline tools for DAB and DAB+ digital radio broadcasts"; + homepage = "https://github.com/Opendigitalradio/dabtools"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index e81002193589..bcffb8585b31 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -16,7 +16,7 @@ postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; - buildInputs = [ fontconfig libjpeg libcap freetype ] + buildInputs = [ fontconfig libjpeg libcap freetype perl ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBidi fribidi; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e9fc0b4feda3..8979e9790b4e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -9,7 +9,7 @@ , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , onlyLibVLC ? false -, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null +, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null, wrapQtAppsHook ? null , jackSupport ? false , removeReferencesTo , chromecastSupport ? true, protobuf, libmicrodns @@ -21,7 +21,7 @@ with stdenv.lib; -assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); +assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); stdenv.mkDerivation rec { name = "vlc-${version}"; @@ -49,7 +49,8 @@ stdenv.mkDerivation rec { ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ protobuf libmicrodns ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ] + ++ optionals withQt5 [ wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index b07365a5ca11..8d264f3062cd 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.3.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3"; + sha256 = "13qgrvqawrrz4apdcds4amkljyjzx056545962wk8p0d291hqv5a"; }; goPackagePath = "github.com/containers/libpod"; @@ -39,7 +39,7 @@ buildGoPackage rec { homepage = https://podman.io/; description = "A program for managing pods, containers and container images"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester ]; + maintainers = with maintainers; [ vdemeester saschagrunert ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 7cb423123dc6..8fd85aaeb862 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "17cfvbrvzwwr9r72xgpn144k45xavzi0hnl2qqp9lhxflvirac0c"; + sha256 = "1vc4pdm4fwb5gz7hyzwvjqkx5087f0vrw11898nq1s7kxzl2lhbx"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 734d70598fb0..308d55085420 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "02gvlxv6ylx4mdkf59crm2zyahiz1zd4cr5zz29dnhx7r7738i9a"; + sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "1r2wczfkdpvjc7iylwajkminraaz1ix6n724in0dvv5klfcdxlxb"; + cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 762a61b8a579..306b70419ed1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -14,6 +14,7 @@ , cargoDepsHook ? "" , cargoBuildFlags ? [] , buildType ? "release" +, meta ? {} , cargoVendorDir ? null , ... } @ args: @@ -147,4 +148,9 @@ in stdenv.mkDerivation (args // { ''; passthru = { inherit cargoDeps; } // (args.passthru or {}); + + meta = { + # default to Rust's platforms + platforms = rustc.meta.platforms; + } // meta; }) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index a819361f4d45..fbb991d7b5ab 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -56,7 +56,7 @@ let */ elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test; elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples; - elm-analyse = elmNodePackages."elm-analyse-0.16.3"; + elm-analyse = elmNodePackages.elm-analyse; inherit (elmNodePackages) elm-doc-preview elm-upgrade; }; in elmPkgs // { diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 1039eb51fe27..fa0a1482f97a 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix index 720e0cc08503..670556bf271a 100644 --- a/pkgs/development/compilers/elm/packages/node-env.nix +++ b/pkgs/development/compilers/elm/packages/node-env.nix @@ -11,7 +11,7 @@ let cat > $out/bin/tar <<EOF #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore EOF chmod +x $out/bin/tar @@ -72,7 +72,7 @@ let packageDir="$(find . -maxdepth 1 -type d | tail -1)" # Restore write permissions to make building work - find "$packageDir" -type d -print0 | xargs -0 chmod u+x + find "$packageDir" -type d -exec chmod u+x {} \; chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder @@ -219,7 +219,16 @@ let packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. } - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); } @@ -308,6 +317,61 @@ let ''; }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "$dontNpmInstall" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + # Builds and composes an NPM package including all its dependencies buildNodePackage = { name @@ -319,6 +383,7 @@ let , npmFlags ? "" , dontNpmInstall ? false , bypassCache ? false + , reconstructLock ? false , preRebuild ? "" , dontStrip ? true , unpackPhase ? "true" @@ -326,11 +391,10 @@ let , ... }@args: let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in stdenv.mkDerivation ({ - name = "node-${name}-${version}"; + name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool @@ -352,47 +416,7 @@ let # Compose the package and all its dependencies source $compositionScriptPath - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${stdenv.lib.optionalString bypassCache '' - if [ ! -f package-lock.json ] - then - echo "No package-lock.json file found, reconstructing..." - node ${reconstructPackageLock} - fi - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - if [ "$dontNpmInstall" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - fi + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Create symlink to the deployed executable folder, if applicable if [ -d "$out/lib/node_modules/.bin" ] @@ -431,14 +455,13 @@ let , npmFlags ? "" , dontNpmInstall ? false , bypassCache ? false + , reconstructLock ? false , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" , ... }@args: let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; nodeDependencies = stdenv.mkDerivation ({ @@ -473,39 +496,13 @@ let fi ''} - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." + # Go to the parent folder to make sure that all packages are pinpointed cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - source $pinpointDependenciesScriptPath - cd ${packageName} - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - export HOME=$PWD - - ${stdenv.lib.optionalString bypassCache '' - if [ ! -f package-lock.json ] - then - echo "No package-lock.json file found, reconstructing..." - node ${reconstructPackageLock} - fi - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - - ${stdenv.lib.optionalString (!dontNpmInstall) '' - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - ''} + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + # Expose the executables that were installed cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -532,6 +529,7 @@ let inherit nodeDependencies; shellHook = stdenv.lib.optionalString (dependencies != []) '' export NODE_PATH=$nodeDependencies/lib/node_modules + export PATH="$nodeDependencies/bin:$PATH" ''; }; in diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index a0dff6fcdfee..49edf6896946 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -2,6 +2,6 @@ "elm-test", "elm-verify-examples", "elm-doc-preview", - { "elm-analyse": "0.16.3" }, + "elm-analyse", "elm-upgrade" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 89753176f976..c6cc1cbf247a 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! +# This file has been generated by node2nix 1.7.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,13 +13,22 @@ let sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; }; }; - "@sindresorhus/is-0.7.0" = { + "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "0.7.0"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; "accepts-1.3.7" = { @@ -31,13 +40,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.10.0" = { + "ajv-6.10.1" = { name = "ajv"; packageName = "ajv"; - version = "6.10.0"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; - sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.1.tgz"; + sha512 = "w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ=="; }; }; "ansi-regex-2.1.1" = { @@ -319,13 +328,13 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; - "bser-2.0.0" = { + "bser-2.1.0" = { name = "bser"; packageName = "bser"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz"; - sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719"; + url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz"; + sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg=="; }; }; "buffers-0.1.1" = { @@ -364,13 +373,13 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; - "cacheable-request-2.1.4" = { + "cacheable-request-6.1.0" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "2.1.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; "camelcase-4.1.0" = { @@ -454,13 +463,13 @@ let sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; - "chownr-1.1.1" = { + "chownr-1.1.2" = { name = "chownr"; packageName = "chownr"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; - sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; + sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; }; }; "class-utils-0.3.6" = { @@ -751,6 +760,15 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; + "defer-to-connect-1.0.2" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz"; + sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="; + }; + }; "define-property-0.2.5" = { name = "define-property"; packageName = "define-property"; @@ -1192,15 +1210,6 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; - "from2-2.3.0" = { - name = "from2"; - packageName = "from2"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; - }; - }; "fs-extra-0.30.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -1300,6 +1309,15 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; + "get-stream-5.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; @@ -1354,22 +1372,22 @@ let sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; - "got-8.3.2" = { + "got-9.6.0" = { name = "got"; packageName = "got"; - version = "8.3.2"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.1.15" = { + "graceful-fs-4.2.0" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.15"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz"; + sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="; }; }; "har-schema-2.0.0" = { @@ -1462,13 +1480,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "http-cache-semantics-3.8.1" = { + "http-cache-semantics-4.0.3" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "3.8.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; }; }; "http-errors-1.6.2" = { @@ -1543,6 +1561,15 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; "ini-1.3.5" = { name = "ini"; packageName = "ini"; @@ -1552,15 +1579,6 @@ let sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; - }; - }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -1732,15 +1750,6 @@ let sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; }; }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; - }; - }; "is-plain-object-2.0.4" = { name = "is-plain-object"; packageName = "is-plain-object"; @@ -1930,13 +1939,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "keyv-3.0.0" = { + "keyv-3.1.0" = { name = "keyv"; packageName = "keyv"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; "kind-of-3.2.2" = { @@ -1984,13 +1993,13 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "latest-version-4.0.0" = { + "latest-version-5.1.0" = { name = "latest-version"; packageName = "latest-version"; - version = "4.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-4.0.0.tgz"; - sha512 = "b4Myk7aQiQJvgssw2O8yITjELdqKRX4JQJUF1IUplgLaA8unv7s+UsAOwH6Q0/a09czSvlxEm306it2LBXrCzg=="; + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; "lcid-1.0.0" = { @@ -2020,22 +2029,22 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; - "lowercase-keys-1.0.0" = { + "lowercase-keys-1.0.1" = { name = "lowercase-keys"; packageName = "lowercase-keys"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; - "lowercase-keys-1.0.1" = { + "lowercase-keys-2.0.0" = { name = "lowercase-keys"; packageName = "lowercase-keys"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; "lru-cache-4.1.5" = { @@ -2218,13 +2227,13 @@ let sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; }; }; - "mixin-deep-1.3.1" = { + "mixin-deep-1.3.2" = { name = "mixin-deep"; packageName = "mixin-deep"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; - sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; "mkdirp-0.5.1" = { @@ -2353,13 +2362,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-url-2.0.1" = { + "normalize-url-4.3.0" = { name = "normalize-url"; packageName = "normalize-url"; - version = "2.0.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz"; + sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ=="; }; }; "npm-conf-1.1.3" = { @@ -2398,15 +2407,6 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; "object-copy-0.1.0" = { name = "object-copy"; packageName = "object-copy"; @@ -2497,13 +2497,13 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "p-cancelable-0.4.1" = { + "p-cancelable-1.1.0" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "0.4.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-finally-1.0.0" = { @@ -2515,15 +2515,6 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -2542,15 +2533,6 @@ let sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; }; - "p-timeout-2.0.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; - }; - }; "p-try-1.0.0" = { name = "p-try"; packageName = "p-try"; @@ -2560,13 +2542,13 @@ let sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; - "package-json-5.0.0" = { + "package-json-6.4.0" = { name = "package-json"; packageName = "package-json"; - version = "5.0.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz"; - sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; + url = "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz"; + sha512 = "bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q=="; }; }; "parseurl-1.3.3" = { @@ -2686,13 +2668,13 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "process-nextick-args-2.0.0" = { + "process-nextick-args-2.0.1" = { name = "process-nextick-args"; packageName = "process-nextick-args"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; - sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "proto-list-1.2.4" = { @@ -2722,13 +2704,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.1.32" = { + "psl-1.2.0" = { name = "psl"; packageName = "psl"; - version = "1.1.32"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; - sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; + url = "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz"; + sha512 = "GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="; }; }; "pump-3.0.0" = { @@ -2785,15 +2767,6 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "query-string-5.1.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; - sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; - }; - }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -2884,13 +2857,13 @@ let sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; - "registry-url-3.1.0" = { + "registry-url-5.1.0" = { name = "registry-url"; packageName = "registry-url"; - version = "3.1.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; "remove-trailing-separator-1.1.0" = { @@ -3037,6 +3010,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; "safe-regex-1.1.0" = { name = "safe-regex"; packageName = "safe-regex"; @@ -3082,6 +3064,15 @@ let sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; + "semver-6.2.0" = { + name = "semver"; + packageName = "semver"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz"; + sha512 = "jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A=="; + }; + }; "send-0.16.2" = { name = "send"; packageName = "send"; @@ -3127,22 +3118,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "set-value-0.4.3" = { + "set-value-2.0.1" = { name = "set-value"; packageName = "set-value"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - }; - "set-value-2.0.0" = { - name = "set-value"; - packageName = "set-value"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; - sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; "setprototypeof-1.0.3" = { @@ -3226,15 +3208,6 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; - }; - }; "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; @@ -3325,15 +3298,6 @@ let sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; }; }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -3496,13 +3460,13 @@ let sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; - "tmp-0.0.33" = { + "tmp-0.1.0" = { name = "tmp"; packageName = "tmp"; - version = "0.0.33"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; + sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; "tmpl-1.0.4" = { @@ -3523,6 +3487,15 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-regex-3.0.2" = { name = "to-regex"; packageName = "to-regex"; @@ -3631,13 +3604,13 @@ let sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; - "union-value-1.0.0" = { + "union-value-1.0.1" = { name = "union-value"; packageName = "union-value"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; }; "universalify-0.1.2" = { @@ -3865,13 +3838,13 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "ws-6.2.1" = { + "ws-7.1.0" = { name = "ws"; packageName = "ws"; - version = "6.2.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.1.0.tgz"; + sha512 = "Swie2C4fs7CkwlHu1glMePLYJJsWjzhl1vm3ZaLplD0h7OMkZyZ6kLTB/OagiU923bZrPFXuDTeEqaEN4NWG4g=="; }; }; "xmlbuilder-8.2.2" = { @@ -3883,13 +3856,13 @@ let sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; }; }; - "xtend-4.0.1" = { + "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-3.2.1" = { @@ -3958,7 +3931,7 @@ in sha512 = "Qdy9QusZF+eT0203XBiT1Y/UhFeUjcSuyyzf3iyp32dsYpAfcoDTWHjlBVjia1CyvFauESQ4pc81nKaq6snClg=="; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -4005,7 +3978,7 @@ in sources."fsevents-1.2.9" ]; }) - sources."chownr-1.1.1" + sources."chownr-1.1.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -4100,7 +4073,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.1.15" + sources."graceful-fs-4.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-2.0.0" @@ -4112,7 +4085,7 @@ in }) sources."http-signature-1.2.0" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -4156,7 +4129,7 @@ in ]; }) sources."minizlib-1.2.1" - sources."mixin-deep-1.3.1" + sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -4192,9 +4165,9 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."posix-character-classes-0.1.1" - sources."process-nextick-args-2.0.0" + sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.1.32" + sources."psl-1.2.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -4216,7 +4189,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."set-value-2.0.0" // { + (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" @@ -4303,11 +4276,9 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."union-value-1.0.0" // { + (sources."union-value-1.0.1" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" - sources."set-value-0.4.3" ]; }) (sources."unset-value-1.0.0" // { @@ -4341,17 +4312,18 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-3.1.0.tgz"; - sha512 = "zNjiwP8vR83caUDKXa+BK3S9wLxLy5DB/2qDfewI5OuEevv+QwZUh1sSZbhNtkgKYdL7pLFX0s+Sp5tvAbJoCQ=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-4.0.0.tgz"; + sha512 = "oKptkeUX0MBbYJ2Yn5CwaT502O8hwJHubNbeO7redshHnoaLzVvCK3TCS9+Vx1mXW8/GuJ6bfM+PDXXPPX8MNA=="; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { @@ -4400,7 +4372,7 @@ in sources."fsevents-1.2.9" ]; }) - sources."chownr-1.1.1" + sources."chownr-1.1.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -4518,7 +4490,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.1.15" + sources."graceful-fs-4.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -4530,7 +4502,7 @@ in }) sources."http-signature-1.2.0" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -4581,7 +4553,7 @@ in ]; }) sources."minizlib-1.2.1" - sources."mixin-deep-1.3.1" + sources."mixin-deep-1.3.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -4626,9 +4598,9 @@ in sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."posix-character-classes-0.1.1" - sources."process-nextick-args-2.0.0" + sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."psl-1.1.32" + sources."psl-1.2.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -4653,7 +4625,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."set-blocking-2.0.0" - (sources."set-value-2.0.0" // { + (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" @@ -4750,11 +4722,9 @@ in sources."traverse-0.3.9" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."union-value-1.0.0" // { + (sources."union-value-1.0.1" // { dependencies = [ - sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" - sources."set-value-0.4.3" ]; }) sources."universalify-0.1.2" @@ -4799,18 +4769,20 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-doc-preview = nodeEnv.buildNodePackage { name = "elm-doc-preview"; packageName = "elm-doc-preview"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-2.0.3.tgz"; - sha512 = "YQZTlFX/DdR2hjJC00nof1hMG4DNeSFbxf45GTVpedPRKZXIZDJI5zeXukGCwD7lPJZIm9gegjqJPXLCCghv8g=="; + url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-2.0.4.tgz"; + sha512 = "F6LlYWNs7BVQ9vLRHI6P/FDVf4hpNJPjHuL0sxGwC4KDcPEnjIwOC6jWxiUEC3226aYf/uY60qDDqzFNHgcPQg=="; }; dependencies = [ sources."@cnakazawa/watch-1.0.3" - sources."@sindresorhus/is-0.7.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" @@ -4822,23 +4794,26 @@ in sources."assign-symbols-1.0.0" sources."async-limiter-1.0.0" sources."atob-2.1.2" + sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" ]; }) sources."body-parser-1.19.0" + sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."bser-2.0.0" + sources."bser-2.1.0" sources."bytes-3.1.0" sources."cache-base-1.0.1" - (sources."cacheable-request-2.1.4" // { + (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."lowercase-keys-1.0.0" + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" ]; }) sources."capture-exit-2.0.0" @@ -4866,17 +4841,18 @@ in sources."color-name-1.1.3" sources."commander-2.20.0" sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."defer-to-connect-1.0.2" sources."define-property-2.0.2" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -4888,11 +4864,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."exec-sh-0.3.2" - (sources."execa-1.0.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) + sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -4939,25 +4911,24 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."from2-2.3.0" - sources."get-stream-3.0.0" + sources."fs.realpath-1.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" - sources."got-8.3.2" + sources."glob-7.1.4" + sources."got-9.6.0" sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."http-cache-semantics-3.8.1" + sources."http-cache-semantics-4.0.3" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" + sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."into-stream-3.1.0" sources."ipaddr.js-1.9.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" @@ -4969,20 +4940,16 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-object-1.0.1" - sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."isurl-1.0.0" sources."json-buffer-3.0.0" - sources."keyv-3.0.0" + sources."keyv-3.1.0" sources."kind-of-6.0.2" - sources."latest-version-4.0.0" + sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" sources."makeerror-1.0.11" sources."map-cache-0.2.2" @@ -4995,8 +4962,9 @@ in sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { + (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; @@ -5007,9 +4975,8 @@ in sources."nice-try-1.0.5" sources."node-int64-0.4.0" sources."normalize-path-2.1.1" - sources."normalize-url-2.0.1" + sources."normalize-url-4.3.0" sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -5027,37 +4994,36 @@ in sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-0.4.1" + sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-timeout-2.0.1" - sources."package-json-5.0.0" + (sources."package-json-6.4.0" // { + dependencies = [ + sources."semver-6.2.0" + ]; + }) sources."parseurl-1.3.3" sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-to-regexp-0.1.7" - sources."pify-3.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.5" sources."pump-3.0.0" sources."qs-6.7.0" - sources."query-string-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readable-stream-2.3.6" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."ret-0.1.15" + sources."rimraf-2.6.3" sources."rsvp-4.8.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -5070,7 +5036,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."set-value-2.0.0" // { + (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; @@ -5107,7 +5073,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."sort-keys-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -5130,29 +5095,22 @@ in ]; }) sources."statuses-1.5.0" - sources."strict-uri-encode-1.1.0" - sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" + sources."tmp-0.1.0" sources."tmpl-1.0.4" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) + sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - (sources."union-value-1.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."set-value-0.4.3" - ]; - }) + sources."union-value-1.0.1" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -5166,15 +5124,13 @@ in }) sources."urix-0.1.0" sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" sources."use-3.1.1" - sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."walker-1.0.7" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-7.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -5184,18 +5140,19 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; - "elm-analyse-0.16.3" = nodeEnv.buildNodePackage { + elm-analyse = nodeEnv.buildNodePackage { name = "elm-analyse"; packageName = "elm-analyse"; - version = "0.16.3"; + version = "0.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.3.tgz"; - sha512 = "JFlGT0d6v3EPk1UnB5xb6VYWrKzwGD76wBwr2R0xwA3T6Rju7zEnzfs8LiBo+b3gSH5cmRDfnK9BLRFiosWEfQ=="; + url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.4.tgz"; + sha512 = "6F6JfcOfbRgTBJj7MF+CqGcatCep8ppZtfIAri+fpC76MsSohJAOfLgmbmd4BWOXcTiWCpvQaaFwUutm7cOlpA=="; }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.10.0" + sources."ajv-6.10.1" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -5244,7 +5201,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.15" + sources."graceful-fs-4.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.6.3" @@ -5285,7 +5242,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.5" - sources."psl-1.1.32" + sources."psl-1.2.0" sources."punycode-2.1.1" sources."qs-6.5.1" sources."range-parser-1.2.1" @@ -5301,7 +5258,7 @@ in (sources."request-2.88.0" // { dependencies = [ sources."qs-6.5.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" ]; }) sources."safe-buffer-5.1.1" @@ -5338,7 +5295,7 @@ in sources."ultron-1.1.1" ]; }) - sources."xtend-4.0.1" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -5347,6 +5304,7 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; elm-upgrade = nodeEnv.buildNodePackage { name = "elm-upgrade"; @@ -5373,11 +5331,11 @@ in sources."get-stream-3.0.0" sources."glob-7.1.4" sources."got-6.7.1" - sources."graceful-fs-4.1.15" + sources."graceful-fs-4.2.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ini-1.3.5" sources."is-object-1.0.1" sources."is-redirect-1.0.0" @@ -5397,7 +5355,7 @@ in sources."prepend-http-1.0.4" sources."proto-list-1.2.4" sources."rimraf-2.6.3" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safename-1.0.2" sources."semver-5.7.0" sources."syncprompt-2.0.0" @@ -5418,5 +5376,6 @@ in }; production = true; bypassCache = true; + reconstructLock = true; }; } \ No newline at end of file diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 77d8710cdf93..4228c368e566 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,12 +4,12 @@ boehmgc, sfml, tzdata, coreutils, sqlite }: stdenv.mkDerivation rec { - name = "nim-${version}"; - version = "0.20.0"; + pname = "nim"; + version = "0.20.2"; src = fetchurl { - url = "https://nim-lang.org/download/${name}.tar.xz"; - sha256 = "144sd7icg2p6qsrr29jdnl11hr34daxq4h16ywwrayz866w7kx2i"; + url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; + sha256 = "0pibil10x0c181kw705phlwk8bn8dy5ghqd9h9fm6i9afrz5ryp1"; }; doCheck = !stdenv.isDarwin; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Statically typed, imperative programming language"; - homepage = https://nim-lang.org/; + homepage = "https://nim-lang.org/"; license = licenses.mit; maintainers = with maintainers; [ ehmry peterhoeg ]; platforms = with platforms; linux ++ darwin; # arbitrary diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index cd98aa1fa9a6..55fda78b03e3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -7,6 +7,9 @@ , passthru ? {} , patches ? [] +# A function to override the go-modules derivation +, overrideModAttrs ? (_oldAttrs : {}) + # modSha256 is the sha256 of the vendored dependencies , modSha256 @@ -27,13 +30,13 @@ with builtins; let - args = removeAttrs args' [ "modSha256" "disabled" ]; + args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; removeReferences = [ ] ++ lib.optional (!allowGoReference) go; removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - go-modules = go.stdenv.mkDerivation { + go-modules = go.stdenv.mkDerivation (let modArgs = { name = "${name}-go-modules"; nativeBuildInputs = [ go git cacert ]; @@ -79,7 +82,7 @@ let outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = modSha256; - }; + }; in modArgs // overrideModAttrs modArgs); package = go.stdenv.mkDerivation (args // { nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 91994a5cfbae..48cfa098c9fa 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , pkgconfig , meson , ninja @@ -31,6 +32,21 @@ stdenv.mkDerivation rec { patches = [ ./installed-tests-path.patch + (fetchpatch { + # Meson fixes + url = "https://gitlab.gnome.org/GNOME/libgdata/commit/f6d0e3f3b6fa8e8ee9569372c5709c1fb84af2c1.diff"; + sha256 = "00yrppn0s21i41r9mwzvrrv7j5dida09kh7i44kv8hrbrlfag7bm"; + }) + (fetchpatch { + # Meson minor fixes + url = "https://gitlab.gnome.org/GNOME/libgdata/commit/b653f602b3c2b518101c5d909e1651534c22757a.diff"; + sha256 = "1bn0rffsvkzjl59aw8dmq1wil58x1fshz0m6xabpn79ffvbjld8j"; + }) + (fetchpatch { + # Meson: Fix G_LOG_DOMAIN + url = "https://gitlab.gnome.org/GNOME/libgdata/commit/5d318e0bf905d0f1a8b3fe1e47ee7847739082e3.diff"; + sha256 = "11i2blq811d53433kdq4hhsscgkrq5f50d9ih4ixgs3j47hg7b1w"; + }) ]; nativeBuildInputs = [ @@ -45,7 +61,6 @@ stdenv.mkDerivation rec { buildInputs = [ gcr glib - gnome3.gnome-online-accounts liboauth libsoup libxml2 @@ -55,6 +70,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ + gnome3.gnome-online-accounts json-glib ]; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 186e154597f2..1fbf7b57289f 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -60,6 +60,7 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch + ./qtwebengine-CVE-2019-5786.patch ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index a4d2fc82ff2d..aa3a0fe94898 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch index 118ffaa511e3..aa987acbe92e 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -1,7 +1,8 @@ -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/common/mac.conf 2019-07-10 09:35:08.917628566 -0500 -@@ -24,7 +24,7 @@ +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ QMAKE_FIX_RPATH = install_name_tool -id @@ -10,10 +11,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/common/mac.conf qtbase-everywhe QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/create_cmake.prf 2019-07-10 09:35:08.917628566 -0500 -@@ -21,7 +21,7 @@ +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 2ed708e085..05e60ff45f 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -22,7 +24,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbas contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ +@@ -51,45 +51,20 @@ split_incpath { $$cmake_extra_source_includes.output } @@ -79,7 +81,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbas static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ +@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -88,7 +90,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbas INSTALLS += cmake_qt5_plugin_file return() -@@ -318,7 +293,7 @@ +@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -97,10 +99,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/create_cmake.prf qtbas # 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 -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-07-10 09:35:08.917628566 -0500 -@@ -3,30 +3,6 @@ +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 3ed6dd5889..4c7c8da21a 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -131,7 +134,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ +@@ -52,11 +28,7 @@ endmacro() macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -143,7 +146,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ +@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -155,7 +158,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ +@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -184,7 +187,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ +@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -192,7 +195,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -272,25 +228,13 @@ +@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -218,7 +221,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -309,25 +253,13 @@ +@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -244,7 +247,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -346,11 +278,7 @@ +@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -256,17 +259,19 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/data/cmake/Qt5BasicCon _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_post.prf 2019-07-10 09:35:08.917628566 -0500 -@@ -64,202 +64,6 @@ +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index 99f68b78f5..dde69cb7c2 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -63,199 +63,3 @@ qt { + } } } - +- -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { -- QMAKE_RPATHDIR += @executable_path/../Frameworks +- QMAKE_RPATHDIR += @executable_path/Frameworks - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks -} - @@ -458,13 +463,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_post.prf q - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) - generate_xcode_project.target = xcodeproj -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/default_pre.prf 2019-07-10 09:35:08.917628566 -0500 +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -526,10 +528,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/default_pre.prf qt -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/mac/sdk.prf 2019-07-10 09:35:08.917628566 -0500 -@@ -1,54 +1 @@ +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +index 8360dd8b38..8b13789179 100644 +--- a/mkspecs/features/mac/sdk.prf ++++ b/mkspecs/features/mac/sdk.prf +@@ -1,58 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") @@ -565,6 +568,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-eve -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) - +-sysrootified = +-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +-QMAKE_INCDIR_OPENGL = $$sysrootified +- -QMAKESPEC_NAME = $$basename(QMAKESPEC) - -# Resolve SDK version of various tools @@ -584,34 +591,37 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/mac/sdk.prf qtbase-eve - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_module.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_module.prf 2019-07-10 09:35:08.917628566 -0500 -@@ -54,7 +54,7 @@ - - qmldir.files = $$qmldir_file +diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf +index 65212b2abf..accd4c07f0 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_ + # Tools need qmldir and plugins.qmltypes always installed on the file system + qmldir.files = $$qmldir_file $$fq_aux_qml_files install_qml_files: qmldir.files += $$fq_qml_files --qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH +-qmldir.path = $$instbase/$$TARGETPATH +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += qmldir - qmlfiles.base = $$_PRO_FILE_PWD_ -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qml_plugin.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qml_plugin.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -50,7 +50,7 @@ - - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + !debug_and_release|!build_all|CONFIG(release, debug|release) { +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index cd6377dcc6..e98bf98151 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -56,7 +56,7 @@ qml1_target { + instbase = $$[QT_INSTALL_QML] + } --target.path = $$[QT_INSTALL_QML]/$$TARGETPATH +-target.path = $$instbase/$$TARGETPATH +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH INSTALLS += target # Some final setup -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_app.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -30,7 +30,7 @@ +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -620,10 +630,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_app.prf qtbase-ever CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_build_paths.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -24,6 +24,6 @@ +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -632,10 +643,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_build_paths.prf qtb + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_common.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -34,8 +34,8 @@ +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 4ad9946ae0..6d66f29c26 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) { qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -646,10 +658,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_common.prf qtbase-e } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_docs.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -45,7 +45,7 @@ +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 3139c443c6..1b4f2fddd8 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -658,7 +671,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-eve PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ +@@ -64,8 +64,8 @@ DOC_INDEXES = DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -669,7 +682,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-eve } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ +@@ -88,12 +88,12 @@ prepare_docs { qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -684,10 +697,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_docs.prf qtbase-eve inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_example_installs.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -88,7 +88,7 @@ +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 43b58817fe..e635b8f67a 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -88,7 +88,7 @@ sourcefiles += \ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -696,10 +710,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_example_installs.pr INSTALLS += sources check_examples { -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_functions.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -69,7 +69,7 @@ +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 1903e509c8..ae7b585989 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -708,9 +723,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_functions.prf qtbas exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_installs.prf 2019-07-10 09:35:08.918628595 -0500 +diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf +index 8f98987b99..21b3bb8b32 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -730,7 +746,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase !static: target.CONFIG = no_dll INSTALLS += target } -@@ -29,35 +23,35 @@ +@@ -29,33 +23,33 @@ #headers qt_install_headers { gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES @@ -746,8 +762,6 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private - generated_privates: \ - private_headers.CONFIG += no_check_exist INSTALLS += private_headers qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES @@ -772,10 +786,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_installs.prf qtbase privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf ---- qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/mkspecs/features/qt_plugin.prf 2019-07-10 09:35:08.918628595 -0500 -@@ -88,7 +88,7 @@ +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 40528a65e2..903f795284 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { } } @@ -784,63 +799,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/mkspecs/features/qt_plugin.prf qtbase-e INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp ---- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcoreapplication.cpp 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcoreapplication.cpp 2019-07-10 09:35:08.919628625 -0500 -@@ -2668,6 +2668,15 @@ - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); -diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h ---- qtbase-everywhere-src-5.12.3-a/src/corelib/kernel/qcore_mac_p.h 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/corelib/kernel/qcore_mac_p.h 2019-07-10 09:35:08.920628655 -0500 -@@ -212,7 +212,7 @@ - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include <os/activity.h> -@@ -290,7 +290,19 @@ - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -Only in qtbase-everywhere-src-5.12.3-b/src/corelib/kernel: qcore_mac_p.h.orig -diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in ---- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-07-10 09:35:08.918628595 -0500 -@@ -3,7 +3,7 @@ +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index e0652fdcf9..450b2a2d28 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) add_executable(Qt5::qmake IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -849,7 +812,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.i !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -18,7 +18,7 @@ +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) add_executable(Qt5::moc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -858,7 +821,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.i !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -35,7 +35,7 @@ +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) add_executable(Qt5::rcc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -867,7 +830,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.i !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -116,7 +116,7 @@ +@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) !!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -876,7 +839,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.i !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") !!ENDIF -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -885,9 +848,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtras.cmake.i !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ---- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-07-10 09:35:08.918628595 -0500 +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) @@ -896,9 +860,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDi !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ---- qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-07-10 09:35:08.918628595 -0500 +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) @@ -907,10 +872,31 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/Qt5CoreConfigExtrasMkspecDi !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp ---- qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-07-10 09:35:08.919628625 -0500 -@@ -70,7 +70,11 @@ +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 463e30e1c3..0e1ab669e4 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths() + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + 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 bed62a02bd..73158993f7 100644 +--- a/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -923,7 +909,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.c if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ +@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -945,9 +931,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/corelib/tools/qtimezoneprivate_tz.c } } -diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in ---- qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d947159e2..b36865fc48 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -961,7 +948,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in q _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ +@@ -17,11 +13,7 @@ endif() if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -974,9 +961,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/dbus/Qt5DBusConfigExtras.cmake.in q _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in ---- qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/gui/Qt5GuiConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..fb4183bada 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -986,7 +974,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtb !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -1002,10 +990,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/gui/Qt5GuiConfigExtras.cmake.in qtb !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ---- qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-07-10 09:35:08.919628625 -0500 -@@ -265,12 +265,9 @@ +diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +index b5a0a5bbeb..6c20305f4d 100644 +--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1019,10 +1008,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforminputcontexts/compo } QString TableGenerator::findComposeFile() -diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp ---- qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-07-10 09:35:08.919628625 -0500 -@@ -317,10 +317,10 @@ +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index 57629ac03a..8a7f219a98 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1035,10 +1025,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platforms/xcb/qxcbcursor.cp xcursorFound = xcursorLib.load(); } if (xcursorFound) { -Only in qtbase-everywhere-src-5.12.3-b/src/plugins/platforms/xcb: qxcbcursor.cpp.orig -diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp ---- qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cpp 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/plugins/platformthemes/gtk3/main.cpp 2019-07-10 09:35:08.919628625 -0500 +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index fb1c425d8e..bb8bab9795 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp @@ -39,6 +39,7 @@ #include <qpa/qplatformthemeplugin.h> @@ -1047,7 +1037,7 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cp QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ +@@ -54,8 +55,22 @@ public: QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1071,21 +1061,10 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/plugins/platformthemes/gtk3/main.cp return 0; } -diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp ---- qtbase-everywhere-src-5.12.3-a/src/testlib/qappletestlogger.cpp 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/testlib/qappletestlogger.cpp 2019-07-10 09:35:08.920628655 -0500 -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h ---- qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/testlib/qtestassert.h 2019-07-10 09:35:08.919628625 -0500 +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1102,10 +1081,11 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/testlib/qtestassert.h qtbase-everyw QT_END_NAMESPACE -diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in ---- qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-04-09 04:51:26.000000000 -0500 -+++ qtbase-everywhere-src-5.12.3-b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-07-10 09:35:08.919628625 -0500 -@@ -3,7 +3,7 @@ +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2e46..a4eab2aa72 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -1114,3 +1094,63 @@ diff -aur qtbase-everywhere-src-5.12.3-a/src/widgets/Qt5WidgetsConfigExtras.cmak !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF +diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h +index b14a494296..779c4eda95 100644 +--- a/src/corelib/kernel/qcore_mac_p.h ++++ b/src/corelib/kernel/qcore_mac_p.h +@@ -211,7 +211,7 @@ private: + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include <os/activity.h> +@@ -289,7 +289,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp +index 2c1005ad80..244147ea7d 100644 +--- a/src/testlib/qappletestlogger.cpp ++++ b/src/testlib/qappletestlogger.cpp +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp +index 1268730cc6..a50e9b0764 100644 +--- a/src/testlib/qtestlog.cpp ++++ b/src/testlib/qtestlog.cpp +@@ -524,7 +524,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) + #endif + } + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + // Logger that also feeds messages to AUL. It needs to wrap the existing + // logger, as it needs to be able to short circuit the existing logger + // in case AUL prints to stderr. diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch new file mode 100644 index 000000000000..ec9a432ea708 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch @@ -0,0 +1,26 @@ +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc +@@ -135,14 +135,16 @@ + if (!raw_data_ || error_code_) + return nullptr; + +- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); +- if (finished_loading_) { +- array_buffer_result_ = result; +- AdjustReportedMemoryUsageToV8( +- -1 * static_cast<int64_t>(raw_data_->ByteLength())); +- raw_data_.reset(); ++ if (!finished_loading_) { ++ return DOMArrayBuffer::Create( ++ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); + } +- return result; ++ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); ++ AdjustReportedMemoryUsageToV8(-1 * ++ static_cast<int64_t>(raw_data_->ByteLength())); ++ ++ raw_data_.reset(); ++ return array_buffer_result_; + } + + String FileReaderLoader::StringResult() { diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix index ce567c3a2bcd..d83edc97e94f 100644 --- a/pkgs/development/libraries/qt-5/5.12/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz"; - sha256 = "8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d"; - name = "qt3d-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz"; + sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1"; + name = "qt3d-everywhere-src-5.12.0.tar.xz"; }; }; qtactiveqt = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtactiveqt-everywhere-src-5.12.3.tar.xz"; - sha256 = "15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f"; - name = "qtactiveqt-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz"; + sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52"; + name = "qtactiveqt-everywhere-src-5.12.0.tar.xz"; }; }; qtandroidextras = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtandroidextras-everywhere-src-5.12.3.tar.xz"; - sha256 = "866b3fbcfc2cbebdb83b5adec4e5d0bd29b0e0b0762d66fb3fef0b400e37254f"; - name = "qtandroidextras-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz"; + sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm"; + name = "qtandroidextras-everywhere-src-5.12.0.tar.xz"; }; }; qtbase = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz"; - sha256 = "fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701"; - name = "qtbase-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz"; + sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy"; + name = "qtbase-everywhere-src-5.12.0.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcanvas3d-everywhere-src-5.12.3.tar.xz"; - sha256 = "c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea"; - name = "qtcanvas3d-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj"; + name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz"; }; }; qtcharts = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtcharts-everywhere-src-5.12.3.tar.xz"; - sha256 = "820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9"; - name = "qtcharts-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz"; + sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww"; + name = "qtcharts-everywhere-src-5.12.0.tar.xz"; }; }; qtconnectivity = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz"; - sha256 = "01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661"; - name = "qtconnectivity-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz"; + sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f"; + name = "qtconnectivity-everywhere-src-5.12.0.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz"; - sha256 = "f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313"; - name = "qtdatavis3d-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf"; + name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz"; }; }; qtdeclarative = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz"; - sha256 = "839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7"; - name = "qtdeclarative-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz"; + sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag"; + name = "qtdeclarative-everywhere-src-5.12.0.tar.xz"; }; }; qtdoc = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtdoc-everywhere-src-5.12.3.tar.xz"; - sha256 = "ce5e9d0f48d108c48d742ab2127ead735270d7b525103c6cf409683d7fc8334f"; - name = "qtdoc-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz"; + sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h"; + name = "qtdoc-everywhere-src-5.12.0.tar.xz"; }; }; qtgamepad = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgamepad-everywhere-src-5.12.3.tar.xz"; - sha256 = "5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642"; - name = "qtgamepad-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz"; + sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac"; + name = "qtgamepad-everywhere-src-5.12.0.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; - sha256 = "772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73"; - name = "qtgraphicaleffects-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1"; + name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; }; }; qtimageformats = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz"; - sha256 = "db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2"; - name = "qtimageformats-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz"; + sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z"; + name = "qtimageformats-everywhere-src-5.12.0.tar.xz"; }; }; qtlocation = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz"; - sha256 = "52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6"; - name = "qtlocation-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz"; + sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh"; + name = "qtlocation-everywhere-src-5.12.0.tar.xz"; }; }; qtmacextras = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmacextras-everywhere-src-5.12.3.tar.xz"; - sha256 = "38dedd29d07ea9e4e92a7ef28f9e03c06cf9a1525aee4f8084310c519f5b47ed"; - name = "qtmacextras-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz"; + sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr"; + name = "qtmacextras-everywhere-src-5.12.0.tar.xz"; }; }; qtmultimedia = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz"; - sha256 = "a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301"; - name = "qtmultimedia-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz"; + sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw"; + name = "qtmultimedia-everywhere-src-5.12.0.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz"; - sha256 = "dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332"; - name = "qtnetworkauth-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1"; + name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz"; }; }; qtpurchasing = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtpurchasing-everywhere-src-5.12.3.tar.xz"; - sha256 = "a848f1e1022af38571f5ab0c4ec4b904c12fa6ef19154d44abbcaeb35156753e"; - name = "qtpurchasing-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz"; + sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr"; + name = "qtpurchasing-everywhere-src-5.12.0.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz"; - sha256 = "68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46"; - name = "qtquickcontrols-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb"; + name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; - sha256 = "e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a"; - name = "qtquickcontrols2-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9"; + name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtremoteobjects-everywhere-src-5.12.3.tar.xz"; - sha256 = "3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42"; - name = "qtremoteobjects-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09"; + name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz"; }; }; qtscript = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz"; - sha256 = "0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e"; - name = "qtscript-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz"; + sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp"; + name = "qtscript-everywhere-src-5.12.0.tar.xz"; }; }; qtscxml = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz"; - sha256 = "70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19"; - name = "qtscxml-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz"; + sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw"; + name = "qtscxml-everywhere-src-5.12.0.tar.xz"; }; }; qtsensors = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz"; - sha256 = "7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc"; - name = "qtsensors-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz"; + sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5"; + name = "qtsensors-everywhere-src-5.12.0.tar.xz"; }; }; qtserialbus = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialbus-everywhere-src-5.12.3.tar.xz"; - sha256 = "792cd2d411d2ebd737f5d09580f8db479cd35f2f7e7cedb4412075ef20fcfe4d"; - name = "qtserialbus-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz"; + sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb"; + name = "qtserialbus-everywhere-src-5.12.0.tar.xz"; }; }; qtserialport = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz"; - sha256 = "1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51"; - name = "qtserialport-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz"; + sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r"; + name = "qtserialport-everywhere-src-5.12.0.tar.xz"; }; }; qtspeech = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz"; - sha256 = "ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5"; - name = "qtspeech-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz"; + sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r"; + name = "qtspeech-everywhere-src-5.12.0.tar.xz"; }; }; qtsvg = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz"; - sha256 = "f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2"; - name = "qtsvg-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz"; + sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb"; + name = "qtsvg-everywhere-src-5.12.0.tar.xz"; }; }; qttools = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz"; - sha256 = "c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8"; - name = "qttools-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz"; + sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p"; + name = "qttools-everywhere-src-5.12.0.tar.xz"; }; }; qttranslations = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz"; - sha256 = "eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca"; - name = "qttranslations-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz"; + sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv"; + name = "qttranslations-everywhere-src-5.12.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; - sha256 = "7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22"; - name = "qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv"; + name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; }; }; qtwayland = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz"; - sha256 = "f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff"; - name = "qtwayland-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz"; + sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m"; + name = "qtwayland-everywhere-src-5.12.0.tar.xz"; }; }; qtwebchannel = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz"; - sha256 = "72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a"; - name = "qtwebchannel-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz"; + sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5"; + name = "qtwebchannel-everywhere-src-5.12.0.tar.xz"; }; }; qtwebengine = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz"; - sha256 = "3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317"; - name = "qtwebengine-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz"; + sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x"; + name = "qtwebengine-everywhere-src-5.12.0.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebglplugin-everywhere-src-5.12.3.tar.xz"; - sha256 = "23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3"; - name = "qtwebglplugin-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5"; + name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz"; }; }; qtwebsockets = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz"; - sha256 = "258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577"; - name = "qtwebsockets-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz"; + sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4"; + name = "qtwebsockets-everywhere-src-5.12.0.tar.xz"; }; }; qtwebview = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwebview-everywhere-src-5.12.3.tar.xz"; - sha256 = "f904e7fd7e755527e5bc4633c6f7c144065a3ffea473bf01fffb730385a983c5"; - name = "qtwebview-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz"; + sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p"; + name = "qtwebview-everywhere-src-5.12.0.tar.xz"; }; }; qtwinextras = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtwinextras-everywhere-src-5.12.3.tar.xz"; - sha256 = "2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b"; - name = "qtwinextras-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz"; + sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6"; + name = "qtwinextras-everywhere-src-5.12.0.tar.xz"; }; }; qtx11extras = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz"; - sha256 = "85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613"; - name = "qtx11extras-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz"; + sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06"; + name = "qtx11extras-everywhere-src-5.12.0.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.3"; + version = "5.12.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; - sha256 = "e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61"; - name = "qtxmlpatterns-everywhere-src-5.12.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk"; + name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index a1c3bea866e2..294c923973b9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -229,8 +229,6 @@ stdenv.mkDerivation { "-widgets" "-opengl desktop" "-icu" - "-L" "${icu.out}/lib" - "-I" "${icu.dev}/include" "-pch" ] ++ lib.optionals (compareVersion "5.11.0" < 0) @@ -267,18 +265,10 @@ stdenv.mkDerivation { ++ [ "-system-zlib" - "-L" "${zlib.out}/lib" - "-I" "${zlib.dev}/include" "-system-libjpeg" - "-L" "${libjpeg.out}/lib" - "-I" "${libjpeg.dev}/include" "-system-harfbuzz" - "-L" "${harfbuzz.out}/lib" - "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" - "-L" "${openssl.out}/lib" - "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' @@ -307,14 +297,10 @@ stdenv.mkDerivation { "-system-xcb" "-xcb" "-qpa xcb" - "-L" "${libX11.out}/lib" - "-I" "${libX11.out}/include" - "-L" "${libXext.out}/lib" - "-I" "${libXext.out}/include" - "-L" "${libXrender.out}/lib" - "-I" "${libXrender.out}/include" + "-system-xkbcommon" "-libinput" + "-xkbcommon-evdev" "-no-eglfs" "-no-gbm" @@ -335,19 +321,6 @@ stdenv.mkDerivation { "-no-feature-renameat2" "-no-feature-getentropy" ] - ++ lib.optionals (compareVersion "5.12.1" < 0) [ - # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 - "-system-xkbcommon" - "-xkbcommon-evdev" - ] - ++ lib.optionals (cups != null) [ - "-L" "${cups.lib}/lib" - "-I" "${cups.dev}/include" - ] - ++ lib.optionals (mysql != null) [ - "-L" "${mysql.out}/lib" - "-I" "${mysql.out}/include" - ] ); enableParallelBuilding = true; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 03651222a045..6309d84fe2e4 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1106,11 +1106,11 @@ luuid = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.29.1-2"; + version = "1.30.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.29.1-2.src.rock; - sha256 = "180g06lkhapb76nhlgsa8ik8z6mrlkvq9mpb8rx74lr101h1yqxg"; + url = https://luarocks.org/luv-1.30.0-0.src.rock; + sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index df3a07b26e8b..50b33f7effd4 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -73,10 +73,6 @@ nodePackages // { ''; }; - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { - postInstall = "npm run-script prepublish"; - }; - pnpm = nodePackages.pnpm.override { nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 14012438bc1e..4689546832a5 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -86,7 +86,6 @@ , "nodemon" , "node-red" , "npm" -, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" } , "npm-check-updates" , "ocaml-language-server" , "peerflix" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index b587d1391faa..b0017eec3270 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -58097,183 +58097,6 @@ in bypassCache = true; reconstructLock = true; }; - "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { - name = "npm2nix"; - packageName = "npm2nix"; - version = "5.12.0"; - src = fetchgit { - url = "git://github.com/NixOS/npm2nix.git"; - rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5"; - sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ajv-6.10.2" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.5" - sources."argparse-0.1.15" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" - sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."block-stream-0.0.9" - sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" - sources."chownr-0.0.2" - sources."code-point-at-1.1.0" - sources."coffee-script-1.12.7" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.12" // { - dependencies = [ - sources."ini-1.3.5" - ]; - }) - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.2" - sources."couch-login-0.1.20" - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."findit-1.2.0" - sources."foreachasync-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - (sources."fs-extra-0.6.4" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - sources."fs.extra-1.3.2" - sources."fs.realpath-1.0.0" - (sources."fstream-0.1.31" // { - dependencies = [ - sources."graceful-fs-3.0.11" - sources."mkdirp-0.5.1" - ]; - }) - sources."gauge-2.7.4" - sources."getpass-0.1.7" - sources."glob-7.1.4" - sources."graceful-fs-2.0.3" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-unicode-2.0.1" - sources."http-signature-1.2.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-1.0.1" - sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.3.5" - sources."natives-1.1.6" - sources."ncp-0.4.2" - sources."nopt-2.2.1" - (sources."npm-registry-client-0.2.27" // { - dependencies = [ - sources."semver-2.0.11" - ]; - }) - (sources."npmconf-0.1.1" // { - dependencies = [ - sources."inherits-1.0.2" - sources."once-1.1.1" - sources."semver-2.3.2" - ]; - }) - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."osenv-0.0.3" - sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."psl-1.2.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."request-2.88.0" - sources."retry-0.6.0" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" - sources."safer-buffer-2.1.2" - sources."semver-4.3.6" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.2" - sources."slide-1.1.6" - sources."sshpk-1.16.1" - sources."string-width-1.0.2" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-3.0.1" - (sources."tar-0.1.17" // { - dependencies = [ - sources."inherits-1.0.2" - ]; - }) - (sources."temp-0.6.0" // { - dependencies = [ - sources."graceful-fs-1.2.3" - sources."rimraf-2.1.4" - ]; - }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."underscore-1.4.4" - sources."underscore.string-2.3.3" - sources."uri-js-4.2.2" - sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" - sources."walk-2.3.14" - sources."wide-align-1.1.3" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; @@ -72008,4 +71831,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index b0a563126e22..9b54f4398477 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six }: +{ stdenv, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: buildPythonPackage rec { pname = "configshell"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0zpr2n4105qqsklyfyr9lzl1rhxjcv0mnsl57hgk0m763w6na90h"; }; - propagatedBuildInputs = [ pyparsing six ]; + propagatedBuildInputs = [ pyparsing six urwid ]; meta = with stdenv.lib; { description = "A Python library for building configuration shells"; diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix new file mode 100644 index 000000000000..c473f2fb4200 --- /dev/null +++ b/pkgs/development/python-modules/diofant/default.nix @@ -0,0 +1,44 @@ +{ lib +, isPy3k +, buildPythonPackage +, fetchPypi +, pytestrunner +, setuptools_scm +, isort +, mpmath +, strategies +}: + +buildPythonPackage rec { + pname = "diofant"; + version = "0.10.0"; + + src = fetchPypi { + inherit version; + pname = "Diofant"; + sha256 = "0qjg0mmz2cqxryr610mppx3virf1gslzrsk24304502588z53v8w"; + }; + + nativeBuildInputs = [ + isort + pytestrunner + setuptools_scm + ]; + + propagatedBuildInputs = [ + mpmath + strategies + ]; + + # tests take ~1h + doCheck = false; + + disabled = !isPy3k; + + meta = with lib; { + description = "A Python CAS library"; + homepage = "https://diofant.readthedocs.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ suhr ]; + }; +} diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix new file mode 100644 index 000000000000..7fbf14cf7de0 --- /dev/null +++ b/pkgs/development/python-modules/fipy/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, pyamg +, pysparse +, future +, matplotlib +, tkinter +, mpi4py +, scikit-fmm +, isPy27 +, gmsh +, python +, stdenv +}: + +let + not_darwin_inputs = lib.optionals (! stdenv.isDarwin) [ gmsh ]; +in + buildPythonPackage rec { + pname = "fipy"; + version = "3.3"; + + src = fetchPypi { + pname = "FiPy"; + inherit version; + sha256 = "11agpg3d6yrns8igkpml1mxy3mkqkjq2yrw1mw12y07dkk12ii19"; + }; + + propagatedBuildInputs = [ + numpy + scipy + pyamg + matplotlib + tkinter + mpi4py + future + scikit-fmm + ] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs; + + checkInputs = not_darwin_inputs; + + checkPhase = '' + ${python.interpreter} setup.py test --modules + ''; + + meta = with lib; { + homepage = https://www.ctcms.nist.gov/fipy/; + description = "A Finite Volume PDE Solver Using Python"; + license = licenses.free; + maintainers = with maintainers; [ costrouc wd15 ]; + }; + } diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix new file mode 100644 index 000000000000..d0ce48774c3a --- /dev/null +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, isPy27, fetchPypi +, jsonschema, pyyaml, six, pathlib +, mock, pytest, pytestcov, pytest-flake8, tox }: + +buildPythonPackage rec { + pname = "openapi-spec-validator"; + version = "0.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sz9ls6a7h056nc5q76w4xl43sr1h9in2f23qwkxazcazr3zpi3p"; + }; + + propagatedBuildInputs = [ jsonschema pyyaml six ] + ++ (lib.optionals (isPy27) [ pathlib ]); + + checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; + + meta = with lib; { + homepage = https://github.com/p1c2u/openapi-spec-validator; + description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; + license = licenses.asl20; + maintainers = with maintainers; [ rvl ]; + }; +} diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix new file mode 100644 index 000000000000..b299e44f3e34 --- /dev/null +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, pytest +, pybind11 +}: + +buildPythonPackage rec { + pname = "pyamg"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3ceb38ffd86e29774e759486f2961599c8ed847459c68727493cadeaf115a38a"; + }; + + propagatedBuildInputs = [ + numpy + scipy + pytest + pybind11 + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Algebraic Multigrid Solvers in Python"; + homepage = https://github.com/pyamg/pyamg; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix new file mode 100644 index 000000000000..45ff5a9b5b49 --- /dev/null +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, setuptools +, liblapack +, isPy27 +, python +}: + +buildPythonPackage rec { + pname = "pysparse"; + version = "1.3-dev"; + disabled = !isPy27; + + src = fetchFromGitHub { + owner = "PythonOptimizers"; + repo = "pysparse"; + rev = "f8430bd99ac2a6209c462657c5792d10033888cc"; + sha256 = "19xcq8214yndra1xjhna3qjm32wprsqck97dlnw3xcww7rfy6hqh"; + }; + + hardeningDisable = [ "all" ]; + + propagatedBuildInputs = [ + numpy + numpy.blas + liblapack + ]; + + # Include patches from working version of PySparse 1.3-dev in + # Conda-Forge, + # https://github.com/conda-forge/pysparse-feedstock/tree/b69266911a2/recipe + # Thanks to https://github.com/guyer + patches = [ ./dropPackageLoader.patch ]; + + checkPhase = '' + cd test + ${python.interpreter} -c "import pysparse" + ${python.interpreter} test_sparray.py + ''; + + meta = with lib; { + homepage = https://github.com/PythonOptimizers/pysparse; + description = "A Sparse Matrix Library for Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pysparse/dropPackageLoader.patch b/pkgs/development/python-modules/pysparse/dropPackageLoader.patch new file mode 100644 index 000000000000..b2526645f890 --- /dev/null +++ b/pkgs/development/python-modules/pysparse/dropPackageLoader.patch @@ -0,0 +1,88 @@ +diff --git a/pysparse/__init__.py b/pysparse/__init__.py +index 6d09b00..ff39084 100644 +--- a/pysparse/__init__.py ++++ b/pysparse/__init__.py +@@ -1,9 +1,42 @@ +-"PySparse: A Fast Sparse Matrix Library for Python" ++""" ++PySparse: A Fast Sparse Matrix Library for Python ++================================================= ++ ++Documentation is available in the docstrings and ++online at http://pysparse.sourceforge.net/. ++ ++Contents ++-------- ++Pysparse imports ++:: ++ spmatrix --- sparse matrix types ++ ++and, in addition, provides: ++ ++Subpackages ++----------- ++Using any of these subpackages requires an explicit import. For example, ++``import pysparse.itsolvers``. ++ ++:: ++ ++ itsolvers --- Iterative linear algebra solvers ++ precon --- Preconditioners ++ direct --- Direct solvers ++ direct.superlu --- Wrappers to SuperLU library ++ direct.umfpack --- Wrappers to UMFPACK library ++ eigen.jdsym --- Jacobi davidson eigenvalue solver for symmetric matrices ++ ++Utility tools ++------------- ++:: ++ ++ __version__ --- pysparse version string ++""" ++ + + __docformat__ = 'restructuredtext' + +-# Imports +-from numpy._import_tools import PackageLoader + try: + from version import version as __version__ + except ImportError: +@@ -11,31 +44,6 @@ except ImportError: + __version__ = 'undefined' + + from sparse import spmatrix +-#from sparse import * +-from misc import get_include +- +-pkgload = PackageLoader() +-pkgload(verbose=False,postpone=True) +- +-if __doc__: +- __doc__ += """ +- +-Available subpackages +---------------------- +-""" +-if __doc__: +- __doc__ += pkgload.get_pkgdocs() +- +-__all__ = filter(lambda s: not s.startswith('_'), dir()) +-__all__ += '__version__' +- +-__doc__ += """ +- +-Miscellaneous +-------------- +- +- __version__ : pysparse version string +-""" + + from pysparse.misc import Deprecated + +@@ -47,3 +55,5 @@ class _superlu: + return self.factorizeFnc(*args, **kwargs) + + superlu = _superlu() ++ ++__all__ = ['spmatrix', 'superlu', '__version__'] diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix new file mode 100644 index 000000000000..122af8cfda23 --- /dev/null +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, python +}: + +buildPythonPackage rec { + pname = "scikit-fmm"; + version = "2019.1.30"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb64b6d8e30b8df8f8636d5fc4fd7ca6a9b05938ccd62518c80c1d9e823069dd"; + }; + + propagatedBuildInputs = [ + numpy + ]; + + checkPhase = '' + mkdir testdir; cd testdir + ${python.interpreter} -c "import skfmm, sys; sys.exit(skfmm.test())" + ''; + + meta = with lib; { + description = "A Python extension module which implements the fast marching method"; + homepage = https://github.com/scikit-fmm/scikit-fmm; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d89c5fdbabde..d2f347901eb5 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -2,8 +2,8 @@ , git, ninja, python2 }: let - rev = "96ff462cddf35f98e25fd5d098fc27bc81eab94a"; - sha256 = "1ny23sprl7ygb2lpdnqxv60m8kaf4h2dmpqjp61l5vc2s7f32g97"; + rev = "0bc16a82ea001ad9c94b870f097034be5c8e40b4"; + sha256 = "01as6q5xr0smiihm9m1x74pykd2jcqi4rhv8irmv43v2f0pxwzi5"; shortRev = builtins.substring 0 7 rev; lastCommitPosition = writeText "last_commit_position.h" '' @@ -18,19 +18,13 @@ let in stdenv.mkDerivation rec { name = "gn-${version}"; - version = "20181031"; + version = "20190726"; src = fetchgit { url = "https://gn.googlesource.com/gn"; inherit rev sha256; }; - postPatch = '' - # FIXME Needed with old Apple SDKs - substituteInPlace base/mac/foundation_util.mm \ - --replace "NSArray<NSString*>*" "NSArray*" - ''; - nativeBuildInputs = [ ninja python2 git ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc @@ -43,7 +37,7 @@ stdenv.mkDerivation rec { ]); buildPhase = '' - python build/gen.py --no-sysroot --no-last-commit-position + python build/gen.py --no-last-commit-position ln -s ${lastCommitPosition} out/last_commit_position.h ninja -j $NIX_BUILD_CORES -C out gn ''; diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index 0427eadea195..454c5da71438 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -5,20 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "rls"; # with rust 1.x you can only build rls version 1.x.y - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = pname; rev = version; - sha256 = "1l3fvlgfzri8954nbwqxqghjy5wa8p1aiml12r1lqs92dh0g192f"; + sha256 = "1mclv0admxv48pndyqghxc4nf1amhbd700cgrzjshf9jrnffxmrn"; }; - cargoSha256 = "0v96ndys6bv5dfjg01chrqrqjc57qqfjw40n6vppi9bpw0f6wkf5"; + cargoSha256 = "1yli9540510xmzqnzfi3p6rh23bjqsviflqw95a0fawf2rnj8sin"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; + # rls-rustc links to rustc_private crates + CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ openssh openssl curl zlib libiconv ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); @@ -29,6 +32,11 @@ rustPlatform.buildRustPackage rec { rm tests/client.rs ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/rls --version + ''; + meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = https://github.com/rust-lang/rls/; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 7e6e034a2b50..d95532b438bb 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "multimc-${version}"; version = "0.6.4"; src = fetchFromGitHub { @@ -21,7 +21,11 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/{applications,pixmaps} cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps cp ../application/package/linux/multimc.desktop $out/share/applications - wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ + # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ + + # MultiMC's CMakeLists.txt puts libraries in bin directory, causing them to be set executable, causing nixpkgs' wrapQtAppsHook to wrap them + chmod -x $out/bin/*.so # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop, # the desktop icon refers to `multimc`, but the executable actually gets diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 24cc64ac9aff..07f84e498db7 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = '' + preFixup = stdenv.lib.optionalString qtMode '' wrapQtApp "$out/games/nethack" ''; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 311a3aac8a74..14e48b4a6218 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1144,6 +1144,17 @@ let }; }; + gitignore-vim = buildVimPluginFrom2Nix { + pname = "gitignore-vim"; + version = "2014-03-16"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "gitignore.vim"; + rev = "3ad6a15768945fd4fc1b013cec5d8c8e62c7bb87"; + sha256 = "0fg36hrkwqb3accqm7ihw1cjs64fxf73zk06gickdkzq0zn4yl8x"; + }; + }; + gitv = buildVimPluginFrom2Nix { pname = "gitv"; version = "2019-03-02"; @@ -3444,6 +3455,17 @@ let }; }; + vim-hybrid-material = buildVimPluginFrom2Nix { + pname = "vim-hybrid-material"; + version = "2018-11-12"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-hybrid-material"; + rev = "f2e92ac7e5c4bb75d72f0abaea939e4364e00e2e"; + sha256 = "01b9n598106qh68ky3fykczq13pldi221r7lrxvg0vnv2zp1z5qd"; + }; + }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { pname = "vim-iced-coffee-script"; version = "2013-12-26"; @@ -4457,6 +4479,17 @@ let }; }; + vim-tmux = buildVimPluginFrom2Nix { + pname = "vim-tmux"; + version = "2019-03-22"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "vim-tmux"; + rev = "4e77341a2f8b9b7e41e81e9debbcecaea5987c85"; + sha256 = "16fgc0lx1jr8zbayanf5w677ssiw5xb8vwfaca295c8xlk760c3m"; + }; + }; + vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; version = "2019-01-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 83857d09634a..8fc89a6a69b9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -155,6 +155,7 @@ KeitaNakamura/neodark.vim keith/swift.vim kien/rainbow_parentheses.vim konfekt/fastfold +kristijanhusak/vim-hybrid-material kshenoy/vim-signature lambdalisue/vim-gista lambdalisue/vim-pager @@ -357,6 +358,7 @@ thinca/vim-themis thinca/vim-visualstar thosakwe/vim-flutter tikhomirov/vim-glsl +tmux-plugins/vim-tmux tomasr/molokai tomlion/vim-solidity tommcdo/vim-lion @@ -410,6 +412,7 @@ vim-scripts/changeColorScheme.vim vim-scripts/Colour-Sampler-Pack vim-scripts/DoxygenToolkit.vim vim-scripts/emodeline +vim-scripts/gitignore.vim vim-scripts/Improved-AnsiEsc vim-scripts/jdaddy.vim vim-scripts/matchit.zip diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index a60dad9b7b70..a5dad88b924e 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.24.0"; - sha256 = "0b0rwj3aadd4kf561zpzv95r96dqvhkn7db8d7rz3naaqydz0z8i"; + version = "0.24.1"; + sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 7a8a097b8d42..371b224d11ab 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.1.2"; - sha256 = "1cdxmqdz8h9snx25cm3phipxdhjbcn38yfab09in661nr768vrkv"; + version = "2.2.0"; + sha256 = "0mwn72cp8rd9zc527k9l08iyap1wyqzpvzbj8142fa7nsy64jd04"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 9ab4de7bf85b..8a07b99900c3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.61"; + version = "4.19.62"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1scwb6ynr93k4a1vzpw2x1hzafhfs06ckf9v6fk1zvkh8jw1rc5c"; + sha256 = "1p6s1ksrsq3za7644j0qf9brf6brwq39jxpfln5ypmyfi5qn9gh7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 6ff9f5163d30..ad3b292656e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.20"; + version = "5.1.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "039i5b41dv930kmq8jwskcwjc6r26h9xy7jgbi6aggn0ycyig21d"; + sha256 = "1xj1wfhjz2s5a8j6zx3fsd7rrrkvw5waszzylf2gn3ag6615yjan"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 3585a5231198..324c52374448 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.3"; + version = "5.2.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "018fiz8bycglh5b031b710zllv2s5w017ylq0j30923p744n0g3m"; + sha256 = "0hzfayq79bksng09ngw3k3h3zkd6ndfn059rvwpznypy1fg8pkdi"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 33dbfe5bf0a7..3133602b44eb 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,25 +1,40 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: - stdenv.mkDerivation rec { name = "trace-cmd-${version}"; - version = "2.6"; + version = "2.8.3"; - src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git"; - rev = "refs/tags/trace-cmd-v${version}"; - sha256 = "15d6b7l766h2mamqgphx6l6a33b1zn0yar2h7i6b24ph6kz3idxn"; - }; + src = fetchgit (import ./src.nix); + + patches = [ ./fix-Makefiles.patch ]; + + nativeBuildInputs = [ asciidoc libxslt ]; - buildInputs = [ asciidoc libxslt ]; + outputs = [ "out" "lib" "dev" "man" ]; + + MANPAGE_DOCBOOK_XSL="${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; dontConfigure = true; - buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc"; - installPhase = "make prefix=$out install install_doc"; - meta = { + buildPhase = "make trace-cmd libs doc"; + + installTargets = [ "install_cmd" "install_libs" "install_man" ]; + installFlags = [ + "bindir=${placeholder "out"}/bin" + "man_dir=${placeholder "man"}/share/man" + "libdir=${placeholder "lib"}/lib" + "includedir=${placeholder "dev"}/include/trace-cmd" + "BASH_COMPLETE_DIR=${placeholder "out"}/etc/bash_completion.d" + ]; + + postInstall = '' + mv $dev/include/trace-cmd/traceevent $dev/include/traceevent + ''; + + meta = with stdenv.lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = http://kernelshark.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice basvandijk ]; }; } diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch new file mode 100644 index 000000000000..0d6f5c5d8bfe --- /dev/null +++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch @@ -0,0 +1,52 @@ +diff --git a/Documentation/Makefile b/Documentation/Makefile +index 21e42fd..826361d 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -108,7 +108,11 @@ $(IMGS_INSTALL): %.png.install : %.png force + + GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL) + +-install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL) ++install_man: $(MAN1_INSTALL) $(MAN5_INSTALL) ++ ++install_gui: $(GUI_INSTALL) ++ ++install: install_man install_gui + + clean: + (cd $(obj); \ +diff --git a/Makefile b/Makefile +index 2bcc383..107ead0 100644 +--- a/Makefile ++++ b/Makefile +@@ -289,7 +289,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC) + libtracecmd.a: $(LIBTRACECMD_STATIC) + libtracecmd.so: $(LIBTRACECMD_SHARED) + +-libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) ++libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) + + plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir + $(Q)$(MAKE) -C $(src)/plugins +@@ -345,6 +345,8 @@ install_gui: install_cmd gui + install_libs: libs + $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)) + $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)) ++ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)) ++ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)) + $(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent) + $(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent) + $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)) +@@ -356,6 +358,12 @@ doc: + doc_clean: + $(MAKE) -C $(src)/Documentation clean + ++install_man: ++ $(MAKE) -C $(src)/Documentation install_man ++ ++install_gui_docs: ++ $(MAKE) -C $(src)/Documentation install_gui ++ + install_doc: + $(MAKE) -C $(src)/Documentation install + diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix new file mode 100644 index 000000000000..8e49af771394 --- /dev/null +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -0,0 +1,39 @@ +{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +mkDerivation rec { + pname = "kernelshark"; + version = "0.9.8"; + + src = fetchgit (import ./src.nix); + + patches = [ ./fix-Makefiles.patch ]; + + outputs = [ "out" "doc" ]; + + preConfigure = "pushd kernel-shark"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase json_c mesa_glu freeglut pkg-config ]; + + cmakeFlags = [ + "-D_INSTALL_PREFIX=${placeholder "out"}" + "-DTRACECMD_BIN_DIR=${trace-cmd}/bin" + "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include" + "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/libtracecmd.a" + "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a" + ]; + + preInstall = '' + popd + make install_gui_docs prefix=$doc + pushd kernel-shark/build + ''; + + meta = with stdenv.lib; { + description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; + homepage = http://kernelshark.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix new file mode 100644 index 000000000000..836e71b1851e --- /dev/null +++ b/pkgs/os-specific/linux/trace-cmd/src.nix @@ -0,0 +1,5 @@ +{ + url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; + rev = "138c70106835ee0f05879e7f2f46bca8dae7ca99"; # branch: trace-cmd-stable-v2.8 + sha256 = "1grpip7lywf98nsm7ql1d6bgc0ky0672savr8jz3a8hf9ny265nx"; +} diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 60ff9cab2d3d..88c973de0d1b 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "exim-4.92"; + name = "exim-4.92.1"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; - sha256 = "0qhxxwl0nhzgp0w3pjkhx9z9lqfpk8id25q5ghf9ay2f90mydjba"; + sha256 = "1d14vs6jdw2bm9m33w2szxpv8rppbk7hvszq9p0n9i3svmqshr1c"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index b23270cd8c1e..1a623a3171df 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,9 +1,8 @@ -# This file was generated by go2nix. { lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: buildGoPackage rec { name = "prometheus_varnish_exporter-${version}"; - version = "1.4"; + version = "1.5"; goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter"; @@ -11,7 +10,7 @@ buildGoPackage rec { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "12gd09858zlhn8gkkchfwxv0ca2r72s18wrsz0agfr8pd1gxqh6j"; + sha256 = "1040x7fk3s056yrn95siilhi8c9cci2mdncc1xfjf5xj87421qx8"; }; goDeps = ./varnish-exporter_deps.nix; @@ -26,7 +25,7 @@ buildGoPackage rec { doCheck = true; meta = { - homepage = https://github.com/jonnenauha/prometheus_varnish_exporter; + homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix index 19ff1e9aa560..aeacbb5cee8b 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix @@ -1,11 +1,75 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; }; } { @@ -13,8 +77,44 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; }; } { @@ -22,17 +122,62 @@ fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + rev = "v1.0.1"; sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "82f5ff156b29e276022b1a958f7d385870fb9814"; - sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; }; } { @@ -40,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; }; } { @@ -49,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"; - sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; }; } { @@ -58,8 +203,98 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; - sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "0709b304e793"; + sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "adae6a3d119a"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "5ac8a444bdc5"; + sha256 = "00zdrighflwc4iyizsag184nvl1cbkk02v73kpl5miprdrvzqlr4"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix new file mode 100644 index 000000000000..28218b8f66d6 --- /dev/null +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "thanos"; + version = "0.6.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "improbable-eng"; + repo = "thanos"; + sha256 = "0vcp7m8fsk4jyk49jh9wmbvkx5k03xw10f4lbsxfmwib1y5pz2x0"; + }; + + modSha256 = "139b66jdryqv4s1hjbn9fzkyzn1160wr4z6a6wmmvm3f6p6wgjxp"; + + subPackages = "cmd/thanos"; + + buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=unknown + -X ${t}.Branch=unknown + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=unknown + ''; + + meta = with stdenv.lib; { + description = "Highly available Prometheus setup with long term storage capabilities"; + homepage = "https://github.com/improbable-eng/thanos"; + license = licenses.asl20; + maintainers = with maintainers; [ basvandijk ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index b1d9154a7475..842c988d9b33 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { preBuild = '' sconsFlags+=" CC=$CC" sconsFlags+=" CXX=$CXX" + '' + optionalString stdenv.isAarch64 '' + sconsFlags+=" CCFLAGS='-march=armv8-a+crc'" ''; preInstall = '' diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 12d39c5bdab5..b896b8b088eb 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.6"; + version = "0.9.8"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { - owner = "scopatz"; + owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${version}"; sha256 = "0lnvx1kdk1nwv988wrxyvbzb25xawz517amvi4pwzs22bymcdhws"; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 88162a3432d9..e3cfc580fab9 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) atomos (0.1.3) babosa (1.0.2) @@ -13,28 +13,29 @@ GEM highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) - domain_name (0.5.20180417) + digest-crc (0.4.1) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.5.0) - emoji_regex (0.1.1) - excon (0.62.0) - faraday (0.15.3) + dotenv (2.7.4) + emoji_regex (1.0.1) + excon (0.65.0) + faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.4) - fastlane (2.107.0) + fastimage (2.1.5) + fastlane (2.128.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) - bundler (>= 1.12.0, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (~> 0.1) + emoji_regex (>= 0.1, < 2.0) excon (>= 0.45.0, < 1.0.0) faraday (~> 0.9) faraday-cookie_jar (~> 0.0.6) @@ -42,10 +43,11 @@ GEM fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.21.2, < 0.24.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) - mini_magick (~> 4.5.1) - multi_json + jwt (~> 2.1.0) + mini_magick (>= 4.9.4, < 5.0.0) multi_xml (~> 0.5) multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) @@ -54,12 +56,12 @@ GEM security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) - terminal-notifier (>= 1.6.2, < 2.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.6.0, < 2.0.0) + xcodeproj (>= 1.8.1, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) @@ -71,6 +73,15 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.9) + google-cloud-core (1.3.0) + google-cloud-env (~> 1.0) + google-cloud-env (1.2.0) + faraday (~> 0.11) + google-cloud-storage (1.16.0) + digest-crc (~> 0.4) + google-api-client (~> 0.23) + google-cloud-core (~> 1.2) + googleauth (>= 0.6.2, < 0.10.0) googleauth (0.6.7) faraday (~> 0.12) jwt (>= 1.4, < 3.0) @@ -82,20 +93,20 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - json (2.1.0) + json (2.2.0) jwt (2.1.0) memoist (0.16.0) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_magick (4.5.1) + mime-types-data (3.2019.0331) + mini_magick (4.9.5) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.6) naturally (2.2.0) - os (1.0.0) - plist (3.4.0) + os (1.0.1) + plist (3.5.0) public_suffix (2.0.5) representable (3.0.4) declarative (< 0.1.0) @@ -103,7 +114,7 @@ GEM uber (< 0.2.0) retriable (3.1.2) rouge (2.0.7) - rubyzip (1.2.2) + rubyzip (1.2.3) security (0.1.3) signet (0.11.0) addressable (~> 2.3) @@ -114,20 +125,20 @@ GEM CFPropertyList naturally slack-notifier (2.3.2) - terminal-notifier (1.8.0) + terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.6.0) - tty-screen (0.6.5) - tty-spinner (0.8.0) - tty-cursor (>= 0.5.0) + tty-cursor (0.7.0) + tty-screen (0.7.0) + tty-spinner (0.9.1) + tty-cursor (~> 0.7) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.4.0) + unf_ext (0.0.7.6) + unicode-display_width (1.6.0) word_wrap (1.0.0) - xcodeproj (1.7.0) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -145,4 +156,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 5afad1683c99..2511822a9fc9 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -1,12 +1,14 @@ { addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; atomos = { source = { @@ -81,47 +83,67 @@ }; version = "0.1.0"; }; + digest-crc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l"; + type = "gem"; + }; + version = "0.4.1"; + }; domain_name = { dependencies = ["unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; type = "gem"; }; - version = "0.5.20180417"; + version = "0.5.20190701"; }; dotenv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1va5y19f7l5jh53vz5vibz618lg8z93k5m2k70l25s9k46v2gfm3"; + sha256 = "1375dyawvcp81d94jkjwjjkj3j23gsp06cfwh15g695l4g3ssswc"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.4"; }; emoji_regex = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pcw3axgcmsgihp0xlsdqrqmavz0lw8g396b048fg21033kssxjn"; + sha256 = "1jfsv8ik2h1msqf3if1f121pnx3lccp8fqnka9na309mnw3bq532"; type = "gem"; }; - version = "0.1.1"; + version = "1.0.1"; }; excon = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + sha256 = "1mc6y6n7i0hhk7i8wwi4qjnpkm013p7z3xr994s696hk74f91a7j"; type = "gem"; }; - version = "0.62.0"; + version = "0.65.0"; }; faraday = { dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.15.3"; + version = "0.15.4"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -134,29 +156,35 @@ }; faraday_middleware = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; fastimage = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i7p9jgb9x1lxkhkwq8xlq7an5qbgdq6gsyrbs2xnf5ffa8yx1i2"; + sha256 = "1iy9jm13r2r4yz41xaivhxs8mvqn57fjwihxvazbip002mq6rxfz"; type = "gem"; }; - version = "2.1.4"; + version = "2.1.5"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d3jv7ik3rivmhxzcapia2lzf9xjmjgi4yxkl60ly6pcbbvhl48w"; + sha256 = "0h3k6rzy9p9s7ajk96jarg7sqs9npdnj7acr4v2gs8bpf31hqgpc"; type = "gem"; }; - version = "2.107.0"; + version = "2.128.1"; }; gh_inspector = { source = { @@ -175,6 +203,39 @@ }; version = "0.23.9"; }; + google-cloud-core = { + dependencies = ["google-cloud-env"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gqn523gqj6dwbj9ddcb8rjw0sai4x138pk3l3qzmq8jxz67qqj5"; + type = "gem"; + }; + version = "1.3.0"; + }; + google-cloud-env = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j25sy2qhybqfwsyh8j4m10z2x7dn2jmf1gwr1w2b90cmya4yrbd"; + type = "gem"; + }; + version = "1.2.0"; + }; + google-cloud-storage = { + dependencies = ["digest-crc" "google-api-client" "google-cloud-core" "googleauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lslrlrrhjj8imbpzvbbwflrvq06r0x5h74mlq726yvkr7akyqlq"; + type = "gem"; + }; + version = "1.16.0"; + }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; source = { @@ -210,12 +271,14 @@ version = "2.8.3"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; jwt = { source = { @@ -243,20 +306,24 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mini_magick = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a59k5l29vj060yscaqk370rg5vyr132kbw6x3zar7khzjqjqd8p"; + sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; type = "gem"; }; - version = "4.5.1"; + version = "4.9.5"; }; multi_json = { source = { @@ -299,20 +366,24 @@ version = "2.2.0"; }; os = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; + sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; plist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f27kj49v76psqxgcwvwc63cf7va2bszmmw2qrrd281qzi2if79l"; + sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; public_suffix = { source = { @@ -348,12 +419,14 @@ version = "2.0.7"; }; rubyzip = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; security = { source = { @@ -390,12 +463,14 @@ version = "2.3.2"; }; terminal-notifier = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vy75sbq236v1p83jj6r3a9d52za5lqj2vj24np9lrszdczm9zcb"; + sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs"; type = "gem"; }; - version = "1.8.0"; + version = "2.0.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -407,29 +482,35 @@ version = "1.8.0"; }; tty-cursor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f4rsapf4apaxn11xnqrq7axgrlvn6pdlqxqb2g34jnpfh5yrk1i"; + sha256 = "0prcxdy6qhqba4cv7hsy503b3bjciqk3j3hhzvcbij1kj2gh31c9"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; tty-screen = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; + sha256 = "1143g05fs28ssgimaph6sdnsndd1wrpax9kjypvd2ripa1adm4kx"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; tty-spinner = { dependencies = ["tty-cursor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xv5bycgmiyx00bq0kx2bdixi3h1ffi86mwj858gqbxlpjbzsi94"; + sha256 = "089qiqzjs1m727kalz8vn2wzgwzdn8mg5gyag901pmimxl64lnvc"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.1"; }; uber = { source = { @@ -449,20 +530,24 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; type = "gem"; }; - version = "0.0.7.5"; + version = "0.0.7.6"; }; unicode-display_width = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; word_wrap = { source = { @@ -474,12 +559,14 @@ }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hy2ihcqfjlsrnf8qkm51m1kk154yp0l0007f269ky8j9z5lyw3p"; + sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; type = "gem"; }; - version = "1.7.0"; + version = "1.11.0"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 0b3b5d287271..91f233df81d2 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1w94c1p8vnp3kf802zpr3i0932f5b5irnfqmxj2p44gfyfmkym1j"; + sha256 = "17gqrfnqbhp9hhlb57nxii18pb5cnxn3k8p2djiw699qkx3aqs13"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0pps7csf8d3rxqgd0bv06ga6cgkqhlbsys0k0sy1ipl3i6h5hmpf"; + sha256 = "1bgvwgyshh0icb07dacrip0q5xs5l2315m1gz5ggz5dhnf0vrz0q"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "241.0.0"; + version = "255.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 3e47ebd51d74..6b47027a5b9e 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, libintl }: +{ stdenv, fetchurl, pkgconfig, glib, libintl }: with stdenv.lib; stdenv.mkDerivation rec { - name = "desktop-file-utils-0.23"; + pname = "desktop-file-utils"; + version = "0.24"; src = fetchurl { - url = "https://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; - sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; + url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1"; }; - patches = [ - # Makes font a recognized media type. Committed upstream, but no release has been made. - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/commit/92af4108750ceaf4191fd54e255885c7d8a78b70.patch"; - sha256 = "14sqy10p5skp6hv4hgiwnj9hpr460250x42k5z0390l6nr6gahsq"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libintl ]; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index f5091ac9720a..82b29bb67f66 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, tokyocabinet, cairo, pango, ncurses }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, tokyocabinet, ncurses +, cairo ? null, pango ? null +, enableCairo ? stdenv.isLinux +}: + +assert enableCairo -> cairo != null && pango != null; stdenv.mkDerivation rec { name = "duc-${version}"; @@ -12,14 +18,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ tokyocabinet cairo pango ncurses ]; + buildInputs = [ tokyocabinet ncurses ] ++ + stdenv.lib.optionals enableCairo [ cairo pango ]; + + configureFlags = + stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with stdenv.lib; { homepage = http://duc.zevv.nl/; description = "Collection of tools for inspecting and visualizing disk usage"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index ddd4ae5ce056..9069821fe354 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, qtbase, qttools, qmake }: +{ mkDerivation, lib, fetchurl, qtbase, qttools, qmake }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qt5ct"; version = "0.39"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt5 Configuration Tool"; homepage = https://www.opendesktop.org/content/show.php?content=168066; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index bfc2a03e6cb8..d6adbde5ea9e 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -2,8 +2,10 @@ , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { - url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; - sha256 = "1f9mrhqy0l72i3674n98bqlq9a10h0rh9qfjiwvivz3hjhq5c0gz"; + name = "xvfb-run"; + # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff; + sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f9b16e5870d1..7e11a68c85e4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.07.16"; + version = "2019.07.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "06qd6z9swx8aw9v7vi85q44hmzxgy8wx18a9ljfhx7l7wjpm99ky"; + sha256 = "1k4b8s1g816m8k48mlsk5pfjaqz8p6qsvfrdnpfkminwm4f6kz6d"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/sequoia-tool/default.nix b/pkgs/tools/security/sequoia-tool/default.nix new file mode 100644 index 000000000000..00472c1a3aa4 --- /dev/null +++ b/pkgs/tools/security/sequoia-tool/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitLab, rustPlatform, darwin +, pkgconfig, capnproto, clang, libclang, nettle, openssl, sqlite }: + +rustPlatform.buildRustPackage rec { + pname = "sequoia-tool"; + version = "0.9.0"; + + src = fetchFromGitLab { + owner = "sequoia-pgp"; + repo = "sequoia"; + rev = "v${version}"; + sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj"; + }; + + nativeBuildInputs = [ pkgconfig clang libclang ]; + buildInputs = [ capnproto nettle openssl sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + LIBCLANG_PATH = libclang + "/lib"; + + cargoBuildFlags = [ "--package=sequoia-tool" ]; + + cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi"; + + meta = with stdenv.lib; { + description = "A command-line frontend for Sequoia, an implementation of OpenPGP"; + homepage = https://sequoia-pgp.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ minijackson ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40a55212d623..4f41446a50ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1383,6 +1383,8 @@ in cucumber = callPackage ../development/tools/cucumber {}; + dabtools = callPackage ../applications/radio/dabtools { }; + daemontools = callPackage ../tools/admin/daemontools { }; dale = callPackage ../development/compilers/dale { }; @@ -4340,8 +4342,6 @@ in nodePackages = nodePackages_10_x; - npm2nix = nodePackages.npm2nix; - now-cli = callPackage ../development/web/now-cli {}; file-rename = callPackage ../tools/filesystems/file-rename { }; @@ -5903,6 +5903,8 @@ in seqdiag = with python3Packages; toPythonApplication seqdiag; + sequoia-tool = callPackage ../tools/security/sequoia-tool { inherit (llvmPackages) libclang; }; + sewer = callPackage ../tools/admin/sewer { }; screenfetch = callPackage ../tools/misc/screenfetch { }; @@ -6401,6 +6403,8 @@ in trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; + kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; + traceroute = callPackage ../tools/networking/traceroute { }; tracebox = callPackage ../tools/networking/tracebox { }; @@ -12931,7 +12935,7 @@ in inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; - inherit harfbuzz; + harfbuzz = harfbuzzFull; inherit libGL; inherit perl; inherit gtk3; @@ -14952,6 +14956,8 @@ in syncserver = callPackage ../servers/syncserver { }; + thanos = callPackage ../servers/monitoring/thanos { }; + inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 @@ -15839,6 +15845,7 @@ in aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { + inherit (buildPackages) kmod; inherit modules; }; @@ -17446,6 +17453,8 @@ in cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + dablin = callPackage ../applications/radio/dablin { }; + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -19670,7 +19679,7 @@ in openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; - openscad = callPackage ../applications/graphics/openscad {}; + openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39d91233d393..f3e774b91e36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -502,6 +502,8 @@ in { diff_cover = callPackage ../development/python-modules/diff_cover { }; + diofant = callPackage ../development/python-modules/diofant { }; + docrep = callPackage ../development/python-modules/docrep { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -4009,6 +4011,8 @@ in { fixtures = callPackage ../development/python-modules/fixtures { }; + fipy = callPackage ../development/python-modules/fipy { }; + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; @@ -4274,6 +4278,8 @@ in { pyspread = callPackage ../development/python-modules/pyspread { }; + pysparse = callPackage ../development/python-modules/pysparse { }; + pyupdate = callPackage ../development/python-modules/pyupdate {}; pyx = callPackage ../development/python-modules/pyx { }; @@ -4450,6 +4456,8 @@ in { pyxattr = callPackage ../development/python-modules/pyxattr { }; + pyamg = callPackage ../development/python-modules/pyamg { }; + pyaml = callPackage ../development/python-modules/pyaml { }; pyyaml = callPackage ../development/python-modules/pyyaml { }; @@ -4680,6 +4688,8 @@ in { scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + scp = callPackage ../development/python-modules/scp {}; seaborn = callPackage ../development/python-modules/seaborn { }; @@ -5165,6 +5175,8 @@ in { swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + freezegun = callPackage ../development/python-modules/freezegun { }; taskw = callPackage ../development/python-modules/taskw { }; |