diff options
627 files changed, 7884 insertions, 11478 deletions
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 7cbac95f7d432..be5c7b7c8d162 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -25,14 +25,14 @@ avoided that by keeping all Haskell-related packages in a separate attribute set called `haskellPackages`, which the following command will list: ``` $ nix-env -f "<nixpkgs>" -qaP -A haskellPackages -haskellPackages.a50 a50-0.5 -haskellPackages.abacate haskell-abacate-0.0.0.0 -haskellPackages.abcBridge haskell-abcBridge-0.12 -haskellPackages.afv afv-0.1.1 -haskellPackages.alex alex-3.1.4 -haskellPackages.Allure Allure-0.4.101.1 -haskellPackages.alms alms-0.6.7 -[... some 8000 entries omitted ...] +haskellPackages.a50 a50-0.5 +haskellPackages.AAI AAI-0.2.0.1 +haskellPackages.abacate abacate-0.0.0.0 +haskellPackages.abc-puzzle abc-puzzle-0.2.1 +haskellPackages.abcBridge abcBridge-0.15 +haskellPackages.abcnotation abcnotation-1.9.0 +haskellPackages.abeson abeson-0.1.0.1 +[... some 14000 entries omitted ...] ``` To install any of those packages into your profile, refer to them by their @@ -101,19 +101,21 @@ to compile your Haskell packages with any GHC version you please. The following command displays the complete list of available compilers: ``` $ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler -haskell.compiler.ghc6104 ghc-6.10.4 -haskell.compiler.ghc6123 ghc-6.12.3 -haskell.compiler.ghc704 ghc-7.0.4 -haskell.compiler.ghc722 ghc-7.2.2 -haskell.compiler.ghc742 ghc-7.4.2 -haskell.compiler.ghc763 ghc-7.6.3 -haskell.compiler.ghc784 ghc-7.8.4 -haskell.compiler.ghc7102 ghc-7.10.2 -haskell.compiler.ghcHEAD ghc-7.11.20150402 -haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704 -haskell.compiler.ghcjs ghcjs-0.1.0 -haskell.compiler.jhc jhc-0.8.2 -haskell.compiler.uhc uhc-1.1.9.0 +haskell.compiler.ghc822 ghc-8.2.2 +haskell.compiler.integer-simple.ghc822 ghc-8.2.2 +haskell.compiler.ghc822Binary ghc-8.2.2-binary +haskell.compiler.ghc844 ghc-8.4.4 +haskell.compiler.ghc863Binary ghc-8.6.3-binary +haskell.compiler.ghc864 ghc-8.6.4 +haskell.compiler.integer-simple.ghc864 ghc-8.6.4 +haskell.compiler.ghc865 ghc-8.6.5 +haskell.compiler.integer-simple.ghc865 ghc-8.6.5 +haskell.compiler.ghc881 ghc-8.8.1 +haskell.compiler.integer-simple.ghc881 ghc-8.8.1 +haskell.compiler.ghcHEAD ghc-8.9.20190601 +haskell.compiler.integer-simple.ghcHEAD ghc-8.9.20190601 +haskell.compiler.ghcjs84 ghcjs-8.4.0.1 +haskell.compiler.ghcjs ghcjs-8.6.0.1 ``` We have no package sets for `jhc` or `uhc` yet, unfortunately, but for every diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6751d00f451a2..fd7d8e314c346 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4163,6 +4163,12 @@ githubId = 34086; name = "Marc Weber"; }; + marcus7070 = { + email = "marcus@geosol.com.au"; + github = "marcus7070"; + githubId = 50230945; + name = "Marcus Boyd"; + }; marenz = { email = "marenz@arkom.men"; github = "marenz2569"; @@ -4666,6 +4672,12 @@ githubId = 2881922; name = "Francis St-Amour"; }; + mtrsk = { + email = "marcos.schonfinkel@protonmail.com"; + github = "mtrsk"; + githubId = 16356569; + name = "Marcos Benevides"; + }; mredaelli = { email = "massimo@typish.io"; github = "mredaelli"; @@ -7652,4 +7664,10 @@ githubId = 50867187; name = "Rakesh Gupta"; }; + waiting-for-dev = { + email = "marc@lamarciana.com"; + github = "waiting-for-dev"; + githubId = 52650; + name = "Marc Busqué"; + }; } diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 873b8073fed9c..d0f62d05870a6 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -35,6 +35,7 @@ with lib; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + polkit = super.polkit.override { withGnome = false; }; })); }; } diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index 4eda3c5708da7..6aed485638ccf 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -66,7 +66,8 @@ in { if cfg.user == "roon-server" then { isSystemUser = true; description = "Roon Server user"; - groups = [ cfg.group "audio" ]; + group = cfg.group; + extraGroups = [ "audio" ]; } else {}; }; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index 5b58ea9b0c910..b837bf816a15a 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -137,7 +137,7 @@ in ]; services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries { - forwardZones = + forwardZonesRecurse = { bit = "127.0.0.1:${toString cfg.dns.port}"; dns = "127.0.0.1:${toString cfg.dns.port}"; }; diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index ebfdd9f35b72b..e55ea36337814 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -91,10 +91,18 @@ in { forwardZones = mkOption { type = types.attrs; + default = {}; + description = '' + DNS zones to be forwarded to other authoritative servers. + ''; + }; + + forwardZonesRecurse = mkOption { + type = types.attrs; example = { eth = "127.0.0.1:5353"; }; default = {}; description = '' - DNS zones to be forwarded to other servers. + DNS zones to be forwarded to other recursive servers. ''; }; @@ -158,7 +166,8 @@ in { webserver-port = cfg.api.port; webserver-allow-from = cfg.api.allowFrom; - forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones; + forward-zones-recurse = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZonesRecurse; export-etc-hosts = cfg.exportHosts; dnssec = cfg.dnssecValidation; serve-rfc1918 = cfg.serveRFC1918; diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 12a80a12d19f4..641cf9faadc97 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -214,17 +214,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # Reload the changed mount unit to force a remount. $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); - } elsif ($unit =~ /\.socket$/) { - my $unitInfo = parseUnit($newUnitFile); - # If a socket unit has been changed, the corresponding - # service unit has to be stopped before the socket can - # be restarted. The service will be started again on demand. - my $serviceUnit = $unitInfo->{'Unit'} // "$baseName.service"; - $unitsToStop{$serviceUnit} = 1; - $unitsToStop{$unit} = 1; - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $unit); - } elsif ($unit =~ /\.path$/ || $unit =~ /\.slice$/) { + } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 9bd147968e4b1..8dd5eafb0977c 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -1,6 +1,6 @@ # This test runs netdata and checks for data via apps.plugin -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "netdata"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ cransom ]; @@ -16,23 +16,22 @@ import ./make-test.nix ({ pkgs, ...} : { }; testScript = '' - startAll; + start_all() - $netdata->waitForUnit("netdata.service"); + netdata.wait_for_unit("netdata.service") # wait for the service to listen before sending a request - $netdata->waitForOpenPort(19999); + netdata.wait_for_open_port(19999) # check if the netdata main page loads. - $netdata->succeed("curl --fail http://localhost:19999/"); + netdata.succeed("curl --fail http://localhost:19999/") # check if netdata can read disk ops for root owned processes. # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. - my $cmd = <<'CMD'; - curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ - jq -e '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' - CMD - $netdata->waitUntilSucceeds($cmd); + url = "http://localhost:19999/api/v1/data\?chart=users.pwrites" + filter = '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + cmd = f"curl -s {url} | jq -e '{filter}'" + netdata.wait_until_succeeds(cmd) ''; }) diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 64de722afe9ea..428490e119a62 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,5 @@ - { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 - , lv2, pkgconfig, libGLU_combined }: +{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 +, lv2, pkgconfig, libGLU, libGL }: stdenv.mkDerivation { version = "0.9.0"; @@ -15,7 +15,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2 + freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index d31bc981e0cbf..5bad5453504fa 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: +{ stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }: stdenv.mkDerivation rec { pname = "jack_oscrolloscope"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libjack2 libGLU_combined ]; + buildInputs = [ SDL libjack2 libGLU libGL ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index a2368017cc1ed..12383dcbbda4a 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, lv2, libGLU_combined, gtk2, cairo, pango, fftwFloat, libjack2 }: +, lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }: let version = "0.9.10"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftwFloat libjack2 ]; + buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ]; srcs = [ src robtkSrc ]; sourceRoot = name; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 9a273299297ef..1e8d73ce560f0 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }: stdenv.mkDerivation rec { pname = "mpc"; - version = "0.31"; + version = "0.33"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "mpc"; rev = "v${version}"; - sha256 = "06wn5f24bgkqmhh2p8rbizmqibzqr4x1q7c6zl0pfq7mdy49g5ds"; + sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx"; }; - buildInputs = [ mpd_clientlib ]; + buildInputs = [ mpd_clientlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 448b219a1afaa..fee456ae717ca 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: +{ stdenv, fetchurl, alsaLib, cmake, libGLU, libGL, makeWrapper, qt4 }: stdenv.mkDerivation { pname = "pianobooster"; @@ -16,12 +16,13 @@ stdenv.mkDerivation { preConfigure = "cd src"; - buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ]; + buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ]; NIX_LDFLAGS = [ "-lGL" "-lpthread" ]; postInstall = '' wrapProgram $out/bin/pianobooster \ - --prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib + --prefix LD_LIBRARY_PATH : ${libGL}/lib \ + --prefix LD_LIBRARY_PATH : ${libGLU}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index dc1118f47e044..b40ab6d4f7a5e 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1iibkvwpj862wcrl0fmyi6qhcgx4q5ay63yr0zyg0bkqgcka0gpr"; + sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 3b780ee2b3622..236c42b529305 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "5.984"; + version = "5.987"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "01yy0s9b9mkl6v66vgdfxl2zhr36abridih1d4ajbrdn60vppykw"; + sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 6d5944b7aff2c..5a90ee659478b 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, libGLU_combined, pkgconfig, ttf_bitstream_vera +, libGLU, libGL, pkgconfig, ttf_bitstream_vera }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined + alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 32cfd0f749404..f95655f5e9a35 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }: +{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sourceRoot = src.name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ]; + buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; sisco_VERSION = version; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 30ff41da36958..5b5f01eef5cc8 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -11,7 +11,7 @@ , boost , ecasound , glibcLocales -, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation { @@ -33,7 +33,7 @@ stdenv.mkDerivation { LC_ALL = "en_US.UTF-8"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 2) Make it find ecasound headers diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 606abc86ae284..bd4aaf5a2d630 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1bbh9df4gfgb5pqavgvmy8fqnr2j5rbqbanv0y31j4i0kv2wrh6a"; + sha256 = "10wrlfi50lsf6qjsi9qklw2mk2fbf0jib7f841v842l9k9zw0hrg"; }; - cargoSha256 = "1rb4dl9zn3xx2yrapx5cfsli93ggmdq8w9fqi8cy8giyja1mnqfl"; + cargoSha256 = "140m3pryvbc96xvl5ymz68msrx93rmvvy0y8skvc40yxwl401inc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig python3 ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optional stdenv.isLinux libxcb + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; meta = with stdenv.lib; { description = "Spotify for the terminal written in Rust"; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 315bb624e5176..bf17798531bab 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "1kqx0q99n1p5pm6skvqjihz11byhxdid1qw6gqp67dh2na62z1lm"; + sha256 = "113z2qdcg0fm6ff2k36nl5zbbj5wsidl94ca1sfnsv9bq9lkvck5"; }; buildInputs = [ @@ -93,7 +93,7 @@ mkDerivation rec { changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - # upstream says darwin should work but they lack maintainers as of 0.6.5 + # upstream says darwin should work but they lack maintainers as of 0.6.6 platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index b8acaa5a7e497..6b6963ea471ac 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL minixml zlib xorg.libpthreadstubs pcre ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index eeeb8ae2ea449..a8236b4b60f14 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ stdenv, fetchgit , boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation { pname = "zam-plugins"; @@ -12,16 +12,18 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; + buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; - patchPhase = '' + postPatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder ''out''}" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://www.zamaudio.com/?p=976; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c9bd1d089ca2b..5c796e71fdfe6 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0wyyr6r0jzb1l4rn1mfgp0nnzvgk3x62imq629z6vrdbymy8psf1"; }; latestVersion = { # canary & dev - version = "4.0.0.3"; # "Android Studio 4.0 Canary 3" - build = "192.5994236"; - sha256Hash = "14ig352anjs0df72f41v4r6jl7mlm2n4pn9syanmykaj87dm4kf4"; + version = "4.0.0.4"; # "Android Studio 4.0 Canary 4" + build = "192.6008643"; + sha256Hash = "1z1srginlg1xnp911nlilhf515mbpmngwhln29q6lxsir8g2cw2z"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index a106c31667470..9d0d91f4be549 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: - alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined + alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL , openssl, xorg, zlib }: @@ -56,7 +56,7 @@ in $out/kodestudio patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index e98759edd151a..2c36be1c21bcc 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mle"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "adsr"; repo = "mle"; rev = "v${version}"; - sha256 = "15i5lzcp0zar2zh34ky9m6pvvi41zgdrl3hmylpgsqnnj4r87vqc"; + sha256 = "053zvxkjx2zwq6lwkycirxz1m9sjc3zi9ic8fvp3mjvbqfri1y3x"; }; # Fix location of Lua 5.3 header and library diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 11a5b4c7ba344..6bb40f0166d1f 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.11.1"; + version = "2.14"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1"; + sha256 = "1xs2wvm9g8vypz25li7rm8m0j4dsdpqpajcvrc756x5m149dxc08"; }; # We have not packaged tests. @@ -35,7 +35,7 @@ buildPythonApplication rec { strictDeps = false; meta = with lib; { - homepage = http://rednotebook.sourceforge.net/; + homepage = "https://rednotebook.sourceforge.io/"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; license = licenses.gpl2; maintainers = with maintainers; [ orivej tstrobel ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index fa9cc155f36a8..e66530aaf769c 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.2.5"; + version = "1.3.1"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0sz8klz0nz60dhvz7pdn44zwr9q578pq50sxsbynz7irhrv02b52"; + sha256 = "1vhg8m1b7ccccrzlp0pyf3qskgvlf6sn1w956zsczmndrixbli9a"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 04e64b76d3f8f..5966d6427ed61 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libpng, python3 -, libGLU_combined, qtbase, wrapQtAppsHook, ncurses +, libGLU, libGL, qtbase, wrapQtAppsHook, ncurses , cmake, flex, lemon }: @@ -29,7 +29,7 @@ in buildInputs = [ libpng python3 python3.pkgs.boost - libGLU_combined qtbase wrapQtAppsHook + libGLU libGL qtbase wrapQtAppsHook ncurses ]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 57cf6c3f13f49..2b70ea3b45072 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11, pythonPackages, gettext, intltool, babl, gegl, glib, makedepend, xorgproto, libXmu, openexr, - libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : + libGLU, libGL, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : let inherit (pythonPackages) python pygtk; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib libX11 python pygtk gettext intltool babl - gegl glib makedepend xorgproto libXmu openexr libGLU_combined + gegl glib makedepend xorgproto libXmu openexr libGLU libGL libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix new file mode 100644 index 0000000000000..32d079d85ff38 --- /dev/null +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -0,0 +1,57 @@ +{ lib +, mkDerivationWith +, python3Packages +, fetchFromGitHub +}: + +mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "cq-editor"; + version = "0.1RC1"; + + src = fetchFromGitHub { + owner = "CadQuery"; + repo = "CQ-editor"; + rev = version; + sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax"; + }; + + propagatedBuildInputs = with python3Packages; [ + cadquery + Logbook + pyqt5 + pyparsing + pyqtgraph + spyder + pathpy + qtconsole + requests + ]; + + postFixup = '' + wrapQtApp "$out/bin/cq-editor" + ''; + + checkInputs = with python3Packages; [ + pytest + pytest-xvfb + pytest-mock + pytestcov + pytest-repeat + pytest-qt + ]; + + checkPhase = '' + pytest --no-xvfb + ''; + + # requires X server + doCheck = false; + + meta = with lib; { + description = "CadQuery GUI editor based on PyQT"; + homepage = "https://github.com/CadQuery/CQ-editor"; + license = licenses.asl20; + maintainers = with maintainers; [ costrouc marcus7070 ]; + }; + +} diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index e59d14f7dd6ee..144c723da20f0 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, +{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU, libGL, xdg_utils, dbus, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, @@ -71,7 +71,7 @@ stdenv.mkDerivation { sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx"; }; - libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils + libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU libGL xdg_utils dbus alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 562fb8c11dc39..d8b08faf23982 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk libGLU_combined ctl ]; + buildInputs = [ openexr fltk libGLU libGL ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 0bd3421f1b10f..57321220fb144 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng, +{ stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, libXxf86vm }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng + buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng libXxf86vm ]; postPatch = '' diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index d7c0f0e0a0cf0..f0057f3a1a884 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb"; + sha256 = "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index d7888da15ef6c..8f7800a7323a6 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi -, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib +, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg - libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra + libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra wxGTK zlib ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 1487fb8adbac4..317987d8d9110 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc -, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ]; buildInputs = [ - libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng + libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng boost cairomm imagemagick libjpeg libtiff ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu ]; diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index f94e4ad698e18..47a0687e79daf 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -3,7 +3,7 @@ , alsaLib , glib , gst_all_1 -, libGLU_combined +, libGLU, libGL , xorg }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - libGLU_combined + libGLU libGL xorg.libX11 ]; in '' diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 69cc323b40f4c..bbd2f0b59298e 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "1kasp9as81wjvys9qrx10mgdf9bjbdgryhdgjqn05zdmv2rs95nc"; + sha256 = "0v3k33jb0glb30jdhq3c732a9dxvnidaclz6b2wpqwik8l3658mj"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9f7fbc8421ba3..2c95f6d403f2c 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -7,7 +7,7 @@ , flex , eigen , boost -, libGLU_combined +, libGLU, libGL , glew , opencsg , cgal @@ -44,7 +44,7 @@ mkDerivation rec { 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 + ] ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras ; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index fdda8062a4334..1a47a35574938 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -,qtbase, qttools, python, libGLU_combined +,qtbase, qttools, python, libGLU, libGL ,libXt, qtx11extras, qtxmlpatterns , mkDerivation }: @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ python python.pkgs.numpy - libGLU_combined + libGLU libGL libXt qtbase qtx11extras diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b671663db8e8b..8c4833be3e6cf 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages +, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages , openvdb, libXxf86vm, tbb , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender - freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal + freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU libGL openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) openvdb libXxf86vm tbb diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 22ae573353ea7..9701db3c0b791 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with pypkgs; [ - apsw cssselect css-parser dateutil dnspython html5-parser lxml markdown netifaces pillow + apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow python pyqt5_with_qtwebkit sip regex msgpack beautifulsoup4 html2text # the following are distributed with calibre, but we use upstream instead diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 0e9ff40cffa41..dae25f6b8176f 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -13,7 +13,7 @@ , miniupnpc , libmicrohttpd , gmp -, libGLU_combined +, libGLU, libGL , extraCmakeFlags ? [] }: stdenv.mkDerivation rec { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { miniupnpc libmicrohttpd gmp - libGLU_combined + libGLU libGL ]; dontStrip = true; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 961efe4b05766..181273752ea87 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv +{ stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11 , zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: @@ -20,7 +20,7 @@ let libICE libXi libXv - libGLU_combined + libGLU libGL libXrender libXrandr libXfixes diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index c197e1a8fd380..3ee4fd8259a9e 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: +{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }: let - lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; + lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ]; in stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6701c910a1fcc..06fc04ba8fb46 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -34,13 +34,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "053z6mzcn22w3vkf09i7kdi5p0c6zcd9g62v3p5i3yhd14cgviqr"; + sha256 = "0dkya9smx81c5cgcwk2gi2m1pabfff1v9gd3ngl42sdvyb63wgdq"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch index 8217b5ef51a60..92a652588550a 100644 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -1,11 +1,11 @@ --- a/setup.py +++ b/setup.py -@@ -212,7 +212,7 @@ +@@ -217,7 +217,7 @@ def init_env( cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ).format( + float_conversion, std, optimize, - ' '.join(sanitize_args), diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 2c2acb6a74344..25f9b10b1e859 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, -libGLU_combined, freetype, xclip, inotify-tools, procps }: +libGLU, libGL, freetype, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml mupdf libX11 libGLU_combined freetype ]; + buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ]; dontStrip = true; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 3023a5b5930ca..e643c212225b6 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebkit }: +, qtbase, qtsvg, qtwebview, qtwebkit }: stdenv.mkDerivation rec { pname = "merkaartor"; - version = "0.18.3"; + version = "unstable-2019-11-12"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = version; - sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; + rev = "29b3388680a03f1daac0037a2b504ea710da879a"; + sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; }; nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; - buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; + buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 303b9fe5e8bce..0c8ad9ae1b3cb 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.8.8"; + version = "3.8.9"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; + sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -86,8 +86,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Multi Lingual TERMinal emulator on X11"; homepage = http://mlterm.sourceforge.net/; - license = licenses.bsd2; + license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 4d95f0b523888..29e768c257f10 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 -, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib +, SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib , librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc , gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 fontconfig freetype imlib2 libGLU_combined freeimage + gtk2 fontconfig freetype imlib2 libGLU libGL freeimage libxslt libXmu freeglut python gettext quesoglc gd fribidi pcre dbus dbus-glib librsvg shapelib glib cairo gdk-pixbuf pango atk diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index b8b6e42d5cf54..e943263600cda 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }: +{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { install -Dm644 reference.brf $out/share/openBrf/reference.brf patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \ $out/share/openBrf/openBrf mkdir -p "$out/bin" diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 1256bb96608fe..f185524da5875 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, git, gnupg, pass, pwgen +, git, gnupg, pass, pwgen, qrencode , qtbase, qtsvg, qttools, qmake }: @@ -14,6 +14,11 @@ mkDerivation rec { sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x"; }; + postPatch = '' + substituteInPlace src/qtpass.cpp \ + --replace "/usr/bin/qrencode" "${qrencode}/bin/qrencode" + ''; + buildInputs = [ git gnupg pass qtbase qtsvg ]; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 6a5e62f54e1e5..fb1b59ed01fa3 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.30"; + version = "1.31"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v"; + sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 265c4c173fc6d..037d6be229917 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "17bgz1rpix1zgzzn4zz84jp7hl6b2k968h918y3av5asxn0mji49"; + sha256 = "0w6vbrp44l25jhv3kx1m0841rkv7im30581gds0qb7lhyqm0hnbg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index aff4d54c6206a..902357fb90e3e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL +, libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jdk @@ -123,7 +123,7 @@ let utillinux alsaLib bison gperf kerberos glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libGLU_combined + libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jdk.jre ] ++ optional gnomeKeyringSupport libgnome-keyring3 diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 537a30c01a2e2..c9dbe6ba4b96f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -32,7 +32,7 @@ , libgnomeui , libnotify , gnome3 -, libGLU_combined +, libGLU, libGL , nspr , nss , pango @@ -126,7 +126,7 @@ stdenv.mkDerivation { libgnome libgnomeui libnotify - libGLU_combined + libGLU libGL nspr nss pango diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1c6ddfc99eb6e..6c49c00ca6cf3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,7 +7,7 @@ { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, libGLU_combined, sqlite, unzip, makeWrapper +, yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { gtk2 perl zip libIDL libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - libnotify xorg.pixman yasm libGLU_combined + libnotify xorg.pixman yasm libGLU libGL xorg.libXScrnSaver xorg.xorgproto xorg.libXext sqlite unzip makeWrapper libevent libstartup_notification libvpx /* cairo */ diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix deleted file mode 100644 index 6ab5337631099..0000000000000 --- a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, gcc7, pkg-config -, next -, webkitgtk, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "next-gtk-webkit"; - inherit (next) src version; - - makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ]; - installTargets = "install-gtk-webkit"; - - nativeBuildInputs = [ gcc7 pkg-config ]; - buildInputs = [ - webkitgtk - gsettings-desktop-schemas - ]; - meta = with stdenv.lib; { - description = "Infinitely extensible web-browser (user interface only)"; - homepage = https://next.atlas.engineer; - license = licenses.bsd3; - maintainers = [ maintainers.lewo ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index 9b537c5533767..97c65fc12ef5c 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -1,86 +1,90 @@ -{ pkgs, stdenv, fetchFromGitHub -, gcc7, pkg-config, makeWrapper -, glib-networking -, next-gtk-webkit +{ stdenv +, fetchFromGitHub , lispPackages , sbcl +, callPackage }: -stdenv.mkDerivation rec { - pname = "next"; - version = "1.3.4"; +let + + # This is the wrapped webkitgtk platform port that we hardcode into the Lisp Core. + # See https://github.com/atlas-engineer/next/tree/master/ports#next-platform-ports + next-gtk-webkit = callPackage ./next-gtk-webkit.nix {}; - src = fetchFromGitHub { - owner = "atlas-engineer"; - repo = "next"; - rev = version; - sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"; - }; +in + +stdenv.mkDerivation rec { + pname = "next"; + version = "1.3.4"; - # Stripping destroys the generated SBCL image - dontStrip = true; + src = fetchFromGitHub { + owner = "atlas-engineer"; + repo = "next"; + rev = version; + sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"; + }; - prePatch = '' - substituteInPlace source/ports/gtk-webkit.lisp \ - --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" - ''; + nativeBuildInputs = [ + sbcl + ] ++ (with lispPackages; [ + prove-asdf + trivial-features + ]); - nativeBuildInputs = - [ sbcl makeWrapper ] ++ (with lispPackages; - [ prove-asdf trivial-features ]); + buildInputs = with lispPackages; [ + alexandria + bordeaux-threads + cl-annot + cl-ansi-text + cl-css + cl-hooks + cl-json + cl-markup + cl-ppcre + cl-ppcre-unicode + cl-prevalence + closer-mop + dbus + dexador + ironclad + local-time + log4cl + lparallel + mk-string-metrics + parenscript + quri + sqlite + str + swank + trivia + trivial-clipboard + unix-opts + ]; - buildInputs = with lispPackages; [ - alexandria - bordeaux-threads - cl-annot - cl-ansi-text - cl-css - cl-hooks - cl-json - cl-markup - cl-ppcre - cl-ppcre-unicode - cl-prevalence - closer-mop - dbus - dexador - ironclad - local-time - log4cl - lparallel - mk-string-metrics - parenscript - quri - sqlite - str - swank - trivia - trivial-clipboard - unix-opts - ]; - propagatedBuildInputs = [ next-gtk-webkit ]; + prePatch = '' + substituteInPlace source/ports/gtk-webkit.lisp \ + --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" + ''; - buildPhase = '' - common-lisp.sh --eval "(require :asdf)" \ - --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \ - --eval '(asdf:make :next)' \ - --quit - ''; + buildPhase = '' + common-lisp.sh --eval "(require :asdf)" \ + --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \ + --eval '(asdf:make :next)' \ + --quit + ''; - installPhase = '' - install -D -m0755 next $out/bin/next - ''; + installPhase = '' + install -D -m0755 next $out/bin/next + ''; - preFixup = '' - wrapProgram $out/bin/next \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" - ''; + # Stripping destroys the generated SBCL image + dontStrip = true; - meta = with stdenv.lib; { - description = "Infinitely extensible web-browser (with Lisp development files)"; - homepage = https://next.atlas.engineer; - license = licenses.bsd3; - maintainers = [ maintainers.lewo ]; - platforms = [ "x86_64-linux" ]; - }; - } + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix new file mode 100644 index 0000000000000..a71583ffbec59 --- /dev/null +++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -0,0 +1,50 @@ +# https://github.com/atlas-engineer/next/tree/master/ports/gtk-webkit + +{ stdenv +, pkg-config +, next +, webkitgtk +, gtk3 +, glib +, gsettings-desktop-schemas +, glib-networking +, gst_all_1 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "next-gtk-webkit"; + inherit (next) src version; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gtk3 + webkitgtk + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + ]; + + makeFlags = [ + "gtk-webkit" + "PREFIX=${placeholder "out"}" + ]; + + installTargets = [ + "install-gtk-webkit" + ]; + + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (user interface only)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index f68f34c68e5db..c1ede5044492b 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "64.0.3417.83"; + version = "65.0.3467.48"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "09ygnfma5ncx6y8yr6dm3hz98cd9srv6687wgs786dw5glfhsd57"; + sha256 = "0vcpq2p8si6rlyvd8nzs0a7pjxks2qn8i8czna968wyfxlczckyr"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 07234f59a8eda..05262b0cf5085 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -3,7 +3,7 @@ , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, makeWrapper -, libGLU_combined, perl, python, libpulseaudio +, libGLU, libGL, perl, python, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib }: @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { buildInputs = [ alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify - libstartup_notification makeWrapper libGLU_combined perl + libstartup_notification makeWrapper libGLU libGL perl pkgconfig python libpulseaudio unzip wget which yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 169b88f271858..2bb592bfb42c1 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "rssguard"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qtwebengine qttools ]; - nativeBuildInputs = [ qmake wrapGAppsHook ]; + nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix new file mode 100644 index 0000000000000..e03bdd9909e8f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -0,0 +1,21 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +locpkgs = +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; + globalBuildInputs = [ + locpkgs.node-pre-gyp + ]; +}; +in locpkgs diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix new file mode 100644 index 0000000000000..633219626b68f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgs }: +(import ./composition.nix { + inherit pkgs; + inherit (stdenv.hostPlatform) system; +})."package".override { + postInstall = '' + mkdir "$out/bin" + echo '#!/bin/sh' >> "$out/bin/matrix-recorder" + echo "'${pkgs.nodejs-12_x}/bin/node'" \ + "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \ + '"$@"' >> "$out/bin/matrix-recorder" + echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html" + echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html" + echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html" + echo "'${pkgs.nodejs-12_x}/bin/node'" \ + "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ + '.' >> "$out/bin/matrix-recorder-to-html" + chmod a+x "$out/bin/matrix-recorder" + chmod a+x "$out/bin/matrix-recorder-to-html" + ''; + meta = { + description = "Matrix message recorder"; + homepage = "https://gitlab.com/argit/matrix-recorder/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix new file mode 100644 index 0000000000000..670556bf271af --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -0,0 +1,540 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <<EOF + #! ${stdenv.shell} -e + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore + EOF + + chmod +x $out/bin/tar + ''; + + # Function that generates a TGZ file from a NPM project + buildNodeSourceDist = + { name, version, src, ... }: + + stdenv.mkDerivation { + name = "node-tarball-${name}-${version}"; + inherit src; + buildInputs = [ nodejs ]; + buildPhase = '' + export HOME=$TMPDIR + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + ''; + installPhase = '' + mkdir -p $out/tarballs + mv $tgzFile $out/tarballs + mkdir -p $out/nix-support + echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + 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. + } + + 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)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + 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 + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <<EOF + #! ${stdenv.shell} -e + $shellHook + exec ${stdenv.shell} + EOF + chmod +x $out/bin/shell + ''; + + # Provide the dependencies in a development shell through the NODE_PATH environment variable + inherit nodeDependencies; + shellHook = stdenv.lib.optionalString (dependencies != []) '' + export NODE_PATH=$nodeDependencies/lib/node_modules + export PATH="$nodeDependencies/bin:$PATH" + ''; + }; +in +{ + buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; + buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; + buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix new file mode 100644 index 0000000000000..012ad195a71b9 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix @@ -0,0 +1,1426 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "ajv-6.10.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + }; + }; + "another-json-0.2.0" = { + name = "another-json"; + packageName = "another-json"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz"; + sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.9.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "browser-request-0.3.3" = { + name = "browser-request"; + packageName = "browser-request"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; + sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chownr-1.1.3" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; + sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "fs-minipass-1.2.7" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "graceful-fs-4.2.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-walk-3.0.3" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; + sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "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"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "marked-0.6.3" = { + name = "marked"; + packageName = "marked"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz"; + sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; + }; + }; + "matrix-js-sdk-0.7.13" = { + name = "matrix-js-sdk"; + packageName = "matrix-js-sdk"; + version = "0.7.13"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.7.13.tgz"; + sha1 = "283accc710009f5a0b02367682f2e86155fd00c4"; + }; + }; + "mime-db-1.42.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.42.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; + }; + }; + "mime-types-2.1.25" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "minipass-2.9.0" = { + name = "minipass"; + packageName = "minipass"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + }; + }; + "minizlib-1.3.3" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mustache-2.3.2" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz"; + sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "needle-2.4.0" = { + name = "needle"; + packageName = "needle"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + }; + }; + "node-fetch-1.7.3" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; + sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; + }; + }; + "node-localstorage-1.3.1" = { + name = "node-localstorage"; + packageName = "node-localstorage"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-localstorage/-/node-localstorage-1.3.1.tgz"; + sha512 = "NMWCSWWc6JbHT5PyWlNT2i8r7PgGYXVntmKawY83k/M0UJScZ5jirb61TLnqKwd815DfBQu+lR3sRw08SPzIaQ=="; + }; + }; + "node-pre-gyp-0.11.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; + sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; + }; + }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; + "npm-bundled-1.0.6" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; + }; + }; + "npm-packlist-1.4.6" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz"; + sha512 = "u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + 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"; + }; + }; + "olm-https://packages.matrix.org/npm/olm/olm-2.3.0.tgz" = { + name = "olm"; + packageName = "olm"; + version = "2.3.0"; + src = fetchurl { + name = "olm-2.3.0.tar.gz"; + url = https://packages.matrix.org/npm/olm/olm-2.3.0.tgz; + sha256 = "1f0f037a025a44509646cb849ded7c1a1f55e7bfed240fad19676c002fcd953a"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "psl-1.4.0" = { + name = "psl"; + packageName = "psl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + 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=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "sqlite3-4.1.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz"; + sha512 = "RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw=="; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "tar-4.4.13" = { + name = "tar"; + packageName = "tar"; + version = "4.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + }; + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.1.3" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-3.2.6" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.6" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."needle-2.4.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.6" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."rimraf-2.7.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.1.1" + ]; + buildInputs = []; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + args = { + name = "matrix-recorder"; + packageName = "matrix-recorder"; + version = "0.0.6"; + src = fetchgit { + url = "https://gitlab.com/argit/matrix-recorder/"; + rev = "006b78c8a4ddc636be8f6f1e3875b13a4a6d2c7c"; + sha256 = "0m3kzwbrxymwl6hr981q6fsf752fqxwzbpxryx25j4lkwc23nmj3"; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ajv-6.10.2" + sources."another-json-0.2.0" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + 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.9.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."brace-expansion-1.1.11" + sources."browser-request-0.3.3" + sources."caseless-0.12.0" + sources."chownr-1.1.3" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."debug-3.2.6" + sources."deep-extend-0.6.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."ecc-jsbn-0.1.2" + sources."encoding-0.1.12" + 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."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."graceful-fs-4.2.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."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."is-stream-1.1.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."jsprim-1.4.1" + sources."marked-0.6.3" + sources."matrix-js-sdk-0.7.13" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.1" + sources."ms-2.1.2" + sources."mustache-2.3.2" + sources."nan-2.14.0" + sources."needle-2.4.0" + sources."node-fetch-1.7.3" + sources."node-localstorage-1.3.1" + sources."node-pre-gyp-0.11.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.6" + 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."olm-https://packages.matrix.org/npm/olm/olm-2.3.0.tgz" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."psl-1.4.0" + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.2" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."request-2.88.0" + sources."rimraf-2.7.1" + sources."safe-buffer-5.2.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."slide-1.1.6" + sources."sqlite3-4.1.0" + 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."strip-json-comments-2.0.1" + sources."tar-4.4.13" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.3" + sources."verror-1.10.0" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."write-file-atomic-1.3.4" + sources."yallist-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A recorder that can record Matrix rooms you are a member of (including E2E-encrypted rooms)."; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +in +{ + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + inherit node-pre-gyp; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json b/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json new file mode 100644 index 0000000000000..fc03d636ad214 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/package.json @@ -0,0 +1,27 @@ +{ + "name": "matrix-recorder", + "version": "0.0.6", + "description": "A recorder that can record Matrix rooms you are a member of (including E2E-encrypted rooms).", + "author": "Hello Matrix <hello@hello-matrix.net>", + "main": "matrix-recorder.js", + "scripts": { + "start": "node matrix-recorder.js" + }, + "repository": { + "type": "git", + "url": "https://gitlab.com/argit/matrix-recorder.git" + }, + "dependencies": { + "marked": "^0.6.2", + "matrix-js-sdk": "^0.7.13", + "mime-types": "^2.1.14", + "mustache": "^2.3.0", + "node-fetch": "^1.6.3", + "node-localstorage": "^1.3.0", + "sqlite3": "^4.0.7", + "olm": "https://packages.matrix.org/npm/olm/olm-2.3.0.tgz" + }, + "license": "MIT", + "optionalDependencies": { + } +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index eee5fd82bba7e..8b1f4d4c0e94e 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.1.7"; + version = "1.2.0"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as"; + sha256 = "189rpsrs25c4100xf1zhcwvdyigbzsw8ffhayj8mmrx4akg39653"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 30012970d7898..3338f6159d92a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.0", + "version": "1.5.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 5dc61ff5cc8b0..c3fe4b9dd3318 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.0"; + version = "1.5.5"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557"; + sha256 = "18xhqniwxp1sv49qcd9ah8nyy2n2yliy3wg613raxjl16qvvzxmc"; }; in mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ccfad7259a5d8..93c3d837b050e 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.0"; + version = "1.5.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94"; + sha256 = "0isln25sl5jvvlqvh822w73a4i82x75g1ywf3p9n5m1a5sr9f537"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 027b5b5805cbf..c821c4b0f44e4 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.3"; + version = "0.6.5"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59"; + sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv"; }; buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 1b3e1c8ad81a6..acdec1dc99c9a 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,6 +1,6 @@ {fetchurl, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: stdenv.mkDerivation { @@ -32,7 +32,7 @@ stdenv.mkDerivation { libpulseaudio libxml2 libxslt - libGLU_combined + libGLU libGL nspr nss openssl diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 4305294297aac..79110ac37b2b7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20191111"; + version = "20191129"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "16xr7wdmjw0i72xbnyyh098wx4cr0m8w2cr1szdi1b14p4kpgr67"; + sha256 = "1zwnap307qzjkfcap0rxgwwmis77lhr7js4avig0qdqnmqbdlgbh"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ad98cd660d9cf..6cdbe4d58adaa 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -34,7 +34,7 @@ , libgnome , libgnomeui , gnome3 -, libGLU_combined +, libGLU, libGL , nspr , nss , pango @@ -116,7 +116,7 @@ stdenv.mkDerivation { libcanberra-gtk2 libgnome libgnomeui - libGLU_combined + libGLU libGL nspr nss pango diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index a4edc76caca04..78ed553ccd873 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs , libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, libGLU_combined, sqlite, zip, unzip +, yasm, libGLU, libGL, sqlite, zip, unzip , libevent, libstartup_notification , icu, libpng, jemalloc , autoconf213, which, m4, fetchpatch @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { [ gtk2 zip libIDL libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr nss libnotify xorg.pixman yasm libGLU_combined + nspr nss libnotify xorg.pixman yasm libGLU libGL xorg.libXScrnSaver xorg.xorgproto xorg.libXext sqlite unzip libevent libstartup_notification /* cairo */ diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 6274c1c345d4c..d54e8eca78e4a 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quiterss"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = version; - sha256 = "0zr17r33g99ylvb1avcbixg2jiwisaks4x91lywv2dy3g6dkpxml"; + sha256 = "1dmfag5hmy4jac20nizwgd92w8h2hdl2ch57hvw5hmjyfckn9rpj"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 55bdced74b52b..68babaddd1bc8 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig -, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib }: +, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }: stdenv.mkDerivation rec { @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; }; + patches = [ + (fetchpatch { + url = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/0f5cc8a9942e220ea0f7d0b17db4a78d094e3b65.patch"; + sha256 = "195rsjpbc0gzmr9bycvq4mra7abp3hd9by3a5vvcmxsh5ipikycf"; + }) + ]; + preConfigure = "./autogen.sh"; nativeBuildInputs= [ diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 0f4272985d006..03a2ef9551bbe 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem -, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg +, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg , lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome , pulseaudio }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango - gnome2.gtkglext libGLU_combined freetype fontconfig + gnome2.gtkglext libGLU libGL freetype fontconfig pangox_compat polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 51ef4eb9d24ec..42f75560a5abf 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient +, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -365,7 +365,7 @@ in stdenv.mkDerivation rec { hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer + libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sane-backends unzip vigra which zip zlib diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index fc984d39e27b4..c42820e611483 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient +, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -362,7 +362,7 @@ in stdenv.mkDerivation rec { hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer + libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl poppler python3 sane-backends unzip vigra which zip zlib diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 34dace1cadb0a..8ebf0e666ffea 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -25,7 +25,7 @@ , libXt , libnotify , gnome3 -, libGLU_combined +, libGLU, libGL , nspr , nss , pango @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { libXrender libXt libnotify - libGLU_combined + libGLU libGL nspr nss pango diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index f45e695486d88..530008702f10d 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tlf"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "0gniysjm8aq5anq0a0az31vd6h1vyg56bifc7rpf53lsh9hkzmgc"; + sha256 = "0f97hxiwc6blp5haik871q6zzvwy0b3p2jg8ad2dvaxg07xc76l0"; }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index d4056dca7bf70..eea9bb9027cab 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1c87lff9bqhf574420ycqz88x6ad5hmy36wrb8pi0dqd1s1d72qb"; + sha256 = "0vwc1jw1fjirdpavrnvc95bql8023ayrz9srbwn0p6n0ia038948"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index e3ceffd34c199..e72354c86585f 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, libGLU_combined, pkgconfig, perl, autoreconfHook +, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook }: let @@ -44,7 +44,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua perl autoreconfHook ]; patchPhase = '' diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 03d0018f237b5..15f72938effe5 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; - buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; + buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; nativeBuildInputs = [ autoconf automake ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 59c6a02d3494f..1c193c37cb35e 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv +, cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook }: @@ -18,7 +18,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; buildInputs = [ - freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools + freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools qtmultimedia qtlocation qtbase ]; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index de93ae5d78291..1a6555e0d6342 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.46.0"; + version = "0.46.1"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9"; + sha256 = "09ldgy70wziw51ma4a3b7vyrphzf2v1cnq1j5r1wwgfmx8fgbh2z"; }; nativeBuildInputs = [ autoconf cmake ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 5a9cb5de528e8..a67653c843737 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.21.1"; + version = "2.21.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0knfx0by7rml19kr5ynb7860iykij1z1mx2hx0bg3s287sld1ppl"; + sha256 = "0s1gn2bkya41866kd8zj0g8xjbivs763jqmlzdpjz4c25h6xkhns"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index a569b82ff59df..6aca678480dae 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; - buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ]; + buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; nativeBuildInputs = [ cmake pkgconfig doxygen ]; - NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h"; + NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; patches = [ (fetchurl { diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 64c1c3daba82c..9b52e8c505192 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.102"; + version = "3.3.103"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz"; - sha256 = "1izyfx6b1n9nr08c7q0gkgcf0q04bb4qz92ckwh74n5l5nwprfw0"; + sha256 = "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 5d069c5a219fd..6b0c998d751a1 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU_combined, zlib +{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU, libGL, zlib , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp , wrapGAppsHook @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ pythonPackages.wxPython ]; buildInputs = [ - libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs + libGLU libGL zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs cairo curl openssl boost swig (python.withPackages (ps: with ps; [ wxPython ])) ] ++ optional (oceSupport) opencascade diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 5310da0699e2e..df0d9932b8a0a 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -1,4 +1,4 @@ -{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib +{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ - libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs + libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost ] ++ optional (oceSupport) opencascade ++ optional (ngspiceSupport) libngspice diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 7514aed9f243a..93d99928d7d33 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex -, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined +, netpbm, imagemagick, dbus, xlibsWrapper, libGLU, libGL , shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper - libGLU_combined tcl shared-mime-info tk + libGLU libGL tcl shared-mime-info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index b59f628dfe9f0..98deda0ae6b29 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.020"; + version = "4.022"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "06n3vds762vza4byrav0j3kp3aivvadndkgw7nirvasclp19zmxb"; + sha256 = "1sj0qzl387pl2ygii3ssx35c3m601nb07j16lqj5zcxzhcg62i9p"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 93212c5b8546a..a479e31e33955 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}: +{stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}: stdenv.mkDerivation rec { version = "201707"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake libGLU_combined qt5.qtbase boost ]; + buildInputs = [ cmake libGLU libGL qt5.qtbase boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 90b1b367a7c4d..862761fe6fb53 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack , gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null }: -assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; +assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { (stdenv.lib.getLib gfortran.cc) liblapack ] ++ stdenv.lib.optionals enableGUI [ - libGLU_combined fltk xorg.libX11 + libGL libGLU fltk xorg.libX11 ]; /* fixes: diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 609e73b327adb..c11110e4bc499 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut +{ stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut , libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp + buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 1d96c0039ad1b..66c41bb073afb 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg -, zlib, libGLU_combined, libGLU, xorg, opencascade-occt }: +, zlib, libGL, libGLU, xorg, opencascade-occt }: stdenv.mkDerivation rec { pname = "gmsh"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45"; }; - buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined + buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE opencascade-occt diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 53d5ad6ab4cc3..e135534d1acf0 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }: +{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: with stdenv.lib; stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; postInstall = let - libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ]; + libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; in '' ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index c806b558da0ec..38b9b8ec66d1a 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, -libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, +libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; buildInputs = [ - curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver + curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 99159fba5b435..36de6a1d4c503 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit -, wxGTK, perl, python2, zlib, libGLU_combined, libX11 +, wxGTK, perl, python2, zlib, libGLU, libGL, libX11 , automake, autoconf }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [autoconf automake]; buildInputs = [ - wxGTK perl python2 zlib libGLU_combined libX11 + wxGTK perl python2 zlib libGLU libGL libX11 ]; # Link against Python explicitly as it is needed for scripts diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index b394639fd0cc9..9b510d432fb30 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal +{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal_1_11, cgal , proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2 + qt4 qwt6_qt4 libGLU libGL glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 2145d7e71d332..8422eb8752b11 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lzma, gsl_1 , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 690dc920d5c8e..ada2f0b44adb7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 509cdeaee6112..3f83f2f30a674 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 +{ fetchurl, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 , cmake, makeWrapper, libjpeg, python }: let version = "5.2.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; }; - buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; + buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 64482ddd74bcc..20c259a9d0c21 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, cmake, qt4, libGLU_combined }: +{ fetchsvn, stdenv, cmake, qt4, libGLU, libGL }: # ViTE 1.1 has several bugs, so use the SVN version. let @@ -23,7 +23,7 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 libGLU_combined ]; + buildInputs = [ cmake qt4 libGLU libGL ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 8f862af0a282e..d8a6ec058448a 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 03933788551ca..3636ad11fb6e7 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.8"; + name = "subgit-3.3.9"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://subgit.com/download/${name}.zip"; - sha256 = "0gvyyr4prx1v06f9j9fmmr8br1gjd45bnncl40c9agiqsyy0q06n"; + sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5"; }; } diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index ca26fbc61e9eb..2ce855d3a7f8b 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL2_image, freetype, glew, libGLU_combined, boost, glm +, SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined + glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype ]; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 8aa6128819f1b..d050895ca2375 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, buildPythonPackage , python -, srht, asyncpg, unidiff, aiosmtpd, emailthreads }: +, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }: buildPythonPackage rec { pname = "listssrht"; @@ -20,6 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ srht + pygit2 asyncpg unidiff aiosmtpd diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 66b785e43b174..bebc9fef0c651 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, git, gnupg }: let version = "1.12.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; + buildInputs = [ git gnupg ]; + src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; @@ -12,26 +14,26 @@ stdenv.mkDerivation { sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; - buildCommand = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - mkdir -p $out/share/bash-completion/completions - sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm - chmod 755 $out/bin/yadm - install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1 - install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm - install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dt $out/bin $src/yadm + install -Dt $out/share/man/man1 $src/yadm.1 + install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm + install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + runHook postInstall ''; meta = { homepage = https://github.com/TheLocehiliosan/yadm; description = "Yet Another Dotfiles Manager"; longDescription = '' - yadm is a dotfile management tool with 3 main features: Manages files across - systems using a single Git repository. Provides a way to use alternate files on - a specific OS or host. Supplies a method of encrypting confidential data so it - can safely be stored in your repository. + yadm is a dotfile management tool with 3 main features: + * Manages files across systems using a single Git repository. + * Provides a way to use alternate files on a specific OS or host. + * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 2734035b6de95..2d82f3d3e2b49 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype -, libGLU_combined +, libGLU, libGL , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , icu, boost, intltool # New dependencies @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; buildInputs = with stdenv.lib; - [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined + [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU libGL libass fftw ffms ffmpeg zlib icu boost boost.out libiconv ] ++ optional spellcheckSupport hunspell diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 9ff65483f261f..a9d98a9a2a44c 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,6 +1,6 @@ { config, stdenv, fetchFromGitHub , fetchpatch, pkgconfig, perl, python, which -, libX11, libxcb, libGLU_combined +, libX11, libxcb, libGLU, libGL , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet , ffmpeg @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ libX11 libxcb - libGLU_combined + libGLU libGL qtbase qtx11extras qtdeclarative diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 153d0a20b6e62..cef7ea1bf3c01 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "38.0.0"; + version = "40.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0874rfslglywpa8ilhqv59zvn2hisdsbwd7r61psf5rd64v72ym4"; + sha256 = "103rvj6f6nlzybzbkqix7q5f2017bmzsn9z5g7bwnjjwgih5mrpq"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 2afb7d1c68a52..a75a7a11d67af 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -2,7 +2,7 @@ , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null -, x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? null +, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -32,7 +32,7 @@ assert fontconfigSupport -> (fontconfig != null); assert (!fontconfigSupport) -> (freefont_ttf != null); assert fribidiSupport -> (fribidi != null); -assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null); +assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); assert alsaSupport -> alsaLib != null; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi - ++ optionals x11Support [ libX11 libXext libGLU_combined ] + ++ optionals x11Support [ libX11 libXext libGLU libGL ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index f3c7d3761004f..6c86b514afdff 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -9,7 +9,7 @@ , libxkbcommon ? null , x11Support ? stdenv.isLinux - , libGLU_combined ? null + , libGLU, libGL ? null , libX11 ? null , libXext ? null , libXxf86vm ? null @@ -86,7 +86,7 @@ assert vapoursynthSupport -> available vapoursynth; assert vdpauSupport -> available libvdpau; assert vulkanSupport -> all available [ libplacebo shaderc vulkan-headers vulkan-loader ]; assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ]; -assert x11Support -> all available [ libGLU_combined libX11 libXext libXxf86vm libXrandr ]; +assert x11Support -> all available [ libGLU libGL libX11 libXext libXxf86vm libXrandr ]; assert xineramaSupport -> x11Support && available libXinerama; assert xvSupport -> x11Support && available libXv; assert youtubeSupport -> available youtube-dl; @@ -181,7 +181,7 @@ in stdenv.mkDerivation rec { ++ optionals drmSupport [ libdrm mesa ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] + ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Cocoa CoreAudio diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 7914bb84c428c..2c73d3e734ccb 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper -, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype , perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders , libXNVCtrl, enableXnvctrl ? false @@ -26,7 +26,7 @@ mkDerivation rec { setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ - freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined + freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 29ad928e27cd1..6191fd0f18adc 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras -, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja +, libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: mkDerivation rec { @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined + alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU libGL libpulseaudio qtbase qtx11extras ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index facb8fabe2654..65a7f358d6fab 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "smplayer"; - version = "19.10.0"; + version = "19.10.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0sq7hr10b4pbbi0y1q4mxs24h2lb042nv4rqr03r72bp57353xsl"; + sha256 = "0i2c15yxk4by2zyjhb7n08larz9pmpa6zw383aybjxqh0nd9zv9p"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index b5ffdb018ffec..ce22d8bed2799 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.2.0"; + version = "1.3.0"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh"; + sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 72db4f1e5aa50..770154f1918b6 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, libtool -, gtk2, libGLU_combined, readline, libX11, libXpm +, gtk2, libGLU, libGL, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true, ncurses ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; buildInputs = with stdenv.lib; - [ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 35c78dfd50a40..a0694b7efbe8d 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.11"; + version = "0.12"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "10dzas5fyh2lpa0kf1xv8z9c4g4cf0zlmnpilyvpcyccyfjf6cp2"; + sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v"; }; buildInputs = [ python ]; diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index c57a7f6e7714f..af136f7e545ae 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0x2sx41y3ylzg511x52k3wh8mfbzp4ialpas6sn4ccagqxh2hc4y"; + sha256 = "0s8gk2kqxkfwx1x44g19ckm7rqgrcax59y8brgmigajqizik7sql"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index be256b8e591b1..8fa3cc55279bf 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -44,8 +44,12 @@ in stdenv.mkDerivation (fBuildAttrs // { export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')" export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')" export HOME="$NIX_BUILD_TOP" + export USER="nix" # This is needed for git_repository with https remotes export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" + # This is needed for Bazel fetchers that are themselves programs (e.g. + # rules_go using the go toolchain) + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" ''; buildPhase = fFetchAttrs.buildPhase or '' diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 2537b722cdc7f..db187d2ac14ad 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, makeDeps }: +{ lib, stdenv, echo_build_heading, noisily, makeDeps, rust }: { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -13,17 +13,6 @@ (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; - - # Some platforms have different names for rustc. - rustPlatform = - with stdenv.hostPlatform.parsed; - let cpu_ = if cpu.name == "armv7a" then "armv7" - else cpu.name; - vendor_ = vendor.name; - kernel_ = kernel.name; - abi_ = abi.name; - in - "${cpu_}-${vendor_}-${kernel_}-${abi_}"; in '' runHook preBuild norm="" @@ -67,7 +56,7 @@ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \ - ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} + ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 381485e3752e4..edff3941636c6 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust }: let # This doesn't appear to be officially documented anywhere yet. @@ -59,7 +59,7 @@ let ''; configureCrate = import ./configure-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; }; - buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; }; + buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps rust; }; installCrate = import ./install-crate.nix; in diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index f0f949b220560..1d8e4448674e9 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages, windows }: +{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, buildPackages, windows }: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -46,12 +46,7 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; - hostConfig = stdenv.hostPlatform.config; - - rustHostConfig = { - x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; - }.${hostConfig} or hostConfig; - rustTarget = if target == null then rustHostConfig else target; + rustTarget = if target == null then rust.toRustTarget stdenv.hostPlatform else target; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; @@ -87,7 +82,7 @@ stdenv.mkDerivation (args // { --subst-var-by vendor "$(pwd)/$cargoDepsCopy" cat >> .cargo/config <<'EOF' - [target."${stdenv.buildPlatform.config}"] + [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' [target."${rustTarget}"] @@ -129,10 +124,10 @@ stdenv.mkDerivation (args // { ( set -x env \ - "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \ - "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \ - "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \ - "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ + "CC_${rust.toRustTarget stdenv.buildPlatform}"="${ccForBuild}" \ + "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ + "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ + "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ cargo build \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${rustTarget} \ diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index a266a597e0b02..b4435fb911fa4 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.03"; + version = "5.04"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz"; + sha256 = "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index d2d2ad342561e..105b5da31051f 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -2,7 +2,7 @@ let pname = "cascadia-code"; - version = "1910.04"; + version = "1911.20"; in fetchurl { name = "${pname}-${version}"; @@ -15,7 +15,7 @@ fetchurl { install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf ''; - sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q"; + sha256 = "1dfd3g7cf2h0z2gxvk4pxy46xswd3wyqz3p8ypxcv2dkz4ri6l0j"; meta = with lib; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 68322bd54828a..c3d3bf4aa6a0b 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "input-fonts"; - version = "2017-08-10"; # date of the download and checksum + version = "2019-11-25"; # date of the download and checksum src = requireFile { name = "Input-Font.zip"; url = "https://input.fontbureau.com/download/"; - sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; + sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b"; }; nativeBuildInputs = [ unzip ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd"; + outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 0b28a02ba4d96..c3670a6f58ce2 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "v${version}"; - sha256 = "0zmnhih4gz8bidyzf1wimy85z7zx9i29mv1zirmykpqj819g7mx9"; + rev = "${version}"; + sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index b2363b4b549e1..3227d9a76235b 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019b"; + version = "2019c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85"; + sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf"; + sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"; }) ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index d1d7228183c55..37eb9b7e5bcd9 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1bcjrnh6bm7pxyqrr39yx5zykf3yzxrsydd5xcawjfihnph3yrlg"; + sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg"; }; preferLocalBuild = true; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 6cc6848b316fc..d0a7a890355a1 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { - openssl = pkgs.openssl_1_0_2; - }; + gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index c15f43b542aa7..7196840978f4e 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -20,6 +20,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ GConf glib ]; + # struct SSL is opaque in openssl-1.1; and the SSL_free() man page + # says that one should not free members of it manually (in both + # the openssl-1.0 and openssl-1.1 man pages). + # https://bugs.gentoo.org/592540 + patches = [ (fetchpatch { + name = "gnome-vfs-2.24.4-openssl-1.1.patch"; + url = "https://bugs.gentoo.org/attachment.cgi?id=535944"; + sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040"; + extraPrefix = ""; + }) + ]; + postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; doCheck = false; # needs dbus daemon diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 27caaa70634f9..3b972718230a5 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU_combined, pango, pangox_compat, xorg }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU, libGL, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; - [ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ]; + [ pkgconfig glib gtk2 libGLU libGL pango libX11 libXmu ]; propagatedBuildInputs = [ pangox_compat ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index c38e677a4217a..415974d0c2b71 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.38.1"; + version = "0.38.3"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0"; + sha256 = "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 21e198a867f14..8d737b22a7ac7 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq"; + sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7cb63b8df797e..34f6accdd5ffa 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.34.0"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8"; + sha256 = "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 8cf9fb9f0e632..1761887f8fb1b 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; - version = "unstable-2019-04-02"; + version = "33"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "gnome-shell-extension-caffeine"; - rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173"; - sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl"; + rev = "v${version}"; + sha256 = "1v74xfk7csgc4kw1fg75brmhk2aby3d453ksnmj4k8ivyxkzxmfg"; }; uuid = "caffeine@patapon.info"; @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 183e1f2a0850f..a365761b014fc 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.2714.1"; + version = "1.0.2878"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "0ys03sv08fg8q06lb6k5088xirnwms4nzazxp3kbdjm973n7imxc"; + sha256 = "0rgij1013fy2x2szfchy3z6390mjfqw3nz4zprcb5v2v6mpvcj4l"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 03f3d56fd93d6..e4c756e9c7d31 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "1zm2d5kj9fnfx8ifj8ysrrr838ipwmvz35byzjhprakrg64911p9"; + sha256 = "1y072c7dh9jf8xwy7kia6cb4dkpspq4zf24ssn7zm5f46p4waxni"; }; nativeBuildInputs = [ ruby bison ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 48808bf356b95..dee0b351a609f 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "1rjinrs119c8i6wzz5fzjfml7n7kbd5hb9642g4rr8qxkq4sx83k"; + sha256 = "1q5fx9g40bk4ajghi856w5l34fmrl7avq5j6p0dr2xa4l52ib149"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 9557d0a79aebb..d39c0d86fd573 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -12,16 +12,18 @@ in { stdenv, fetchurl, ncurses, buildEnv , libX11, xorgproto, useX11 ? safeX11 stdenv +, aflSupport ? false , flambdaSupport ? false }: assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; +assert aflSupport -> stdenv.lib.versionAtLeast version "4.05"; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optional optionals optionalString; - name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; + name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}"; in let @@ -41,11 +43,16 @@ stdenv.mkDerivation (args // { }; prefixKey = "-prefix "; - configureFlags = optionals useX11 ( - if stdenv.lib.versionAtLeast version "4.08" - then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"] - else [ "-x11lib" x11lib "-x11include" x11inc ]) - ++ optional flambdaSupport "-flambda" + configureFlags = + let flags = new: old: + if stdenv.lib.versionAtLeast version "4.08" + then new else old + ; in + optionals useX11 (flags + [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"] + [ "-x11lib" x11lib "-x11include" x11inc ]) + ++ optional aflSupport (flags "--with-afl" "-afl-instrument") + ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f20a32aceddea..33a3a1216dd2f 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, +{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "07ai5lr0zdrcdmfjxsypp33fpj8lnak7y5177s7qd19163z0ia20"; + sha256 = "0a0sw902nrayg0s1zrkhfpvrmdqw19nif67hsv0ijrckcq37bjcz"; }; - buildInputs = [ llvm makeWrapper which ]; + buildInputs = [ llvm makeWrapper which libxml2 ]; propagatedBuildInputs = [ cc ]; # Disable problematic networking tests diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 6719293af2a79..23e7f3b28f7f3 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pony-stable"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "1wiinw35bp3zpq9kx61x2zvid7ln00jrw052ah8801s0d9dbwrdr"; + sha256 = "0nzvsqvl315brp3yb4j5kl82xnkmib4jk416jjc7yrz4k3jgr278"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/pkgs/development/compilers/rust/1_38_0.nix index 5260ab201741e..be43e074228d4 100644 --- a/pkgs/development/compilers/rust/1_38_0.nix +++ b/pkgs/development/compilers/rust/1_38_0.nix @@ -10,6 +10,7 @@ import ./default.nix { bootstrapHashes = { i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9"; x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb"; + arm-unknown-linux-gnueabihf = "272739fbb23cf6c2040c1813af9c8c7f386cac37d9de638f22a1816eb96bc0ae"; armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98"; aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba"; i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8"; diff --git a/pkgs/development/compilers/rust/1_39_0.nix b/pkgs/development/compilers/rust/1_39_0.nix index aa29c7a9ff7ca..cc07590dedc65 100644 --- a/pkgs/development/compilers/rust/1_39_0.nix +++ b/pkgs/development/compilers/rust/1_39_0.nix @@ -10,6 +10,7 @@ import ./default.nix { bootstrapHashes = { i686-unknown-linux-gnu = "41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af"; x86_64-unknown-linux-gnu = "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221"; + arm-unknown-linux-gnueabihf = "0603a3d3d16ae8f3b3b117eb699e8f3ef7532a6f6d3c29d13e7d4614fc3c9e7a"; armv7-unknown-linux-gnueabihf = "8b1bf1680a61a643d6b5c7a3b1a1ce88448652756395e20ba5846739cbd085c4"; aarch64-unknown-linux-gnu = "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda"; i686-apple-darwin = "cdbf2807774bed350a3af6f41d7f7dd7ceff28777cde310c3ba90033188eb2f8"; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 54b2d3016e507..7c0b46d55931f 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,24 +1,11 @@ -{ stdenv, fetchurl, callPackage, version, hashes }: +{ stdenv, fetchurl, rust, callPackage, version, hashes }: let - platform = - if stdenv.hostPlatform.system == "i686-linux" - then "i686-unknown-linux-gnu" - else if stdenv.hostPlatform.system == "x86_64-linux" - then "x86_64-unknown-linux-gnu" - else if stdenv.hostPlatform.system == "armv7l-linux" - then "armv7-unknown-linux-gnueabihf" - else if stdenv.hostPlatform.system == "aarch64-linux" - then "aarch64-unknown-linux-gnu" - else if stdenv.hostPlatform.system == "i686-darwin" - then "i686-apple-darwin" - else if stdenv.hostPlatform.system == "x86_64-darwin" - then "x86_64-apple-darwin" - else throw "missing bootstrap url for platform ${stdenv.hostPlatform.system}"; + platform = rust.toRustTarget stdenv.hostPlatform; src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; - sha256 = hashes.${platform}; + sha256 = hashes.${platform} or (throw "missing bootstrap url for platform ${platform}"); }; in callPackage ./binary.nix diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index efd641efb6e68..75104ac7ad58e 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -11,6 +11,14 @@ , llvmPackages_5 , pkgsBuildTarget, pkgsBuildBuild }: rec { + toRustTarget = platform: with platform.parsed; let + cpu_ = { + "armv7a" = "armv7"; + "armv7l" = "armv7"; + "armv6l" = "arm"; + }.${cpu.name} or cpu.name; + in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + makeRustPlatform = { rustc, cargo, ... }: { rust = { inherit rustc cargo; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 7eb00a30ad73f..1d46fe376d4bb 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,6 +10,7 @@ set -euo pipefail PLATFORMS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu + arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu i686-apple-darwin diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index ceaf6f4c2258f..ca9bf05b7e7d8 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python2 -, llvm_9, darwin, git, cmake, rustPlatform +, llvm_9, darwin, git, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -53,9 +53,9 @@ in stdenv.mkDerivation rec { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let - setBuild = "--set=target.${stdenv.buildPlatform.config}"; - setHost = "--set=target.${stdenv.hostPlatform.config}"; - setTarget = "--set=target.${stdenv.targetPlatform.config}"; + setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}"; + setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}"; + setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}"; ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; @@ -68,9 +68,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${stdenv.buildPlatform.config}" - "--host=${stdenv.hostPlatform.config}" - "--target=${stdenv.targetPlatform.config}" + "--build=${rust.toRustTarget stdenv.buildPlatform}" + "--host=${rust.toRustTarget stdenv.hostPlatform}" + "--target=${rust.toRustTarget stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index a39a6c4a2e4f5..33821bfc25744 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "004c5iicjnlzn1yz1k7a28s4xdqx00016rr870drdq2z30mxfgz8"; + sha256 = "0q6cwfy3pwmaw3j1hhfk1ivcf03ijyvchyf92wdgrpj6q626kcpj"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8079daf59a534..d84503caa607c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -106,18 +106,18 @@ in rec { }; vala_0_40 = generic { - version = "0.40.16"; - sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; + version = "0.40.18"; + sha256 = "1f7cdkjdysg4dcri1wbzdddm46amk2s48jkwb5ghpdvhjb4l5j2m"; }; vala_0_44 = generic { - version = "0.44.8"; - sha256 = "0f7pc496zvxfhbkhg8ayxykjas6f55mgv452wsnh0bz5zbxm8xrl"; + version = "0.44.11"; + sha256 = "06spdvm9q9k4riq1d2fxkyc8d88bcv460v360465iy1lnj3z9x2s"; }; vala_0_46 = generic { - version = "0.46.2"; - sha256 = "1g20fzcwh3j7ab46jalabyi005h2in0cp7xj0yga4b8hx29h61wj"; + version = "0.46.5"; + sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s"; }; vala = vala_0_46; diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 3d955c4394b04..147ec13c5556a 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "X11basic"; - version = "1.26"; + version = "1.27"; src = fetchFromGitHub { owner = "kollokollo"; repo = pname; rev = version; - sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd"; + sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2"; }; buildInputs = [ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9fd343870b9b0..4579cf015cd2b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -511,7 +511,9 @@ self: super: { else dontCheck super.tasty-discover); # generic-deriving bound is too tight - aeson = doJailbreak super.aeson; + # aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4 + # https://github.com/bos/aeson/issues/740 + aeson = dontCheck (doJailbreak super.aeson); # containers >=0.4 && <0.6 is too tight # https://github.com/RaphaelJ/friday/issues/34 @@ -1183,18 +1185,6 @@ self: super: { # test suite failure: https://github.com/jgm/pandoc/issues/5582 pandoc = dontCheck super.pandoc; - # The latest release version is ancient. You really need this tool from git. - haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" - (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { - version = "20190814-git"; - src = pkgs.fetchFromGitHub { - owner = "haskell-CI"; - repo = "haskell-ci"; - rev = "70918d80b6fd43aca7e4d00ba0d2ea116b666556"; - sha256 = "0bzp959qy74zmqq75f60rcixpjbvvyrb5a8zp2nyql3nm9vxzy5k"; - }; - }) (with self; [temporary lattices Cabal_3_0_0_0])); - # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; @@ -1251,7 +1241,7 @@ self: super: { }); # The LTS-14.x version of their dependencies are too old. - cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; }; + cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_0; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; }); hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; # Version bounds for http-client are too strict: @@ -1318,4 +1308,10 @@ self: super: { # Needs the corresponding version of haskell-src-exts. haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; + # https://github.com/Daniel-Diaz/HaTeX/issues/144 + HaTeX = dontCheck super.HaTeX; + + # https://github.com/kazu-yamamoto/dns/issues/150 + dns = dontCheck super.dns; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index ec0e4377f764a..617ca63c27f2d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -69,20 +69,29 @@ self: super: { snap-server = doJailbreak super.snap-server; # use latest version to fix the build + doctemplates = self.doctemplates_0_7_2; generics-sop = self.generics-sop_0_5_0_0; hackage-db = self.hackage-db_2_1_0; + haddock-library = self.haddock-library_1_8_0; + HsYAML = self.HsYAML_0_2_1_0; lens = self.lens_4_18_1; memory = self.memory_0_15_0; microlens = self.microlens_0_4_11_2; optparse-applicative = self.optparse-applicative_0_15_1_0; + pandoc = self.pandoc_2_8_0_1; + pandoc-types = self.pandoc-types_1_20; primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion regex-base = self.regex-base_0_94_0_0; regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43; regex-posix = self.regex-posix_0_96_0_0; regex-tdfa = self.regex-tdfa_1_3_0; shelly = self.shelly_1_9_0; + skylighting = self.skylighting_0_8_3; + skylighting-core = self.skylighting-core_0_8_3; sop-core = self.sop-core_0_5_0_0; + texmath = self.texmath_0_12; tls = self.tls_1_5_2; + trifecta = self.trifecta_2_1; xmonad-contrib = self.xmonad-contrib_0_16; # These packages don't work and need patching and/or an update. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f57768ecb773d..b8b38c7704357 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.14 + # LTS Haskell 14.16 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -55,7 +55,7 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.1.2.3 - - aeson ==1.4.5.0 + - aeson ==1.4.6.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -120,7 +120,7 @@ default-package-overrides: - async-timer ==0.2.0.0 - atom-basic ==0.2.5 - atomic-primops ==0.8.3 - - atomic-write ==0.2.0.6 + - atomic-write ==0.2.0.7 - attoparsec ==0.13.2.3 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 @@ -131,7 +131,7 @@ default-package-overrides: - attoparsec-uri ==0.0.7 - audacity ==0.0.2 - aur ==6.2.0.1 - - authenticate ==1.3.4 + - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - autoexporter ==1.1.15 @@ -142,7 +142,7 @@ default-package-overrides: - avro ==0.4.5.4 - avwx ==0.3.0.2 - aws-cloudfront-signed-cookies ==0.2.0.1 - - aws-lambda-haskell-runtime ==2.0.1 + - aws-lambda-haskell-runtime ==2.0.2 - backprop ==0.2.6.3 - bank-holidays-england ==0.2.0.2 - barbies ==1.1.3.0 @@ -279,7 +279,7 @@ default-package-overrides: - casing ==0.1.4.1 - cassava ==0.5.2.0 - cassava-conduit ==0.5.1 - - cassava-megaparsec ==2.0.0 + - cassava-megaparsec ==2.0.1 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - caster ==0.0.3.0 @@ -311,7 +311,7 @@ default-package-overrides: - chiphunk ==0.1.2.1 - choice ==0.2.2 - chronologique ==0.3.1.1 - - chronos ==1.0.8 + - chronos ==1.0.9 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -326,7 +326,7 @@ default-package-overrides: - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 - - clay ==0.13.1 + - clay ==0.13.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - clock ==0.8 @@ -336,7 +336,7 @@ default-package-overrides: - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.2 - cmark ==0.6 - - cmark-gfm ==0.2.0 + - cmark-gfm ==0.2.1 - cmdargs ==0.10.20 - codec ==0.2.1 - codec-beam ==0.2.0 @@ -388,7 +388,7 @@ default-package-overrides: - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - - constraint ==0.1.3.0 + - constraint ==0.1.4.0 - constraints ==0.10.1 - contravariant ==1.5.2 - contravariant-extras ==0.3.5 @@ -397,9 +397,9 @@ default-package-overrides: - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 - - cookie ==0.4.4 - - core-data ==0.2.1.0 - - core-text ==0.2.2.1 + - cookie ==0.4.5 + - core-data ==0.2.1.4 + - core-text ==0.2.2.4 - countable ==1.0 - country ==0.1.6 - courier ==0.1.1.5 @@ -408,7 +408,7 @@ default-package-overrides: - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 - - cql ==4.0.1 + - cql ==4.0.2 - cql-io ==1.1.1 - crackNum ==2.3 - crc32c ==0.0.0 @@ -519,14 +519,14 @@ default-package-overrides: - dhall-bash ==1.0.21 - dhall-json ==1.3.0 - diagrams ==1.4 - - diagrams-contrib ==1.4.3 + - diagrams-contrib ==1.4.4 - diagrams-core ==1.4.2 - diagrams-lib ==1.4.3 - diagrams-postscript ==1.4.1 - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.2 - - di-core ==1.0.3 + - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.3.4 - digest ==0.0.1.2 @@ -544,7 +544,7 @@ default-package-overrides: - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - - dns ==4.0.0 + - dns ==4.0.1 - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 @@ -555,7 +555,7 @@ default-package-overrides: - do-list ==1.0.1 - dom-parser ==3.1.0 - do-notation ==0.1.0.2 - - dotenv ==0.8.0.2 + - dotenv ==0.8.0.4 - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -664,7 +664,7 @@ default-package-overrides: - filecache ==0.4.1 - file-embed ==0.0.11 - file-embed-lzma ==0 - - filelock ==0.1.1.3 + - filelock ==0.1.1.4 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - filepattern ==0.1.1 @@ -734,7 +734,7 @@ default-package-overrides: - gauge ==0.2.5 - gc ==0.0.3 - gd ==3000.7.3 - - gdp ==0.0.0.2 + - gdp ==0.0.3.0 - general-games ==1.1.1 - generic-arbitrary ==0.1.0 - generic-data ==0.7.0.0 @@ -847,7 +847,7 @@ default-package-overrides: - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - haddock-library ==1.7.0 - - hadolint ==1.17.2 + - hadolint ==1.17.3 - half ==0.3 - hamilton ==0.1.0.3 - hamtsolo ==1.0.3 @@ -885,7 +885,7 @@ default-package-overrides: - haxl ==2.1.2.0 - hbeanstalk ==0.2.4 - HCodecs ==0.5.1 - - hdaemonize ==0.5.5 + - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-mysql ==0.7.1.0 - HDBC-session ==0.1.2.0 @@ -929,7 +929,7 @@ default-package-overrides: - hmpfr ==0.4.4 - hoauth2 ==1.8.9 - Hoed ==0.5.1 - - hOpenPGP ==2.8 + - hOpenPGP ==2.8.4 - hopenpgp-tools ==0.21.3 - hopfli ==0.2.2.1 - hosc ==0.17 @@ -1007,7 +1007,7 @@ default-package-overrides: - htoml ==1.0.0.3 - http2 ==1.6.5 - HTTP ==4000.3.14 - - http-api-data ==0.4.1 + - http-api-data ==0.4.1.1 - http-client ==0.6.4 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 @@ -1047,7 +1047,7 @@ default-package-overrides: - hw-mquery ==0.2.0.2 - hw-packed-vector ==0.0.0.3 - hw-parser ==0.1.0.2 - - hw-prim ==0.6.2.38 + - hw-prim ==0.6.2.39 - hw-rankselect ==0.13.0.0 - hw-rankselect-base ==0.3.2.3 - hw-simd ==0.1.1.5 @@ -1086,7 +1086,6 @@ default-package-overrides: - indents ==0.5.0.1 - indexed ==0.1.3 - indexed-list-literals ==0.2.1.2 - - indexed-profunctors ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.4 - influxdb ==1.7.1.1 @@ -1096,7 +1095,7 @@ default-package-overrides: - inline-c-cpp ==0.3.0.3 - inline-r ==0.10.2 - inliterate ==0.1.0 - - insert-ordered-containers ==0.2.3 + - insert-ordered-containers ==0.2.2 - inspection-testing ==0.4.2.2 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 @@ -1141,7 +1140,7 @@ default-package-overrides: - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - - jose ==0.8.1.0 + - jose ==0.8.2.0 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1253,7 +1252,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.7 + - logging-effect ==1.3.8 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.7.0.2 @@ -1280,7 +1279,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - massiv ==0.4.3.0 - - massiv-io ==0.1.7.0 + - massiv-io ==0.1.9.0 - massiv-test ==0.1.1 - mathexpr ==0.3.0.0 - math-functions ==0.3.3.0 @@ -1352,7 +1351,7 @@ default-package-overrides: - monad-logger ==0.3.30 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - - monad-logger-syslog ==0.1.4.0 + - monad-logger-syslog ==0.1.5.0 - monad-loops ==0.4.3 - monad-memo ==0.5.1 - monad-metrics ==0.2.1.4 @@ -1432,7 +1431,7 @@ default-package-overrides: - network-house ==0.1.0.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.3 - - network-messagepack-rpc ==0.1.1.4 + - network-messagepack-rpc ==0.1.2.0 - network-multicast ==0.3.2 - network-simple ==0.4.5 - network-simple-tls ==0.3.2 @@ -1448,10 +1447,9 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.3.2.0 + - nonempty-containers ==0.3.1.0 - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.2 - - nonempty-vector ==0.2.0.1 + - non-empty-sequence ==0.2.0.4 - non-negative ==0.1.2 - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 @@ -1461,7 +1459,7 @@ default-package-overrides: - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.1 - - numhask ==0.3.0.0 + - numhask ==0.3.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - nuxeo ==0.3.2 @@ -1495,8 +1493,6 @@ default-package-overrides: - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - optics-core ==0.2 - - optics-extra ==0.2 - optional-args ==1.0.2 - options ==1.2.1.1 - optparse-applicative ==0.14.3.0 @@ -1548,7 +1544,7 @@ default-package-overrides: - pcf-font-embed ==0.1.2.0 - pcg-random ==0.1.3.6 - pcre-heavy ==1.0.0.2 - - pcre-light ==0.4.0.4 + - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - pdfinfo ==1.5.4 - peano ==0.1.0.1 @@ -1651,7 +1647,7 @@ default-package-overrides: - primitive ==0.6.4.0 - primitive-extras ==0.7.1.1 - prim-uniq ==0.1.0.1 - - probability ==0.2.5.2 + - probability ==0.2.6 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - product-profunctors ==0.10.0.0 @@ -1909,7 +1905,7 @@ default-package-overrides: - sexpr-parser ==0.1.1.2 - SHA ==1.6.4.4 - shake-language-c ==0.12.0 - - shakespeare ==2.0.22 + - shakespeare ==2.0.23 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -1953,7 +1949,7 @@ default-package-overrides: - smallcheck-series ==0.6.1 - smoothie ==0.4.2.9 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.4.0 + - snap-core ==1.0.4.1 - snap-server ==1.1.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.6 @@ -2226,7 +2222,7 @@ default-package-overrides: - type-operators ==0.2.0.0 - typerep-map ==0.3.2 - type-spec ==0.4.0.0 - - tz ==0.1.3.2 + - tz ==0.1.3.3 - tzdata ==0.1.20190325.0 - ua-parser ==0.7.5.1 - ucam-webauth ==0.1.0.0 @@ -2355,7 +2351,7 @@ default-package-overrides: - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - - web-routes ==0.27.14.2 + - web-routes ==0.27.14.3 - web-routes-hsp ==0.24.6.1 - web-routes-wai ==0.24.3.1 - webrtc-vad ==0.1.0.3 @@ -2437,7 +2433,7 @@ default-package-overrides: - yesod-auth ==1.6.8 - yesod-auth-hashdb ==1.7.1.1 - yesod-auth-oauth2 ==0.6.1.2 - - yesod-bin ==1.6.0.3 + - yesod-bin ==1.6.0.4 - yesod-core ==1.6.16.1 - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 @@ -2452,7 +2448,7 @@ default-package-overrides: - yesod-recaptcha2 ==0.3.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.7 + - yesod-test ==1.6.8 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 @@ -2548,7 +2544,6 @@ package-maintainers: - funcmp - git-annex - hackage-db - - haskell-ci - hledger - hledger-interest - hledger-ui @@ -2594,6 +2589,7 @@ package-maintainers: cdepillabout: - pretty-simple - purescript + - spago - termonad unsupported-platforms: @@ -2855,6 +2851,7 @@ broken-packages: - alerta - alex-meta - alex-prelude + - alex-tools - alfred - alg - alga @@ -2937,6 +2934,7 @@ broken-packages: - apecs-stm - apelsin - api-builder + - api-rpc-factom - api-rpc-pegnet - api-tools - api-yoti @@ -2998,6 +2996,7 @@ broken-packages: - array-chunks - array-forth - array-primops + - arrayfire - arraylist - ArrayRef - arrow-improve @@ -3264,6 +3263,7 @@ broken-packages: - biofasta - biofastq - biohazard + - BioHMM - bioinformatics-toolkit - biophd - biopsl @@ -3273,6 +3273,7 @@ broken-packages: - bird - BirdPP - bisect-binary + - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3388,6 +3389,7 @@ broken-packages: - buffer - buffer-builder-aeson - BufferedSocket + - buffet - buffon - bugzilla - build @@ -3446,11 +3448,13 @@ broken-packages: - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps + - cabal-helper - Cabal-ide-backend - cabal-info - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 + - cabal-install-parsers - cabal-meta - cabal-mon - cabal-nirvana @@ -3492,7 +3496,9 @@ broken-packages: - calculator - caldims - caledon + - calenderweek - call + - call-alloy - call-haskell-from-anything - camfort - campfire @@ -3685,6 +3691,7 @@ broken-packages: - cloud-haskell - cloud-seeder - cloudfront-signer + - cloudi - clr-inline - clua - cluss @@ -3713,6 +3720,8 @@ broken-packages: - co-log-sys - Coadjute - coalpit + - cobot-io + - cobot-tools - code-builder - codec-beam - codec-libevent @@ -3764,6 +3773,7 @@ broken-packages: - compact-socket - compact-string - compact-string-fix + - compact-word-vectors - Compactable - compdata-dags - competition @@ -3827,6 +3837,7 @@ broken-packages: - conkin - conlogger - connection-string + - connections - Conscript - consistent - const-math-ghc-plugin @@ -4177,6 +4188,7 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-fly - dhall-lsp-server - dhall-nix - dhall-to-cabal @@ -4355,6 +4367,7 @@ broken-packages: - dtd-text - dtw - dual + - duet - Dung - duplo - Dust @@ -4430,6 +4443,7 @@ broken-packages: - email - email-header - email-postmark + - email-validator - emailparse - embeddock - embeddock-example @@ -4542,6 +4556,7 @@ broken-packages: - exif - exinst-deepseq - exinst-hashable + - exist-instances - exists - exitcode - expand @@ -4571,6 +4586,7 @@ broken-packages: - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted + - factory - Facts - factual-api - fadno @@ -4665,6 +4681,7 @@ broken-packages: - FilePather - filepather - Files + - filestore - FileSystem - filesystem-conduit - filesystem-enumerator @@ -4687,6 +4704,7 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory + - fishfood - fit - fits-parse - fitsio @@ -4757,6 +4775,7 @@ broken-packages: - Forestry - forger - ForkableT + - forma - formal - FormalGrammars - format @@ -4862,6 +4881,10 @@ broken-packages: - funnyprint - funpat - funsat + - fused-effects-exceptions + - fused-effects-lens + - fused-effects-random + - fused-effects-resumable - fusion - futhark - futun @@ -4875,6 +4898,7 @@ broken-packages: - g2q - g4ip - gact + - galois-fft - game-probability - gameclock - gamgee @@ -4957,6 +4981,7 @@ broken-packages: - getflag - GGg - ggtsTC + - gh-labeler - ghc-core-smallstep - ghc-datasize - ghc-dump-tree @@ -5289,7 +5314,6 @@ broken-packages: - hakyll-dir-list - hakyll-favicon - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - hakyll-R - hakyll-sass @@ -5412,6 +5436,7 @@ broken-packages: - haskell-bitmex-client - haskell-bitmex-rest - haskell-brainfuck + - haskell-ci - haskell-cnc - haskell-coffee - haskell-compression @@ -5505,6 +5530,7 @@ broken-packages: - haskmon - haskoin - haskoin-bitcoind + - haskoin-core - haskoin-crypto - haskoin-node - haskoin-protocol @@ -5634,6 +5660,7 @@ broken-packages: - hedgehog-classes - hedgehog-gen-json - hedgehog-generic + - hedgehog-golden - Hedi - hedis-config - hedis-pile @@ -5889,6 +5916,7 @@ broken-packages: - hoovie - hopencc - hopencl + - hOpenPGP - hopenpgp-tools - hopfield - hoppy-docs @@ -5946,6 +5974,9 @@ broken-packages: - hR - hranker - HRay + - hreq-client + - hreq-conduit + - hreq-core - Hricket - hricket - hriemann @@ -6167,6 +6198,7 @@ broken-packages: - http-streams - http-wget - http2-client-grpc + - http2-grpc-proto3-wire - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -6561,6 +6593,7 @@ broken-packages: - JYU-Utils - kademlia - kafka-client + - kafka-client-sync - kaleidoscope - Kalman - kalman @@ -7066,6 +7099,9 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv + - massiv-io + - massiv-test - master-plan - matchable-th - matchers @@ -7208,6 +7244,7 @@ broken-packages: - mm2 - mmsyn2 - mmsyn4 + - mmsyn6ukr - mmtf - mmtl - mmtl-base @@ -7293,6 +7330,7 @@ broken-packages: - monoids - monopati - monte-carlo + - months - monzo - moo - moonshine @@ -7301,11 +7339,14 @@ broken-packages: - morley - morley-prelude - morph + - morpheus-graphql-cli - morphisms-functors - morphisms-functors-inventory - morphisms-objects - morte - mosaico-lib + - moto + - moto-postgresql - mount - movie-monad - mp @@ -7524,6 +7565,7 @@ broken-packages: - nirum - nitro - nixfromnpm + - nixpkgs-update - nkjp - nlp-scores - nlp-scores-scripts @@ -7549,6 +7591,7 @@ broken-packages: - NoSlow - not-gloss-examples - notcpp + - notifications-tray-icon - notmuch-haskell - notmuch-web - now-haskell @@ -7574,6 +7617,7 @@ broken-packages: - numhask-histogram - numhask-prelude - numhask-range + - numhask-space - numhask-test - Nussinov78 - Nutri @@ -7679,6 +7723,7 @@ broken-packages: - orgstat - origami - orizentic + - ormolu - OrPatterns - osc - oscpacking @@ -7714,12 +7759,13 @@ broken-packages: - pairing - pam - panda + - pandoc-citeproc-preamble + - pandoc-crossref - pandoc-include - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-markdown-ghci-filter - - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot - pandoc-unlit @@ -7885,6 +7931,7 @@ broken-packages: - piet - pig - pinchot + - pine - ping - pinpon - Pipe @@ -7959,6 +8006,7 @@ broken-packages: - pocket-dns - point-octree - pointfree-fancy + - pointful - pointless-lenses - pointless-rewrite - pokemon-go-protobuf-types @@ -8092,6 +8140,7 @@ broken-packages: - product - prof2dot - prof2pretty + - profunctor-optics - progress - progress-meter - progressbar @@ -8115,6 +8164,7 @@ broken-packages: - proteome - proto-lens-combinators - proto-lens-descriptors + - proto-lens-jsonpb - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork @@ -8226,6 +8276,7 @@ broken-packages: - quiver-instances - quiver-interleave - quiver-sort + - quokka - quoridor-hs - qux - R-pandoc @@ -8357,6 +8408,7 @@ broken-packages: - reformat - refresht - refurb + - reg-alloc - regex-deriv - regex-dfa - regex-generator @@ -8484,6 +8536,7 @@ broken-packages: - riff - ring-buffer - ring-buffers + - rings - riot - risc386 - riscv-isa @@ -8620,6 +8673,7 @@ broken-packages: - scenegraph - schedevr - schedule-planner + - scheduler - schedyield - schemas - schematic @@ -8896,6 +8950,7 @@ broken-packages: - singleton-dict - singleton-typelits - singnal + - singular-factory - sink - siphon - siren-json @@ -9044,6 +9099,7 @@ broken-packages: - sorted - sorting - sorty + - souffle-haskell - sound-collage - sounddelay - soundgen @@ -9114,6 +9170,7 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql + - squeeze - sr-extra - srcinst - sscan @@ -9124,6 +9181,7 @@ broken-packages: - sssp - sstable - SSTG + - st2 - stable-heap - stable-maps - stable-marriage @@ -9382,6 +9440,7 @@ broken-packages: - tasty-laws - tasty-lens - tasty-stats + - tasty-tap - Taxonomy - TaxonomyTools - TBC @@ -9696,6 +9755,7 @@ broken-packages: - twilio - twill - twine + - twirp - twitter - twitter-conduit - twitter-enumerator @@ -10059,6 +10119,7 @@ broken-packages: - websockets-simple - websockets-simple-extra - webwire + - weekdaze - weighted - weighted-regexp - welshy @@ -10230,6 +10291,7 @@ broken-packages: - yam-servant - yam-transaction-odbc - yam-web + - yaml-combinators - yaml-pretty-extras - yaml-rpc - yaml-rpc-scotty diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index dbdad1ddf1d0d..b31ed9af71b6d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -259,7 +259,7 @@ self: super: builtins.intersectAttrs super { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # Test suite wants to connect to $DISPLAY. - hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.libGLU_combined); + hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]); # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. @@ -636,4 +636,60 @@ self: super: builtins.intersectAttrs super { # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"]; + + spago = + let + # Spago basically compiles with LTS-14, but it requires a newer version + # of directory. This is to work around a bug only present on windows, so + # we can safely jailbreak spago and use the older directory package from + # LTS-14. + spagoWithOverrides = doJailbreak (super.spago.override { + # spago requires the latest version of dhall. + directory = self.dhall_1_27_0; + }); + + docsSearchAppJsFile = pkgs.fetchurl { + url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/docs-search-app.js"; + sha256 = "11721x455qzh40vzfmralaynn9v8b5wix86r107hhs08vhryjib2"; + }; + + purescriptDocsSearchFile = pkgs.fetchurl { + url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/purescript-docs-search"; + sha256 = "16p1fmdvpwz1yswav8qjsd26c9airb22xncqw1rjnbd8lcpqx0p5"; + }; + + spagoFixHpack = overrideCabal spagoWithOverrides (drv: { + postUnpack = (drv.postUnpack or "") + '' + # The source for spago is pulled directly from GitHub. It uses a + # package.yaml file with hpack, not a .cabal file. In the package.yaml file, + # it uses defaults from the master branch of the hspec repo. It will try to + # fetch these at build-time (but it will fail if running in the sandbox). + # + # The following line modifies the package.yaml to not pull in + # defaults from the hspec repo. + substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' "" + + # Spago includes the following two files directly into the binary + # with Template Haskell. They are fetched at build-time from the + # `purescript-docs-search` repo above. If they cannot be fetched at + # build-time, they are pulled in from the `templates/` directory in + # the spago source. + # + # However, they are not actually available in the spago source, so they + # need to fetched with nix and put in the correct place. + # https://github.com/spacchetti/spago/issues/510 + cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js" + cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search" + ''; + }); + + # Haddock generation is broken for spago. + # https://github.com/spacchetti/spago/issues/511 + spagoWithoutHaddocks = dontHaddock spagoFixHpack; + + # Because of the problem above with pulling in hspec defaults to the + # package.yaml file, the tests are disabled. + spagoWithoutChecks = dontCheck spagoWithoutHaddocks; + in + spagoWithoutChecks; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0e66938e67d6a..c343821f2d962 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1438,7 +1438,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) db; inherit (pkgs) dbxml; + }) {inherit (pkgs) db; inherit (pkgs) dbxml; inherit (pkgs) xercesc; inherit (pkgs) xqilla;}; "BerlekampAlgorithm" = callPackage @@ -1509,6 +1509,8 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Biobase" = callPackage @@ -1668,8 +1670,8 @@ self: { }: mkDerivation { pname = "BiobaseHTTP"; - version = "1.1.0"; - sha256 = "0y26d4aqxqpdr142y26p70v6cnrr48dhxm5nnnhqxg0lsirbxad0"; + version = "1.2.0"; + sha256 = "1m6lfs08zyk2xcxcmapcdfqp7afmzz3n2r3rr3qzlibwc6w7pj1d"; libraryHaskellDepends = [ aeson base BiobaseEnsembl bytestring conduit either-unwrap HTTP http-conduit hxt mtl network Taxonomy text transformers @@ -2629,10 +2631,10 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {opencv_calib3d = null; opencv_contrib = null; - opencv_core = null; opencv_features2d = null; opencv_flann = null; - opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; - opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; + }) {opencv_calib3d = null; opencv_contrib = null; + opencv_core = null; opencv_features2d = null; opencv_flann = null; + opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; + opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; opencv_video = null;}; "Cabal_2_2_0_1" = callPackage @@ -6464,7 +6466,7 @@ self: { librarySystemDepends = [ libGL libX11 libXext libXfixes ]; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;}; "GLFW-OGL" = callPackage @@ -7827,7 +7829,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {mysqlclient = null; inherit (pkgs) openssl; + }) {mysqlclient = null; inherit (pkgs) openssl; inherit (pkgs) zlib;}; "HDBC-odbc" = callPackage @@ -8027,12 +8029,12 @@ self: { }) {}; "HGL" = callPackage - ({ mkDerivation, array, base, X11 }: + ({ mkDerivation, array, base, stm, X11 }: mkDerivation { pname = "HGL"; - version = "3.2.3.1"; - sha256 = "0m9y2sdlbmw0n4xad26viajr391w0clpqw1256lanidwkrxfwpfh"; - libraryHaskellDepends = [ array base X11 ]; + version = "3.2.3.2"; + sha256 = "087k8i0bha3mzpqa3z3c6npl5vmccg7xcwl28lbv0yzbvj1qkg38"; + libraryHaskellDepends = [ array base stm X11 ]; description = "A simple graphics library based on X11 or Win32"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -8131,7 +8133,7 @@ self: { description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {CEGUIBase = null; CEGUIOgreRenderer = null; + }) {CEGUIBase = null; CEGUIOgreRenderer = null; hg3dcegui050 = null;}; "HGamer3D-Common" = callPackage @@ -8283,8 +8285,8 @@ self: { description = "Ogre Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {OgreMain = null; OgrePaging = null; OgreProperty = null; - OgreRTShaderSystem = null; OgreTerrain = null; + }) {OgreMain = null; OgrePaging = null; OgreProperty = null; + OgreRTShaderSystem = null; OgreTerrain = null; hg3dogre050 = null;}; "HGamer3D-SDL2-Binding" = callPackage @@ -8302,7 +8304,7 @@ self: { description = "SDL2 Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; + }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; inherit (pkgs.xorg) libX11;}; "HGamer3D-SFML-Binding" = callPackage @@ -8320,7 +8322,7 @@ self: { description = "SFML Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; + }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; sfml-system = null; sfml-window = null;}; "HGamer3D-WinEvent" = callPackage @@ -9229,6 +9231,42 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "HTF_0_14_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff + , directory, filepath, haskell-src, HUnit, lifted-base + , monad-control, mtl, old-time, pretty, process, QuickCheck, random + , regex-compat, template-haskell, temporary, text, time, unix + , unordered-containers, vector, xmlgen + }: + mkDerivation { + pname = "HTF"; + version = "0.14.0.1"; + sha256 = "025gcc77j547713bxm8y2i7xmq95nc4imyym6agmfrd7bh8h1jdb"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal process ]; + libraryHaskellDepends = [ + aeson array base base64-bytestring bytestring containers cpphs Diff + directory haskell-src HUnit lifted-base monad-control mtl old-time + pretty process QuickCheck random regex-compat text time unix vector + xmlgen + ]; + libraryToolDepends = [ cpphs ]; + executableHaskellDepends = [ + array base cpphs directory HUnit mtl old-time random text + ]; + executableToolDepends = [ cpphs ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath HUnit mtl + process random regex-compat template-haskell temporary text + unordered-containers + ]; + description = "The Haskell Test Framework"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HTTP" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split @@ -12458,6 +12496,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_6_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.6.3"; + sha256 = "10vn7gslx4zzjq547cwpzdfb4c5w3nsfis6qr03dr9c4fdzj61lx"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -12887,8 +12947,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.1.3.0"; - sha256 = "06i3lw329mvx7is5kb8hl2dz9dd0r8qh5g674ld006kbbk7p3jay"; + version = "0.1.3.1"; + sha256 = "1a5pygjxk839lxx6pavq72fl35sk53zq10q1ivsm309xrvq93pki"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -14495,8 +14555,8 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {comctl32 = null; comdlg32 = null; gdi32 = null; - kernel32 = null; ole32 = null; shell32 = null; user32 = null; + }) {comctl32 = null; comdlg32 = null; gdi32 = null; + kernel32 = null; ole32 = null; shell32 = null; user32 = null; winmm = null; winspool = null;}; "ObjectName" = callPackage @@ -17109,9 +17169,9 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {csfml-audio = null; csfml-graphics = null; - csfml-network = null; csfml-system = null; csfml-window = null; - sfml-audio = null; sfml-graphics = null; sfml-network = null; + }) {csfml-audio = null; csfml-graphics = null; + csfml-network = null; csfml-system = null; csfml-window = null; + sfml-audio = null; sfml-graphics = null; sfml-network = null; sfml-system = null; sfml-window = null;}; "SFML-control" = callPackage @@ -18549,8 +18609,8 @@ self: { }: mkDerivation { pname = "StockholmAlignment"; - version = "1.1.2"; - sha256 = "1x41m0xcmz9j4gypbl4pi6a6v53j6v37ndl8g5rq60fqfl18hizb"; + version = "1.2.0"; + sha256 = "0zz437d771cb4zpjzcddjl8xvz9qxmj1pyxql70lqczvqrk6k78y"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools SVGFonts text vector @@ -19050,8 +19110,8 @@ self: { }: mkDerivation { pname = "Taxonomy"; - version = "1.0.3"; - sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn"; + version = "2.0.0"; + sha256 = "1b2x0lkg5pgjk1jyanbi8g9rs1sr7llihyjhdfsg6fajklrzh3m9"; libraryHaskellDepends = [ aeson base bytestring either-unwrap fgl graphviz parsec text vector ]; @@ -20652,10 +20712,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq, text, text-short }: mkDerivation { pname = "X"; - version = "0.3.0.0"; - sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc"; - revision = "1"; - editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq"; + version = "0.3.1.0"; + sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -20677,8 +20735,8 @@ self: { ]; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage @@ -22652,8 +22710,8 @@ self: { ({ mkDerivation, base, criterion, time }: mkDerivation { pname = "acme-year"; - version = "2016"; - sha256 = "1zvhy62hrc47idl1awbdjzrhbhqjplsfy7lpybvdhc298criygdl"; + version = "2019"; + sha256 = "011vpap3j0riw6y23j8c4h7610yhjq00jpcfjg2g7lagb62gmkpa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; benchmarkHaskellDepends = [ base criterion ]; @@ -23109,20 +23167,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "advent-of-code-api_0_2_2_0" = callPackage + "advent-of-code-api_0_2_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, filepath, finite-typelits, http-api-data, http-client - , http-client-tls, http-media, HUnit, megaparsec, mtl, servant - , servant-client, servant-client-core, stm, tagsoup, text, time + , http-client-tls, http-media, HUnit, megaparsec, mtl, profunctors + , servant, servant-client, servant-client-core, stm, tagsoup, text + , time }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.2.0"; - sha256 = "1r06kb8l6h4hm4r1f7prch3px0zigdcp8vrzi1x0qw6g1wj4zii0"; + version = "0.2.4.2"; + sha256 = "01mw95ygb20bg6fs9bda1fr7z05h2sinmycpvi0ccid5qci57fa3"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath finite-typelits http-api-data http-client http-client-tls - http-media megaparsec mtl servant servant-client + http-media megaparsec mtl profunctors servant servant-client servant-client-core stm tagsoup text time ]; testHaskellDepends = [ base directory filepath HUnit text ]; @@ -23216,38 +23275,6 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.4.5.0"; - sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_6_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, Diff - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-abstraction, time, time-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "aeson"; version = "1.4.6.0"; sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj"; libraryHaskellDepends = [ @@ -23266,7 +23293,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -24811,16 +24837,21 @@ self: { }) {}; "alex-tools" = callPackage - ({ mkDerivation, base, deepseq, template-haskell, text }: + ({ mkDerivation, base, bytestring, deepseq, template-haskell, text + }: mkDerivation { pname = "alex-tools"; - version = "0.4"; - sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi"; - revision = "2"; - editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z"; - libraryHaskellDepends = [ base deepseq template-haskell text ]; + version = "0.5"; + sha256 = "06ghkigqabz9h17wjpc3jwv1f4k6fajpzblzvysqzg71pfncx88m"; + revision = "1"; + editedCabalFile = "0br92hrl0pxw2a5k9wgzk3zwyz2dimcwwjxijgzrd2yg0s1vnm9p"; + libraryHaskellDepends = [ + base bytestring deepseq template-haskell text + ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "alfred" = callPackage @@ -25516,6 +25547,22 @@ self: { broken = true; }) {}; + "altsvc" = callPackage + ({ mkDerivation, base, bytestring, cereal, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "altsvc"; + version = "0.1.0.0"; + sha256 = "0lgfj02ryc3130ymrkw179j311df2cj0ry9w32mvd77mwx48396c"; + libraryHaskellDepends = [ base bytestring cereal ]; + testHaskellDepends = [ + base bytestring cereal tasty tasty-hunit tasty-quickcheck + ]; + description = "HTTP Alternative Services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alure" = callPackage ({ mkDerivation, alure, base, OpenAL }: mkDerivation { @@ -28687,10 +28734,8 @@ self: { }: mkDerivation { pname = "ansi-pretty"; - version = "0.1.2.1"; - sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h"; - revision = "6"; - editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s"; + version = "0.1.2.2"; + sha256 = "0q72y2pnx5qx7jk1waq3qdry1azq07wygb9hcgjqz78lbszg19cm"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -28713,12 +28758,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_10_1" = callPackage + "ansi-terminal_0_10_2" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.10.1"; - sha256 = "1b168z688b1lg4d2bmbxmm2mj51mwm2wv0smfb1vcwjp2vzpqf9i"; + version = "0.10.2"; + sha256 = "0h09lia7gqchp023hbgwq4w8bmg33a02chaixdsx8nqbj8jf5558"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -28734,8 +28779,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.6.0.0"; - sha256 = "117j5s87pw1cmh9klzcc3jcc3hvynsrwknkqys8lqlhp2xkvha5y"; + version = "0.7.2.0"; + sha256 = "041xw7kq620ydnbdawmsdb65021p2534f9725qddv1i0pcwdn274"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29614,6 +29659,8 @@ self: { testHaskellDepends = [ base bytestring ]; description = "RPC API client for Factom"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "api-rpc-pegnet" = callPackage @@ -30589,8 +30636,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric-datadog"; - version = "1.1.1"; - sha256 = "1188xwwxx7ykdh7v15gqnh0kv9w1g66wp09jp1fpfyms1qj12nqj"; + version = "1.1.2"; + sha256 = "1wja13n9k2vad0icqsm8lydrxkgb01062ajm3y1xq7fybn5g6rbx"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers @@ -31406,6 +31453,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell bindings to the ArrayFire general-purpose GPU library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {af = null;}; "arraylist" = callPackage @@ -32829,8 +32878,8 @@ self: { }: mkDerivation { pname = "atomic-write"; - version = "0.2.0.6"; - sha256 = "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl"; + version = "0.2.0.7"; + sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; libraryHaskellDepends = [ base bytestring directory filepath temporary text unix-compat ]; @@ -32903,8 +32952,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.34"; - sha256 = "146l1zlm4jc83v8rs3ci9j53x2gsvpdb2wjx06d4zg1h2ri8064i"; + version = "0.2.0.35"; + sha256 = "02lqpvfqmz99k5ywim9badn22y18qqss2q21ibj79l1lljw4sqss"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup filepath ]; @@ -32929,8 +32978,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.3.0.7"; - sha256 = "15xr1g3ivmfnwmbrh2ga75vppyv1qk6zcx556f69jxx1ab492zyq"; + version = "3.4.0.1"; + sha256 = "0lfmlsnxa7fvifqay4xvnkl8cpbx7a6vbfb0szvb5j0nfa8607n6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33574,21 +33623,18 @@ self: { "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , case-insensitive, conduit, containers, http-conduit, http-types - , network-uri, resourcet, tagstream-conduit, text, transformers + , case-insensitive, conduit, containers, html-conduit, http-conduit + , http-types, network-uri, resourcet, text, transformers , unordered-containers, xml-conduit }: mkDerivation { pname = "authenticate"; - version = "1.3.4"; - sha256 = "1f1gjggfq114h3nrlzg2svm0j5ghp6n9zlgb3fnq2pgpzpdndm9z"; - revision = "1"; - editedCabalFile = "0ipbmf633c0kmcwwb7d51ac8s4220nfyk5xghhq66mpgna77j2c2"; + version = "1.3.5"; + sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive - conduit containers http-conduit http-types network-uri resourcet - tagstream-conduit text transformers unordered-containers - xml-conduit + conduit containers html-conduit http-conduit http-types network-uri + resourcet text transformers unordered-containers xml-conduit ]; description = "Authentication methods for Haskell web applications"; license = stdenv.lib.licenses.mit; @@ -34013,7 +34059,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {aviation-cessna172-weight-balance = null; + }) {aviation-cessna172-weight-balance = null; aviation-units = null; aviation-weight-balance = null;}; "avl-static" = callPackage @@ -34587,8 +34633,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "2.0.1"; - sha256 = "0q8x5zqxql403wm9ndii42lac8737i0qhd7p7nsy3i2sswfr5gry"; + version = "2.0.2"; + sha256 = "11pkvq3d5w56bsqdha9cfsbqw0rhfda9bh7zipik1b0lc3mk8p0a"; libraryHaskellDepends = [ aeson base bytestring http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -36092,8 +36138,8 @@ self: { pname = "base62"; version = "0.1.0.0"; sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p"; - revision = "1"; - editedCabalFile = "13n150czdd97hrpjnrkd0wcg7ch9d5zvqlv38n61pjcds6dvvdsy"; + revision = "2"; + editedCabalFile = "0i1ipcawbnjf0mjdva4q8s2kw4hd4lfnygmvc81sjxd9crlwy4vm"; libraryHaskellDepends = [ base byteslice natural-arithmetic primitive small-bytearray-builder wide-word @@ -37701,6 +37747,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5_6" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.6"; + sha256 = "1jnsnc0rj3vkx8rjwsf2aacla9xzdfy1am9mmjk8crxp2gkazcnc"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -37796,7 +37865,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {leksah-dummy = null; leksah-main = null; + }) {leksah-dummy = null; leksah-main = null; leksah-plugin-pane = null;}; "billeksah-pane" = callPackage @@ -38580,10 +38649,10 @@ self: { ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; "bindings-GLFW_3_3_0_0" = callPackage @@ -38606,10 +38675,10 @@ self: { description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; "bindings-K8055" = callPackage @@ -39793,6 +39862,8 @@ self: { ]; description = "Plays chess"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-array" = callPackage @@ -41743,15 +41814,16 @@ self: { "bond" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring - , cmdargs, derive, Diff, directory, filepath, HUnit, megaparsec - , monad-loops, mtl, pretty, process, QuickCheck, scientific - , shakespeare, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , text, unordered-containers + , cmdargs, Diff, directory, filepath, HUnit, megaparsec + , monad-loops, mtl, pretty, process, QuickCheck + , quickcheck-arbitrary-template, scientific, shakespeare, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text + , unordered-containers }: mkDerivation { pname = "bond"; - version = "0.11.0.3"; - sha256 = "1zarrlhcp8q1impikmqsz8mnaxi8l8b4nl02qp8xm6y6gpbyhaqj"; + version = "0.12.0.1"; + sha256 = "0zhfhr1ya0ljvg5s0s6fpqyrb0f25qdkschblfcmf68c6xmy4ws0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41760,12 +41832,14 @@ self: { ]; executableHaskellDepends = [ aeson async base bytestring cmdargs directory filepath megaparsec - monad-loops process text + monad-loops mtl process scientific shakespeare text + unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring cmdargs derive Diff directory - filepath HUnit megaparsec monad-loops pretty QuickCheck shakespeare - tasty tasty-golden tasty-hunit tasty-quickcheck text + aeson aeson-pretty base bytestring cmdargs Diff directory filepath + HUnit megaparsec monad-loops mtl pretty QuickCheck + quickcheck-arbitrary-template scientific shakespeare tasty + tasty-golden tasty-hunit tasty-quickcheck text unordered-containers ]; description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; @@ -42064,8 +42138,8 @@ self: { ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.6"; - sha256 = "0zkr9w9qqrcicdm6r928a1z1svspnx6vh0b9mac4q7cd1h021ph3"; + version = "1.4.5.7"; + sha256 = "11ycghpgngnw0ks47h3wmp0xdfl3qw1wnwdil1vmr1b5a4gngzi1"; libraryHaskellDepends = [ base mtl semigroups template-haskell text ]; @@ -42732,7 +42806,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_50" = callPackage + "brick_0_50_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, filepath , microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -42741,10 +42815,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.50"; - sha256 = "0g2c420zpvjv8v3y5l4jhmml279d920k9d92yga8d86jymanbvy9"; - revision = "1"; - editedCabalFile = "0sknkg4fkmxs78ysk76xhrz5mixndazxnmw7ss1j560z8z368ry0"; + version = "0.50.1"; + sha256 = "0wv69pbs4xqfdqw9ag32fhqhmh8djxb14h8jpyblmykirlznx77y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43007,16 +43079,14 @@ self: { }) {}; "broadcast-chan" = callPackage - ({ mkDerivation, async, base, criterion, deepseq, stm + ({ mkDerivation, async, base, criterion, deepseq, stm, transformers , unliftio-core }: mkDerivation { pname = "broadcast-chan"; - version = "0.2.0.2"; - sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv"; - revision = "1"; - editedCabalFile = "1sgifhdf9l8zkc0dddnkfy8f1bkry061vm67iich489fi8nlhfjn"; - libraryHaskellDepends = [ base unliftio-core ]; + version = "0.2.1"; + sha256 = "1pigxkncv71p51qnhxkag6hry14jp5s2skmxxbq2pmlrkj9j6rgs"; + libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; @@ -43028,8 +43098,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-conduit"; - version = "0.2.0.2"; - sha256 = "1xnf1ibgnzi4xbmfgrkkfg3pkig7v8vv0xpfhhcdmnybwm2yhlli"; + version = "0.2.1"; + sha256 = "1n9hqmdyw3v58kv8czbvvw5sfy4il3izqvn6rk8gak84hb51brxq"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -43048,8 +43118,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-pipes"; - version = "0.2.0.2"; - sha256 = "1brr0vjrsd53qji8pmns003m3k1s28hvr2w8875hv2fznmm8x1g7"; + version = "0.2.1"; + sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -43068,10 +43138,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-tests"; - version = "0.2.0.2"; - sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym"; - revision = "2"; - editedCabalFile = "0mfld36ppfyhx2w9a99gxa8qxnik0mnznl7bvqhbbaf1ayinhx91"; + version = "0.2.1"; + sha256 = "01vlhxxwhkakllffw7vdqr7fcsf9m7rkwkbs8x6d5dfwb5qxs6gk"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -43273,8 +43341,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; - revision = "1"; - editedCabalFile = "07k9422yaw7rz66awmc20ni17xw2bd1pn48ja79c66d5va89f6wz"; + revision = "2"; + editedCabalFile = "0bz62lxdbnwkfr1d4ngm8xi4y1ndpdflbv71s6h43vp5lbd546hr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -43589,6 +43657,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "buffet" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava + , containers, directory, filepath, language-docker, mustache + , optparse-applicative, parsec, random, split, tasty, tasty-hunit + , text, typed-process, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "buffet"; + version = "0.2.0"; + sha256 = "1zmsgsxdl7mr6h9m7g9n7qb2w86s6xr379psr947fba4vkydzi0n"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cassava containers directory + filepath language-docker mustache optparse-applicative parsec + random split text typed-process unordered-containers vector yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath tasty tasty-hunit text + typed-process unordered-containers vector yaml + ]; + doHaddock = false; + description = "Assembles many Dockerfiles in one"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "buffon" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random , mwc-random-monad, primitive, transformers @@ -43885,8 +43982,8 @@ self: { }: mkDerivation { pname = "bulmex"; - version = "2.1.0"; - sha256 = "0awdbwh9s5wdj05fnkzr7dpp2riipv9rlvknrcxf4dpxp9c72n1g"; + version = "4.0.0"; + sha256 = "0892prpi8hf8mkwr6n9228bfyji0wgdz9hyh619k20f6xim13ysc"; libraryHaskellDepends = [ aeson base bytestring containers generic-lens jsaddle jsaddle-dom keycode lens network-uri reflex reflex-dom-core reflex-dom-helpers @@ -44396,6 +44493,8 @@ self: { pname = "bytesmith"; version = "0.3.1.0"; sha256 = "1wkwxb9ygc6hii90jr7cjbv4s5d0l4wv0197p9jn4lj7h4i79iqd"; + revision = "1"; + editedCabalFile = "13maddwkl9ajczvnrsnsa9f7w20fzq8il09xh9lqhwyrz9yak4ii"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -44848,6 +44947,8 @@ self: { pname = "bytestring-trie"; version = "0.2.5.0"; sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488"; + revision = "1"; + editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; license = stdenv.lib.licenses.bsd3; @@ -45623,6 +45724,8 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-info" = callPackage @@ -45740,6 +45843,32 @@ self: { broken = true; }) {}; + "cabal-install-parsers" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , binary, binary-instances, bytestring, Cabal, containers + , cryptohash-sha256, directory, filepath, lukko, network-uri + , parsec, pretty, tar, tasty, tasty-golden, tasty-hunit, text, time + , transformers, tree-diff + }: + mkDerivation { + pname = "cabal-install-parsers"; + version = "0.1"; + sha256 = "0jklbv5c6nsbdj52a42ywr6nl7xqr2hgzc8l8g6aalb8nr117b45"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary binary-instances bytestring + Cabal containers cryptohash-sha256 directory filepath lukko + network-uri parsec pretty tar text time transformers + ]; + testHaskellDepends = [ + ansi-terminal base bytestring Cabal containers directory filepath + tasty tasty-golden tasty-hunit tree-diff + ]; + description = "Utilities to work with cabal-install files"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cabal-lenses" = callPackage ({ mkDerivation, base, Cabal, lens, strict, system-fileio , system-filepath, text, transformers, unordered-containers @@ -45846,18 +45975,16 @@ self: { }) {}; "cabal-plan" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base-compat + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat , base16-bytestring, bytestring, containers, directory, filepath - , mtl, optics-core, optparse-applicative, parsec, process-extras + , mtl, optics-core, optparse-applicative, parsec, process , semialign, singleton-bool, text, these, topograph, transformers , vector }: mkDerivation { pname = "cabal-plan"; - version = "0.6.1.0"; - sha256 = "0jb50a45aky1jljl6g84h61wrirk6gh5pwk0m0pkhd1q7zj58jgi"; - revision = "1"; - editedCabalFile = "02krq0ibb4q2ypj7cp8yclc175a2hlaa9x5x3j3i8wjkf8pyyvx1"; + version = "0.6.2.0"; + sha256 = "0gwbyyj4xih9barg2c589v6z82s0gx98airs6icivg301khg9fzg"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -45866,9 +45993,9 @@ self: { filepath text ]; executableHaskellDepends = [ - ansi-terminal base base-compat bytestring containers directory mtl - optics-core optparse-applicative parsec process-extras semialign - singleton-bool text these topograph transformers vector + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector ]; description = "Library and utility for processing cabal's plan.json file"; license = stdenv.lib.licenses.gpl2Plus; @@ -46937,6 +47064,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "calenderweek" = callPackage + ({ mkDerivation, base, megaparsec, optparse-generic, text, time }: + mkDerivation { + pname = "calenderweek"; + version = "1.0.0"; + sha256 = "10lv7c74jrw8v06vaz8assgqlvrk0spn08sw0nvzz1q0x0zbbwff"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base megaparsec optparse-generic text time + ]; + description = "Commandline tool to get week of the year"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "call" = callPackage ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors , containers, control-bool, deepseq, directory, filepath, free @@ -46982,6 +47126,8 @@ self: { ]; description = "A simple library to call Alloy given a specification"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "call-haskell-from-anything" = callPackage @@ -47292,8 +47438,8 @@ self: { pname = "cantor-pairing"; version = "0.1.1.0"; sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw"; - revision = "2"; - editedCabalFile = "0vl4b3v7qzbsd93vb0flyd6xkpayji49il97d2a6v35cliph5yw2"; + revision = "3"; + editedCabalFile = "0rcjz2r4l4crxxda3hjpi5kkxrh4pgdrcbw29bj5w9a4jph0d0ld"; libraryHaskellDepends = [ arithmoi base containers integer-gmp integer-logarithms ]; @@ -48204,24 +48350,6 @@ self: { }: mkDerivation { pname = "cassava-megaparsec"; - version = "2.0.0"; - sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf"; - libraryHaskellDepends = [ - base bytestring cassava megaparsec unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava hspec hspec-megaparsec vector - ]; - description = "Megaparsec parser of CSV files that plays nicely with Cassava"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cassava-megaparsec_2_0_1" = callPackage - ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec - , megaparsec, unordered-containers, vector - }: - mkDerivation { - pname = "cassava-megaparsec"; version = "2.0.1"; sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3"; libraryHaskellDepends = [ @@ -48232,7 +48360,6 @@ self: { ]; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-records" = callPackage @@ -50558,8 +50685,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.8"; - sha256 = "08lxf5f40nhqpxx7f75d3lp5xyjmh3gk1hljm4iq7p8mm22nl2fn"; + version = "1.0.9"; + sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -50576,20 +50703,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "chronos_1_0_9" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , criterion, deepseq, doctest, hashable, HUnit, old-locale - , primitive, QuickCheck, semigroups, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, thyme - , time, torsor, vector + "chronos_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, HUnit, old-locale, primitive + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, thyme, time, torsor, vector }: mkDerivation { pname = "chronos"; - version = "1.0.9"; - sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv"; + version = "1.1"; + sha256 = "0g41hchir6rxfnd8halg49y80pc9dr38k7b7cik18gqdasswwg6c"; libraryHaskellDepends = [ - aeson attoparsec base bytestring clock hashable primitive - semigroups text torsor vector + aeson attoparsec base bytestring hashable primitive semigroups text + torsor vector ]; testHaskellDepends = [ attoparsec base bytestring doctest HUnit QuickCheck test-framework @@ -51855,8 +51981,23 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: mkDerivation { pname = "clay"; - version = "0.13.1"; - sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4"; + version = "0.13.2"; + sha256 = "1jxwq159hcc55ijga18zdlqr3ga1flilymq96hqpizb4khpq7y6j"; + libraryHaskellDepends = [ base mtl text ]; + testHaskellDepends = [ base hspec hspec-discover mtl text ]; + testToolDepends = [ hspec-discover ]; + description = "CSS preprocessor as embedded Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "clay_0_13_3" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.13.3"; + sha256 = "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; @@ -52264,8 +52405,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.1.0"; - sha256 = "010rra96lw9qkqm2jvnjxzb6q7xmg8drxaiywbmpb93slrb56r6n"; + version = "0.2.1.2"; + sha256 = "0fh9lp8r73mslhwxcjpfzvm0j0qbq0prr4bkkwq2v16izg14ccda"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -52723,13 +52864,15 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.5"; - sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs"; + version = "1.8.0"; + sha256 = "0j98dbyhc845y26abyp8sdcajpxvpsjcqrmcls4jnb4bhnz21jkc"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; description = "Haskell CloudI API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cloudyfs" = callPackage @@ -53037,23 +53180,6 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.2.0"; - sha256 = "03xflrkyw84qv3yjly5iks9311bqv5cmrmsylr763v4ph0fn7rjq"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - benchmarkHaskellDepends = [ - base blaze-html cheapskate criterion discount markdown sundown text - ]; - description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cmark-gfm_0_2_1" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cheapskate - , criterion, discount, HUnit, markdown, sundown, text - }: - mkDerivation { - pname = "cmark-gfm"; version = "0.2.1"; sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23"; libraryHaskellDepends = [ base bytestring text ]; @@ -53063,7 +53189,6 @@ self: { ]; description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark-highlight" = callPackage @@ -53258,6 +53383,18 @@ self: { broken = true; }) {}; + "cmf" = callPackage + ({ mkDerivation, base, containers, hedgehog }: + mkDerivation { + pname = "cmf"; + version = "0.1"; + sha256 = "16d83x6qggifljm7n8sqlawy79iz7lkrb6vknrr825wa0zg1bc49"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hedgehog ]; + description = "(C)oncurrent (M)onoidal (F)olds"; + license = stdenv.lib.licenses.mit; + }) {}; + "cml" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53552,46 +53689,52 @@ self: { "cobot-io" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring - , containers, data-msgpack, deepseq, hspec, http-conduit, hyraxAbif - , lens, linear, mtl, neat-interpolation, QuickCheck, split, text - , vector + , containers, data-msgpack, deepseq, directory, hspec, http-conduit + , hyraxAbif, lens, linear, mtl, neat-interpolation, QuickCheck + , split, text, vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.0"; - sha256 = "0md5sd67sd3wl7p9z6904pbswlkkzlclrgj7lc3a2qpq6ky7w1ik"; + version = "0.1.2.1"; + sha256 = "17rl3xbap3fgn2bg0iykysxaff1rakr8fq759hl7pmx3qnr8xz12"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector ]; testHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack - deepseq hspec http-conduit hyraxAbif lens linear mtl + deepseq directory hspec http-conduit hyraxAbif lens linear mtl neat-interpolation QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cobot-tools" = callPackage - ({ mkDerivation, array, base, cobot, containers, data-msgpack - , deepseq, hspec, lens, mtl, neat-interpolation, QuickCheck, RNA - , text + ({ mkDerivation, array, base, bytestring, cobot, containers + , data-default, data-msgpack, deepseq, hspec, lens, mtl + , neat-interpolation, QuickCheck, regex-tdfa, RNA, text }: mkDerivation { pname = "cobot-tools"; - version = "0.1.0.1"; - sha256 = "0jlfz2jf8vphaxg3wn9bhzzjp5ldnpiyf420fz7waadi6bfi7q75"; + version = "0.1.1.0"; + sha256 = "0i717g632jvnah8cibgia6r12mmyiqwfgryiam71pvbaz2508rhr"; libraryHaskellDepends = [ - array base cobot containers data-msgpack deepseq lens mtl text + array base bytestring cobot containers data-default data-msgpack + deepseq lens mtl regex-tdfa text ]; librarySystemDepends = [ RNA ]; testHaskellDepends = [ - array base cobot containers data-msgpack deepseq hspec lens mtl - neat-interpolation QuickCheck text + array base bytestring cobot containers data-default data-msgpack + deepseq hspec lens mtl neat-interpolation QuickCheck regex-tdfa + text ]; description = "Biological data file formats and IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {RNA = null;}; "code-builder" = callPackage @@ -54995,6 +55138,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_6" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , distributive, doctest, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.6"; + sha256 = "1blgp2nm9cvnsdi2bmkmly5m0gz91npjvf1i5j4pnx6imhbb1kvp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers distributive tagged transformers + transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -55175,6 +55337,24 @@ self: { broken = true; }) {}; + "compact-word-vectors" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "compact-word-vectors"; + version = "0.2.0.1"; + sha256 = "0ix8l6vvnf62vp6716gmypwqsrs6x5pzcx5yfj24bn4gk0xak3lm"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck + ]; + description = "Small vectors of small integers stored very compactly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "compactable" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -55319,6 +55499,8 @@ self: { pname = "compensated"; version = "0.7.3"; sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg"; + revision = "1"; + editedCabalFile = "1ax4jq2hp5737yvi3lxvyj3c4bzkg10h4c7w3nw0hgfcn1ng49kc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive @@ -55331,6 +55513,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compensated_0_8" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, distributive, doctest + , generic-deriving, hashable, lens, log-domain, safecopy + , semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "compensated"; + version = "0.8"; + sha256 = "1jvvsa1dqsds6ri6f746y47flwrlfxnc7jsgic2m6kvf1b700qr9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq distributive + hashable lens log-domain safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + description = "Compensated floating-point arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "competition" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -56147,14 +56352,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_8_0_0" = callPackage + "concurrency_1_8_1_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.8.0.0"; - sha256 = "091nv78c4cfcrg4hwxhn97l0xr5x2n4pfh802ysxmn2zvnm9fbf4"; + version = "1.8.1.0"; + sha256 = "0nw5i85lzh03ppcprzpvrlp3bmdam1z50bp7ddq9mp2ycyjbvrp5"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -57711,6 +57916,8 @@ self: { testHaskellDepends = [ base hedgehog property ]; description = "Partial orders & Galois connections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "consistent" = callPackage @@ -57927,8 +58134,8 @@ self: { ({ mkDerivation, base, category, unconstrained }: mkDerivation { pname = "constraint"; - version = "0.1.3.0"; - sha256 = "0yp09vg9hx5p7ncyh8h6mhcl14kanhhjldyn892lmp0jmlm7flyy"; + version = "0.1.4.0"; + sha256 = "0cdncdzpgyr9a0v213g9f6fqfd4311j5rg84gh85xynp8hhh0rr4"; libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; @@ -57977,8 +58184,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "constraint-tuples"; - version = "0.1.1"; - sha256 = "0jml9sqgmfz3yqpd8g7k0ki1n036a6ws4m5ywbjmcyiz6gr52czl"; + version = "0.1.2"; + sha256 = "16f9y0q771f3mc38g8jpr875c8grjav6sg9lwbhg7nmcvcczwqk2"; libraryHaskellDepends = [ base ]; description = "Partially applicable constraint tuples"; license = stdenv.lib.licenses.bsd3; @@ -59000,26 +59207,6 @@ self: { }: mkDerivation { pname = "cookie"; - version = "0.4.4"; - sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq text time - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - text time - ]; - description = "HTTP cookie parsing and rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cookie_0_4_5" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - , time - }: - mkDerivation { - pname = "cookie"; version = "0.4.5"; sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"; libraryHaskellDepends = [ @@ -59031,7 +59218,6 @@ self: { ]; description = "HTTP cookie parsing and rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cookies" = callPackage @@ -59066,12 +59252,15 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.0.1"; - sha256 = "0sfvrk8ik6zaim6xlkvlnz3rnrqbiqvq7i6yxjiba74qx5w8yv4m"; + version = "3.1"; + sha256 = "1dw7bkmadwsncd39pkngaxglfsnrnc9km7y8ld0l9bkiiw136x2w"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base copilot-c99 copilot-core copilot-language copilot-libraries copilot-theorem directory filepath optparse-applicative ]; + executableHaskellDepends = [ base copilot-c99 copilot-libraries ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59085,8 +59274,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.0.2"; - sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y"; + version = "3.1"; + sha256 = "1cwypmis5dcdzjasq03wcas4lnml7l4a4ymw1v55aybfmz94mxc3"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -59114,14 +59303,12 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, containers, dlist, mtl, pretty, random }: + ({ mkDerivation, base, containers, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.0.1"; - sha256 = "0gq55db39fsg3kim83s86nw58f9wbg59nlrhi4ic70864iv55zs8"; - libraryHaskellDepends = [ - base containers dlist mtl pretty random - ]; + version = "3.1"; + sha256 = "08xz5s0b2fd5igja5wiaq93ignx6bsf942rg4hy42fmh4c03hylp"; + libraryHaskellDepends = [ base containers dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59132,8 +59319,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.0.1"; - sha256 = "1vx656vdjvdbsd3zv5cpb9xjvj85ylfqbbk8iibkbdgbq6sm11f6"; + version = "3.1"; + sha256 = "0hdk8418l30vz9lv7c4bzh8m5gn8knpvg296b14n66si9g36qglp"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -59150,8 +59337,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.0"; - sha256 = "0xrv37m770qnc722iv5x67kjic11q2sd1bcx2b0gr93p54frbjs4"; + version = "3.1"; + sha256 = "094hjzg22b55n4kv89ccr7pbgqpbd0z8f5myn93nyw6yqpmpp30v"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -59185,8 +59372,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.0"; - sha256 = "1h8gjlfhl473d6h8zafmqv3dzdhmgpyp8bsvysfzb7s2ga5hwnrq"; + version = "3.1"; + sha256 = "15vnl5lg9s6h9s98f1nvva3ab0gdn3a5314mxdfxxa53ywmiq2a0"; libraryHaskellDepends = [ ansi-terminal base bimap containers copilot-core data-default directory mtl parsec pretty process random transformers xml @@ -59257,26 +59444,8 @@ self: { }: mkDerivation { pname = "core-data"; - version = "0.2.1.0"; - sha256 = "1d4sf0383kcc7wzy1bld1hlagf9g934bwnx6xdvj45grdkj8l787"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable prettyprinter - prettyprinter-ansi-terminal scientific text unordered-containers - vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "core-data_0_2_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific - , text, unordered-containers, vector - }: - mkDerivation { - pname = "core-data"; - version = "0.2.1.3"; - sha256 = "1l5q8ayhpr6cjvsj9y4hj8b9iq2013rg9dq1f8b349c9mz98bxqa"; + version = "0.2.1.4"; + sha256 = "1arrw5xbzxpwqzpxcyw13lv4sazn5pzv448crw54284kyi798hc3"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter prettyprinter-ansi-terminal scientific text unordered-containers @@ -59284,7 +59453,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -59313,8 +59481,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.2.3"; - sha256 = "0yyhvi84qw67lql1vdf9j1psxglqv1nd43wh6kxz92n1im7canks"; + version = "0.2.2.4"; + sha256 = "0l30qvn118bb6vj39ca6wl7ynhf7hkwq7pbh60vhcmwcr20rj4b1"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath hashable hinotify hourglass mtl prettyprinter @@ -59334,32 +59502,14 @@ self: { }: mkDerivation { pname = "core-text"; - version = "0.2.2.1"; - sha256 = "0bql1ksfblnplhj4rbzsjwjbdqdy3z28c51i63q6vhy20mr3bxqk"; - libraryHaskellDepends = [ - base bytestring deepseq fingertree hashable prettyprinter - prettyprinter-ansi-terminal template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "core-text_0_2_2_3" = callPackage - ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable - , prettyprinter, prettyprinter-ansi-terminal, template-haskell - , text, text-short - }: - mkDerivation { - pname = "core-text"; - version = "0.2.2.3"; - sha256 = "00ac8f7pajqr77r48g332kgfwsmnybdw2f2z9f7dx03hm3x9vgyx"; + version = "0.2.2.4"; + sha256 = "1lfxphm5y9irrs225vr0gbvb129lxzfr0xjxy23dz6d0cc3pr1ph"; libraryHaskellDepends = [ base bytestring deepseq fingertree hashable prettyprinter prettyprinter-ansi-terminal template-haskell text text-short ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "corebot-bliki" = callPackage @@ -60051,28 +60201,6 @@ self: { }: mkDerivation { pname = "cql"; - version = "4.0.1"; - sha256 = "021qaz6qvbdp76gdyfcs07wnnq6k6r1cmqky0g3giinjdrm4qac9"; - libraryHaskellDepends = [ - base bytestring cereal containers Decimal iproute network - template-haskell text time transformers uuid vector - ]; - testHaskellDepends = [ - base bytestring cereal Decimal iproute network QuickCheck tasty - tasty-quickcheck text time uuid - ]; - description = "Cassandra CQL binary protocol"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cql_4_0_2" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, Decimal - , iproute, network, QuickCheck, tasty, tasty-quickcheck - , template-haskell, text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "cql"; version = "4.0.2"; sha256 = "0b6806ahmg4yacx5wc4v53gihhkwywajhqm13kb11nxabww3lapl"; libraryHaskellDepends = [ @@ -62661,8 +62789,8 @@ self: { }: mkDerivation { pname = "curry-base"; - version = "1.1.0"; - sha256 = "1hxac2mx7irphcyhljwivx1w6j6li0s7gl54yb50na6qpna7arqg"; + version = "1.1.1"; + sha256 = "0dczgya46jk80j8b7sswjcck64hzw7fifipixnhylhlfvd1cqdlb"; libraryHaskellDepends = [ base containers directory extra filepath mtl parsec pretty time transformers @@ -62673,24 +62801,26 @@ self: { }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, Cabal, containers, curry-base, directory - , extra, filepath, mtl, network-uri, pretty, process, set-extra - , transformers + ({ mkDerivation, base, bytestring, Cabal, containers, curry-base + , directory, extra, file-embed, filepath, mtl, network-uri, pretty + , process, set-extra, template-haskell, transformers }: mkDerivation { pname = "curry-frontend"; - version = "1.0.3"; - sha256 = "0dqmmvn6iziyzdmig1gbcpdpbpg1hjp57pldzcv03fm2bjhq0a4q"; + version = "1.0.4"; + sha256 = "1dfljqyrp9w0sw3zmyy9rglpnjv14qj8ky1yjslmiaanjnl0m07b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers curry-base directory extra filepath mtl network-uri - pretty process set-extra transformers + base bytestring containers curry-base directory extra file-embed + filepath mtl network-uri pretty process set-extra template-haskell + transformers ]; executableHaskellDepends = [ - base containers curry-base directory extra filepath mtl network-uri - pretty process set-extra transformers + base bytestring containers curry-base directory extra file-embed + filepath mtl network-uri pretty process set-extra template-haskell + transformers ]; testHaskellDepends = [ base Cabal curry-base filepath ]; description = "Compile the functional logic language Curry to several intermediate formats"; @@ -63044,7 +63174,7 @@ self: { description = "A raw binding for the directX 11"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.none; - }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; + }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; d3dxof = null; dxgi = null; dxguid = null;}; "d3js" = callPackage @@ -63353,7 +63483,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) curl; inherit (pkgs) ncurses; + }) {inherit (pkgs) curl; inherit (pkgs) ncurses; inherit (pkgs) zlib;}; "darcs-fastconvert" = callPackage @@ -64181,6 +64311,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse_4_7_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "4.7.0.0"; + sha256 = "0ccbb8kf2spaa2h6k10y26zzaij1w28vrifhc8c1ljlvsmc9dkf3"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim tagged + ]; + testHaskellDepends = [ base hspec tagged ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-diverse-lens" = callPackage ({ mkDerivation, base, data-diverse, data-has, hspec, lens , profunctors, tagged @@ -67632,8 +67780,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.0"; - sha256 = "0l5nj7jalyca6vv9aqsx0j799vrr65cm1jzh17fcnwkxair3lkgx"; + version = "0.1.1.1"; + sha256 = "0i3zgngcdli6hw09h985ca4n7l9cpsrxalbhg8lbq32hwh7dim89"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -68077,6 +68225,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_8" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.8"; + sha256 = "1dznwypw0w935z30zi9pf9k4mr5yfl6jfp43nv9vx3f6zy5gip9r"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -68365,8 +68537,8 @@ self: { }: mkDerivation { pname = "df1"; - version = "0.3.1"; - sha256 = "0a1fpi9r6nivjxlknfyfkwdgnq5m6qmf68z46m3xjvy0md40caij"; + version = "0.3.2"; + sha256 = "1iywyrz2pfdpichfq6n77x8fpmfikj20rhkgnrwcf63ichav6xfp"; libraryHaskellDepends = [ attoparsec base bytestring containers text time ]; @@ -68632,30 +68804,33 @@ self: { "dhall-fly" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-yaml, base, bytestring - , dhall, dhall-json, hspec, hspec-discover, scientific, text - , transformers, unordered-containers, vector + , dhall, dhall-json, hspec, hspec-discover, optparse-applicative + , scientific, text, transformers, unordered-containers, vector }: mkDerivation { pname = "dhall-fly"; - version = "0.1.0"; - sha256 = "0rjbcpwcpz3kq0cil0pp7vkmksvnyxzv8jg5jpgnkg9pzmapg43y"; + version = "0.2.0"; + sha256 = "0h684icyp6r5cmr5cddgwbi2ci5ihkra0lyhgnisgrsvn8qmzz5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing base dhall scientific text transformers - unordered-containers vector + aeson aeson-casing base dhall optparse-applicative scientific text + transformers unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-casing aeson-yaml base bytestring dhall dhall-json - scientific text transformers unordered-containers vector + optparse-applicative scientific text transformers + unordered-containers vector ]; testHaskellDepends = [ - aeson aeson-casing base dhall hspec scientific text transformers - unordered-containers vector + aeson aeson-casing base dhall hspec optparse-applicative scientific + text transformers unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Translate concourse config from Dhall to YAML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-json" = callPackage @@ -68900,8 +69075,8 @@ self: { }: mkDerivation { pname = "di"; - version = "1.2"; - sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b"; + version = "1.3"; + sha256 = "13d503xhmnj2br9m4r4xx58hd2p8jsj8hxf9b4k4451p31kbzs54"; libraryHaskellDepends = [ base containers df1 di-core di-df1 di-handle di-monad exceptions ]; @@ -68915,8 +69090,8 @@ self: { }: mkDerivation { pname = "di-core"; - version = "1.0.3"; - sha256 = "1rfza96ljcf754mj44m2ffm51k9v6c0ii2sqqnddjkva3h3hx47h"; + version = "1.0.4"; + sha256 = "0wrj2ndzk9r7izjvwkjjmqb3gg1zy93ch7j7fdalzadzzsd4sqsm"; libraryHaskellDepends = [ base containers safe-exceptions stm time ]; @@ -68934,8 +69109,8 @@ self: { }: mkDerivation { pname = "di-df1"; - version = "1.0.2"; - sha256 = "1imk26njmr7hj56227yxgshjh4dicgr2c9bpc2m9nvsw2qbqslfh"; + version = "1.2"; + sha256 = "0bixrinmmb496j55c3vlh914nq6zfsaxq0pp2fcdxhwig1y53fgr"; libraryHaskellDepends = [ base df1 di-core di-handle di-monad stm ]; @@ -69147,34 +69322,6 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.4.3"; - sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; - revision = "3"; - editedCabalFile = "0mm1mmagx6q8g6dxk1cagqka38z6393ihp0lvf6095prlvidasqs"; - libraryHaskellDepends = [ - base circle-packing colour containers cubicbezier data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout hashable lens linear mfsolve MonadRandom monoid-extras - mtl mtl-compat parsec random semigroups split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-contrib_1_4_4" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , cubicbezier, data-default, data-default-class, diagrams-core - , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens - , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat - , parsec, QuickCheck, random, semigroups, split, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; libraryHaskellDepends = [ @@ -69189,7 +69336,6 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage @@ -70196,8 +70342,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.8"; - sha256 = "0m3m9c2452b0x7ccglkz7mr3ivi7r98qa44zwfnf7a55d6xckfa9"; + version = "0.9"; + sha256 = "0xyghgg8kzjrvhrcjizqnbprcyq5a3ma3x0dfijrdvbyd3lzghvm"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -72265,17 +72411,14 @@ self: { "dns" = callPackage ({ mkDerivation, array, async, attoparsec, auto-update, base - , base16-bytestring, base64-bytestring, bytestring, Cabal - , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec - , iproute, mtl, network, psqueues, QuickCheck, word8 + , base16-bytestring, base64-bytestring, bytestring, containers + , cryptonite, doctest, hourglass, hspec, iproute, mtl, network + , psqueues, QuickCheck, word8 }: mkDerivation { pname = "dns"; - version = "4.0.0"; - sha256 = "0gq0y8pw4x8fja0f3hhwpbxh4rg2i8nzfnp2rxh2py49qfhg38mj"; - revision = "1"; - editedCabalFile = "0cg5jhn5g28qspkinx44zyz0yn08ddcsylhmvlpp4clyb9zlz1si"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "4.0.1"; + sha256 = "1jv89bdhvwb51d9h9157k2r1cg7x0gzari91lddwvghrkx8v9k90"; libraryHaskellDepends = [ array async attoparsec auto-update base base16-bytestring base64-bytestring bytestring containers cryptonite hourglass @@ -72284,6 +72427,7 @@ self: { testHaskellDepends = [ base bytestring doctest hspec iproute network QuickCheck word8 ]; + doHaddock = false; testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -72643,7 +72787,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_7" = callPackage + "doctemplates_0_7_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -72651,16 +72795,16 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.7"; - sha256 = "061llh59b69a84175z5wp0y0s2nw461kmf2w986wd5qcrjanxi62"; + version = "0.7.2"; + sha256 = "1sadadxq3vyzq4l3p05wvmkw68nwjprn98hn4l5zxif0r722jyxj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe scientific text text-conversions unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring doclayout filepath Glob tasty tasty-golden - tasty-hunit temporary text + aeson base bytestring containers doclayout filepath Glob tasty + tasty-golden tasty-hunit temporary text ]; benchmarkHaskellDepends = [ aeson base containers criterion doclayout filepath mtl text @@ -73111,34 +73255,6 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.8.0.2"; - sha256 = "0an7spi0cgvzr64nyy7p8pdslyf0jlh9l2ww52jbh1habsxjn6fp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_8_0_4" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; version = "0.8.0.4"; sha256 = "05dqa91zmxkzkz1dcpx2jxkzhdr4f51gw0qql47da9bllavl0jj4"; isLibrary = true; @@ -73158,7 +73274,6 @@ self: { ]; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -74254,8 +74369,8 @@ self: { }: mkDerivation { pname = "duet"; - version = "0.0.1"; - sha256 = "00f9j3zcna8gxs9g3rnmcm6xqsx7sm9ivygbzjw5dyhmiivh6nr7"; + version = "0.0.2"; + sha256 = "16hjhyn254d307ibg5541y00x0l6n5rwk06r5cdkj5x07jmgcafm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74270,8 +74385,10 @@ self: { aeson base containers deepseq edit-distance exceptions hspec monad-logger mtl parsec syb text ]; - description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers teach Haskell"; + description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dumb-cas" = callPackage @@ -75907,26 +76024,27 @@ self: { ({ mkDerivation, array, base, containers, criterion, deepseq , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline , HUnit, megaparsec, mtl, optparse-applicative, parsec - , parser-combinators, process, random, regex-tdfa, split - , test-framework, test-framework-hunit, text, transformers + , parser-combinators, prettyprinter, process, random, regex-tdfa + , split, test-framework, test-framework-hunit, text, transformers , unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.9.3"; - sha256 = "03scyzfwrzn8hbkk3r02ix7lw2pfx6r5qyf60xgvi0fgxhg7v7cv"; + version = "3.10.1"; + sha256 = "047l2knxhzlrmc4n6xaannnwa1zhq7lxr3iswwrji5xcqbbag5xp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths hashable haskeline - megaparsec mtl parsec parser-combinators process random regex-tdfa - split text transformers unordered-containers vector + megaparsec mtl optparse-applicative parsec parser-combinators + prettyprinter process random regex-tdfa split text transformers + unordered-containers vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline - mtl optparse-applicative parsec process text transformers - unordered-containers vector + mtl optparse-applicative parsec prettyprinter process split text + transformers unordered-containers vector ]; testHaskellDepends = [ base filepath Glob HUnit mtl test-framework test-framework-hunit @@ -75963,8 +76081,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.9.3"; - sha256 = "0p55bak45hxqajpz0kh6d4czhxm8xm1jkcmk7la6h0fvazz4665p"; + version = "3.10.0"; + sha256 = "109j17iskxs7gwgvxyyvmipf3xsbnysjxj20z6hhjzz1sb3sw5x5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77294,6 +77412,8 @@ self: { ]; description = "Perform basic syntax and deliverability checks on email addresses"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "emailaddress" = callPackage @@ -79025,7 +79145,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_2_2" = callPackage + "esqueleto_3_2_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -79035,8 +79155,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.2.2"; - sha256 = "1pnhnnsxx21jah4rnv8qy7jb4n7f6vbrxjh9cs2rygvrwqkg3n9c"; + version = "3.2.3"; + sha256 = "1m8ib08bnrmigpf0lzkn1wm8p479aflm92irzq5v3gg07dqgypcy"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -80673,6 +80793,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exist" = callPackage + ({ mkDerivation, base, base-unicode-symbols, util }: + mkDerivation { + pname = "exist"; + version = "0.2.0.0"; + sha256 = "0w2ip29f99qzi3wxicydkv991ws0lhnar3w0qka54r2mjb3xzrk9"; + libraryHaskellDepends = [ base base-unicode-symbols util ]; + description = "Dependent sum type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "exist-instances" = callPackage + ({ mkDerivation, base, base-unicode-symbols, constraint, exist + , util + }: + mkDerivation { + pname = "exist-instances"; + version = "0.1.0.0"; + sha256 = "09714dl2gwpr44fhkq5w9fswn4fk0zhddg21mgcw2nb5l7930d7x"; + libraryHaskellDepends = [ + base base-unicode-symbols constraint exist util + ]; + description = "Instances for \"exist\" package (requires more language extensions and dependencies)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "existential" = callPackage ({ mkDerivation, base, cereal, constraints, control-invariants , lens, portable-template-haskell-lens, QuickCheck @@ -81116,8 +81264,8 @@ self: { }: mkDerivation { pname = "expresso"; - version = "0.1.2.0"; - sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn"; + version = "0.1.2.2"; + sha256 = "1fa37bqyw8zlva3z6sj10sp4r7sslh4xakrmr7d5diqynyrgdjax"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -81580,6 +81728,8 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "facts" = callPackage @@ -81829,7 +81979,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_3_1" = callPackage + "fakedata_0_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover , random, template-haskell, text, time, unordered-containers @@ -81837,8 +81987,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.3.1"; - sha256 = "0y5gnqjgn3n2px80xbpqx0kaxrdkaqhw8n9ah4ry310j80m9z8ma"; + version = "0.4.0"; + sha256 = "0q90aa92wraqjnj256bpv34mhsl42wyp31y2g4nv2sgzj7mi9jjg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -82068,15 +82218,15 @@ self: { }) {}; "fast-downward" = callPackage - ({ mkDerivation, base, containers, list-t, mtl, process, temporary - , text, transformers + ({ mkDerivation, base, containers, mtl, process, temporary, text + , transformers }: mkDerivation { pname = "fast-downward"; - version = "0.1.1.0"; - sha256 = "1c4qsihjf6wjmmh4nm088pxaj7xc1mm9di8jq124zgllf85j1lfl"; + version = "0.2.0.0"; + sha256 = "0a2ax0z326mf02p5wyp1d8knxj6afn92n9bqxav2qhkc2v5kijhw"; libraryHaskellDepends = [ - base containers list-t mtl process temporary text transformers + base containers mtl process temporary text transformers ]; description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; license = stdenv.lib.licenses.bsd3; @@ -83053,6 +83203,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed_1_3_0_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, HUnit + , markdown-unlit, old-locale, old-time, safe, syb, test-framework + , test-framework-hunit, text, time, time-locale-compat, utf8-string + , xml-conduit, xml-types + }: + mkDerivation { + pname = "feed"; + version = "1.3.0.0"; + sha256 = "19xqkx8ars0sjana18m34d7qg9l0qbg1i3v14a5rqabdppzcfrp2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat bytestring old-locale old-time safe text time + time-locale-compat utf8-string xml-conduit xml-types + ]; + testHaskellDepends = [ + base base-compat HUnit old-time syb test-framework + test-framework-hunit text time xml-conduit xml-types + ]; + testToolDepends = [ markdown-unlit ]; + description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "feed-cli" = callPackage ({ mkDerivation, base, directory, feed, old-locale, old-time, time , xml @@ -83615,7 +83790,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; + }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; libavformat = null; libswscale = null;}; "ffmpeg-tutorials" = callPackage @@ -84057,8 +84232,8 @@ self: { ({ mkDerivation, async, base, process, unix }: mkDerivation { pname = "filelock"; - version = "0.1.1.3"; - sha256 = "04qimhz78jjndk686dblkx06l9jscq2q9gyr014a4pbfj4iljgi5"; + version = "0.1.1.4"; + sha256 = "189n4pvq7f4d235smg2iqs2m5rqmnjdxflifq0mnb2qdbc4jjznr"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ async base process ]; description = "Portable interface to file locking (flock / LockFileEx)"; @@ -84193,8 +84368,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.4"; - sha256 = "0q1ynqjslcxx5r93l6w2hsmd1khlq38c5g5mwrifrv12qnh28sx0"; + version = "0.6.4"; + sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -84205,6 +84380,8 @@ self: { ]; description = "Interface for versioning file stores"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filesystem-abstractions" = callPackage @@ -84538,24 +84715,25 @@ self: { }) {}; "finitary-derive" = callPackage - ({ mkDerivation, base, binary, coercible-utils, deepseq, finitary - , finite-typelits, ghc-typelits-extra, ghc-typelits-knownnat - , hashable, hedgehog, hedgehog-classes, monad-loops, mtl, vector - , vector-sized + ({ mkDerivation, base, binary, bitvec, coercible-utils, deepseq + , finitary, finite-typelits, ghc-typelits-extra + , ghc-typelits-knownnat, hashable, hedgehog, hedgehog-classes + , transformers, vector, vector-binary-instances, vector-instances }: mkDerivation { pname = "finitary-derive"; - version = "1.0.0.1"; - sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim"; + version = "2.2.0.0"; + sha256 = "11nkryzbhkbz4v2i4kwaggw67nlhs5jljqczmvliyz1df75f5kh3"; libraryHaskellDepends = [ - base binary coercible-utils deepseq finitary finite-typelits - ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector - vector-sized + base binary bitvec coercible-utils deepseq finitary finite-typelits + ghc-typelits-extra ghc-typelits-knownnat hashable transformers + vector vector-binary-instances vector-instances ]; testHaskellDepends = [ - base finitary finite-typelits hedgehog hedgehog-classes monad-loops + base binary deepseq finitary finite-typelits hashable hedgehog + hedgehog-classes ]; - description = "Easy and efficient Unbox, Storable, Binary and Hashable instances for Finitary types"; + description = "Flexible and easy deriving of type classes for finitary types"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -84747,6 +84925,8 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fit" = callPackage @@ -85217,10 +85397,8 @@ self: { }: mkDerivation { pname = "fixplate"; - version = "0.1.7"; - sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay"; - revision = "1"; - editedCabalFile = "0ynmm06iblqsyzfc068sdvmlpll8zwyccwkdlji3nf535biv56hb"; + version = "0.1.8"; + sha256 = "0m0g7gbdhigfc0k0sbvxhcl3gilv1wfmffwl14wr6jqbmpqy0as5"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck @@ -86033,7 +86211,7 @@ self: { ]; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; + }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkg-config;}; "fltkhs-demos" = callPackage @@ -87033,6 +87211,26 @@ self: { testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "forma_1_1_3" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, mtl, text + , unordered-containers + }: + mkDerivation { + pname = "forma"; + version = "1.1.3"; + sha256 = "0pd2qzibffbkw2c4mk687yg109pl0nfjq0kpwi2cl0l8d0qlyv0c"; + libraryHaskellDepends = [ + aeson base containers mtl text unordered-containers + ]; + testHaskellDepends = [ aeson base containers hspec mtl text ]; + description = "Parse and validate forms in JSON format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "formal" = callPackage @@ -87782,6 +87980,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_3" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, mtl, profunctors, semigroupoids, template-haskell + , transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.3"; + sha256 = "0b9f9jrfgkq13333px6p1faxpcypqvzi0m9dnbj2rm8s79pdcw1c"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions mtl profunctors + semigroupoids template-haskell transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -88151,7 +88367,7 @@ self: { description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) freenect; freenect_sync = null; + }) {inherit (pkgs) freenect; freenect_sync = null; libfreenect = null;}; "freer" = callPackage @@ -89475,6 +89691,33 @@ self: { broken = true; }) {}; + "functor-combinators_0_2_0_0" = callPackage + ({ mkDerivation, base, bifunctors, comonad, constraints, containers + , dependent-sum, deriving-compat, free, hedgehog, kan-extensions + , mmorph, mtl, natural-transformation, nonempty-containers, pointed + , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these + , transformers, trivial-constraint, vinyl + }: + mkDerivation { + pname = "functor-combinators"; + version = "0.2.0.0"; + sha256 = "0z8r9z08cayyv2ag748aa8550sd2mnj2zagdkf5i5yn3lvhd0k6j"; + libraryHaskellDepends = [ + base bifunctors comonad constraints containers deriving-compat free + kan-extensions mmorph mtl natural-transformation + nonempty-containers pointed profunctors semigroupoids tagged these + transformers trivial-constraint vinyl + ]; + testHaskellDepends = [ + base bifunctors dependent-sum free hedgehog nonempty-containers + semigroupoids tasty tasty-hedgehog transformers + ]; + description = "Tools for functor combinator-based program design"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "functor-combo" = callPackage ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub , type-unary, TypeCompose @@ -89793,6 +90036,8 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-lens" = callPackage @@ -89805,6 +90050,8 @@ self: { testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-random" = callPackage @@ -89820,6 +90067,8 @@ self: { ]; description = "Random number generation for fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-resumable" = callPackage @@ -89833,6 +90082,8 @@ self: { ]; description = "Resumable exceptions for the fused-effects ecosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fusion" = callPackage @@ -89866,8 +90117,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.12.3"; - sha256 = "02ddxa7mkmbwg16ylvjdld85fw479n8jvi21mn7fak7vaqjdd2hw"; + version = "0.13.1"; + sha256 = "0h92q21hg3850f7hv5n497mn90dv3hxp8fa3cl29gwkn0pkaz33b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90234,6 +90485,34 @@ self: { broken = true; }) {}; + "galois-fft" = callPackage + ({ mkDerivation, base, criterion, elliptic-curve, galois-field + , pairing, poly, protolude, QuickCheck, quickcheck-instances, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "galois-fft"; + version = "0.1.0"; + sha256 = "1qyhx0b0p3avag82g1fdwbiwxdr0npw39k4f2nv0x772rr4h9rz1"; + libraryHaskellDepends = [ + base elliptic-curve galois-field poly protolude vector + ]; + testHaskellDepends = [ + base elliptic-curve galois-field pairing poly protolude QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion elliptic-curve galois-field pairing poly protolude + vector + ]; + description = "FFTs over finite fields"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "galois-field" = callPackage ({ mkDerivation, base, criterion, integer-gmp, MonadRandom , protolude, tasty, tasty-quickcheck, wl-pprint-text @@ -90505,12 +90784,12 @@ self: { }) {}; "gasp" = callPackage - ({ mkDerivation, base, binary, containers }: + ({ mkDerivation, base, binary, containers, mtl }: mkDerivation { pname = "gasp"; - version = "1.1.0.0"; - sha256 = "1zv7jq60nw2nd0np7xkz83y7jnvnshccz63j0i9bl0d9x1grhzbq"; - libraryHaskellDepends = [ base binary containers ]; + version = "1.2.0.0"; + sha256 = "0dq867kgil7xp7wqk8ylmx9ninxrqwc375g5l13iskvyz1li7474"; + libraryHaskellDepends = [ base binary containers mtl ]; description = "A framework of algebraic classes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90640,9 +90919,9 @@ self: { ]; description = "A Haskell binding to a subset of the GD graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; - inherit (pkgs) freetype; inherit (pkgs) gd; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; + }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; + inherit (pkgs) freetype; inherit (pkgs) gd; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; inherit (pkgs) zlib;}; "gdax" = callPackage @@ -90751,20 +91030,6 @@ self: { ({ mkDerivation, base, lawful }: mkDerivation { pname = "gdp"; - version = "0.0.0.2"; - sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base lawful ]; - executableHaskellDepends = [ base ]; - description = "Reason about invariants and preconditions with ghosts of departed proofs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gdp_0_0_3_0" = callPackage - ({ mkDerivation, base, lawful }: - mkDerivation { - pname = "gdp"; version = "0.0.3.0"; sha256 = "0pkx6j557p9rm39pr6pw8p2j3nz8s4q839n6y9p6c31dnlz0zxx0"; isLibrary = true; @@ -90773,7 +91038,6 @@ self: { executableHaskellDepends = [ base ]; description = "Reason about invariants and preconditions with ghosts of departed proofs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gearbox" = callPackage @@ -91333,14 +91597,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "generic-deriving_1_13" = callPackage + "generic-deriving_1_13_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: mkDerivation { pname = "generic-deriving"; - version = "1.13"; - sha256 = "0k4av4jamgpavn82q54g345la5i2ckfbq2w9nnf2a6vhvk1lnw8g"; + version = "1.13.1"; + sha256 = "1glsl15dc40wn1r851bray6i450g82xa2n0q53p1i3p5x903mdg9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -92578,8 +92842,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.4.0.0"; - sha256 = "1a2wxblnv611asfwkgm2ndam1jvm2xqajj3rk0ii9qi7j9s5w8v0"; + version = "0.4.0.1"; + sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7"; libraryHaskellDepends = [ base bytestring cereal containers iproute lens mmap reinterpret-cast text @@ -92807,6 +93071,8 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gh-pocket-knife" = callPackage @@ -93855,11 +94121,11 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.0.0.1"; - sha256 = "0b9s07wy26f9xswg6ysylpjaa9gv9iqw50n3zqpkj3jr8ah8y3kl"; + version = "0.1.0"; + sha256 = "0i68zk3k02f3hp6yvkgmdvdjfm8kgh3pwhr3qff4bc9isfh6qks2"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Faster replacements for traceEvent and traceMarker"; + description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -94023,8 +94289,8 @@ self: { ({ mkDerivation, base, directory, ghc, time }: mkDerivation { pname = "ghcflags"; - version = "1.0.1"; - sha256 = "1s7xx13ka5jc8c5ga2yzzx3m6l9kn8fjgrfq6g7y6z8kw38590vb"; + version = "1.0.2"; + sha256 = "17j7bkx7ki5vqr0a3vl0f0v4l9cz2q7lm9xpkj3144y9sqmiqzy3"; libraryHaskellDepends = [ base directory ghc time ]; description = "Dump the ghc flags during compilation"; license = stdenv.lib.licenses.bsd2; @@ -94218,6 +94484,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7_7" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7.7"; + sha256 = "1qrj6is1f6jnx9m2g7cp2009dik7inzf5yqlvqv4pwzzxp0nhl3a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcide" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot @@ -95929,9 +96222,9 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; "git-brunch" = callPackage @@ -95985,8 +96278,8 @@ self: { }: mkDerivation { pname = "git-config"; - version = "0.1.1"; - sha256 = "0vspjqscw02x3hr6n0d0d4kyjfh5lij4wy58fp4z301vmyv77vgl"; + version = "0.1.2"; + sha256 = "1kp5yqn7pz5haq41m2za2f3bw0ygf1zlnn3n0b76zh0jbrndgknh"; libraryHaskellDepends = [ base megaparsec text unordered-containers ]; @@ -96395,8 +96688,8 @@ self: { }: mkDerivation { pname = "github"; - version = "0.23"; - sha256 = "1d08m0kajl6zaralz1rbm4miv2a5zrbm6asjyrl75n915l56m9mb"; + version = "0.24"; + sha256 = "0jbk34aibm5bqbax8f2sif840f31g81yipnkav96lr4pfdv5b4mr"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -96760,22 +97053,23 @@ self: { }) {}; "gitlab-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, http-conduit - , http-types, optparse-applicative, text, transformers, unliftio - , unliftio-core + ({ mkDerivation, aeson, base, bytestring, connection, directory + , filepath, http-conduit, http-types, moss, optparse-applicative + , temporary, text, time, transformers, unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.2"; - sha256 = "0m5gxf7799ds3ff46bz7j3rxycwnbaaik7lffyh22ipp3wlxjxpn"; + version = "0.1.3"; + sha256 = "12yfq12c6jlkr08x2jhykxdydikf3x4dmkyyn15fxhajqi7f1ka2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring connection http-conduit http-types text + aeson base bytestring connection http-conduit http-types text time transformers unliftio unliftio-core ]; executableHaskellDepends = [ - base http-types optparse-applicative text + base bytestring directory filepath http-types moss + optparse-applicative temporary text unliftio-core ]; description = "A Haskell library for the GitLab web API"; license = stdenv.lib.licenses.bsd3; @@ -97785,10 +98079,15 @@ self: { }: mkDerivation { pname = "glpk-hs"; - version = "0.5"; - sha256 = "1scr5iyxn83172g3d7wjww3frcrgk8kh3hzni11qchskllkx0vm3"; + version = "0.7"; + sha256 = "0cbdlidq14hmhndlgxid4gdzyg0jlm5habp5389xl3zkbmm2hni9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base containers deepseq gasp mtl ]; librarySystemDepends = [ glpk ]; + executableHaskellDepends = [ + array base containers deepseq gasp mtl + ]; description = "Comprehensive GLPK linear programming bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -98011,7 +98310,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; - }) {inherit (pkgs.gnome3) gnome-keyring; + }) {inherit (pkgs.gnome3) gnome-keyring; inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage @@ -102064,21 +102363,22 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, aeson, base, hspec, hspec-expectations + ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations , hspec-megaparsec, megaparsec, raw-strings-qq, text, transformers , unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.5.1.0"; - sha256 = "0wnn4nhszcciv06h17qkaxn649w48fw876v85934mfbn56fczzdd"; + version = "0.6.0.0"; + sha256 = "0gippn2y1ngykfz33825r4r4m5km7m8qch7ijics1q9d1jnszs5a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base megaparsec text transformers unordered-containers + aeson base containers megaparsec text transformers + unordered-containers ]; testHaskellDepends = [ - aeson base hspec hspec-expectations hspec-megaparsec megaparsec - raw-strings-qq text transformers unordered-containers + aeson base containers hspec hspec-expectations hspec-megaparsec + megaparsec raw-strings-qq text transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -102121,8 +102421,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.6.0.0"; - sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3"; + version = "0.7.0.0"; + sha256 = "02qbwkbr8hckr6z9ivszdnwlilz7mkh6zinb33s7gas7iwzkf9jc"; libraryHaskellDepends = [ base containers json text ]; description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; @@ -102362,7 +102662,7 @@ self: { executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; + }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; "greg-client" = callPackage @@ -103731,9 +104031,9 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; - inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; - inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; + }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; + inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; + inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; inherit (pkgs.xorg) libXt;}; "gtkimageview" = callPackage @@ -104121,7 +104421,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null; epd = null; inherit (pkgs) mtr; + }) {cudd = null; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; "hCM" = callPackage @@ -104270,29 +104570,28 @@ self: { "hOpenPGP" = callPackage ({ mkDerivation, aeson, asn1-encoding, attoparsec, base - , base16-bytestring, base64-bytestring, bifunctors, binary - , binary-conduit, bytestring, bzlib, conduit, conduit-extra - , containers, criterion, crypto-cipher-types, cryptonite, errors - , hashable, incremental-parser, ixset-typed, lens, memory - , monad-loops, nettle, network, network-uri, newtype - , openpgp-asciiarmor, prettyprinter, QuickCheck - , quickcheck-instances, resourcet, semigroups, split, tasty - , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat - , transformers, unliftio-core, unordered-containers, zlib + , base16-bytestring, bifunctors, binary, binary-conduit, bytestring + , bzlib, conduit, conduit-extra, containers, criterion + , crypto-cipher-types, cryptonite, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , prettyprinter, QuickCheck, quickcheck-instances, resourcet + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unliftio-core + , unordered-containers, zlib }: mkDerivation { pname = "hOpenPGP"; - version = "2.8"; - sha256 = "1n6cpwgg934ii3b4ap2gp347q3k4b64dc9x37d4bj51hs6910pmw"; - libraryHaskellDepends = [ - aeson asn1-encoding attoparsec base base16-bytestring - base64-bytestring bifunctors binary binary-conduit bytestring bzlib - conduit conduit-extra containers crypto-cipher-types cryptonite - errors hashable incremental-parser ixset-typed lens memory - monad-loops nettle network-uri newtype openpgp-asciiarmor - prettyprinter resourcet semigroups split text time - time-locale-compat transformers unliftio-core unordered-containers - zlib + version = "2.8.4"; + sha256 = "0vvr86y29ncgs3j2hd5qhsxix09jf01ah8qqq6n12zsh484cr127"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network-uri newtype openpgp-asciiarmor prettyprinter resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers zlib ]; testHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring bifunctors @@ -104305,16 +104604,68 @@ self: { unliftio-core unordered-containers zlib ]; benchmarkHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bifunctors binary - binary-conduit bytestring bzlib conduit conduit-extra containers - criterion crypto-cipher-types cryptonite errors hashable + aeson base base16-bytestring bifunctors binary binary-conduit + bytestring bzlib conduit conduit-extra containers criterion + crypto-cipher-types cryptonite errors hashable incremental-parser + ixset-typed lens memory monad-loops nettle network network-uri + newtype openpgp-asciiarmor prettyprinter resourcet semigroups split + text time time-locale-compat transformers unliftio-core + unordered-containers zlib + ]; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hOpenPGP_2_8_5" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, bifunctors, binary, binary-conduit, bytestring + , bzlib, conduit, conduit-extra, containers, criterion + , crypto-cipher-types, cryptonite, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , prettyprinter, QuickCheck, quickcheck-instances, resourcet + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unliftio-core + , unordered-containers, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.8.5"; + sha256 = "1d5cmgj3rg8snc2b5jn9h7hb83j2hhf0c9shiiyrpr8rrl4hx2mj"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype openpgp-asciiarmor prettyprinter - resourcet semigroups split text time time-locale-compat - transformers unliftio-core unordered-containers zlib + network-uri newtype openpgp-asciiarmor prettyprinter resourcet + semigroups split text time time-locale-compat transformers + unliftio-core unordered-containers zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype prettyprinter QuickCheck + quickcheck-instances resourcet semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unliftio-core unordered-containers zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring bifunctors binary binary-conduit + bytestring bzlib conduit conduit-extra containers criterion + crypto-cipher-types cryptonite errors hashable incremental-parser + ixset-typed lens memory monad-loops nettle network network-uri + newtype openpgp-asciiarmor prettyprinter resourcet semigroups split + text time time-locale-compat transformers unliftio-core + unordered-containers zlib ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hPDB" = callPackage @@ -105253,6 +105604,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hackage-security_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, containers, cryptohash-sha256, directory + , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri + , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, time, transformers + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "hackage-security"; + version = "0.6.0.0"; + sha256 = "1y9vs30y474ri8b9jqkbwfkcfh7p7jaafzwxina9z0xl32d0bn1c"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring Cabal + containers cryptohash-sha256 directory ed25519 filepath ghc-prim + lukko mtl network network-uri parsec pretty tar template-haskell + time transformers zlib + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers network-uri QuickCheck tar + tasty tasty-hunit tasty-quickcheck temporary time + unordered-containers vector zlib + ]; + description = "Hackage security library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hackage-security-HTTP" = callPackage ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl , network, network-uri, zlib @@ -105729,8 +106108,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.17.2"; - sha256 = "0s9q0016j3y56sblkq12mai1j58h8w8cy8k2x1bzvhb95zpg1va9"; + version = "1.17.3"; + sha256 = "00lyf2m6q866383q79b705xhn987504wz3fp3zh7m8580v8phy5p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106484,8 +106863,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -107511,8 +107888,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.0"; - sha256 = "1q4k8x6mwh9g7y5njcjd1xyn79yjnjv01nk4xa5q9yspmsa4685m"; + version = "2.4.0.2"; + sha256 = "16f4rs4h3lznkci5axibliiwfr3vrm03arxcjfjiv6mypkcpnp2r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -107771,8 +108148,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.3"; - sha256 = "0m7psd6dg33xijshs3dxz2xrqghmpbs402h67b52pkqsk5nmy633"; + version = "7.3.7.4"; + sha256 = "188fqqpq7m921qkfv2b64pikcx8zzsy376l4py4wxlkabl7fkydr"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -107827,8 +108204,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.12.1"; - sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz"; + version = "7.0.12.2"; + sha256 = "0zgmh75z59g6hs8n924sbnhswjdd6b947ywiird2a3y6d2zwqj3v"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -108408,8 +108785,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "harp"; - version = "0.4.3.2"; - sha256 = "1abyfsr0ya7j0s6znixhfhsr9mlmcg16rg5d9909b0xr896bkbn6"; + version = "0.4.3.3"; + sha256 = "16bmv3ymiiyvy65vf4s5h4fhp6q5hrw40xfdba4yarwgpbm0frm2"; libraryHaskellDepends = [ base ]; description = "HaRP allows pattern-matching with regular expressions"; license = stdenv.lib.licenses.bsd3; @@ -108501,6 +108878,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_3_6" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.3.6"; + sha256 = "0sgxvgvxqykslbjslrb5mzmaaar4nbc59p94qhk7rzbjsas01vp2"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, doctest, free, hasbolt, lens, mtl @@ -109485,23 +109883,24 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat - , bytestring, Cabal, containers, deepseq, Diff, directory - , exceptions, filepath, generic-lens, HsYAML, lattices, microlens - , mtl, network-uri, optparse-applicative, parsec, pretty, process - , ShellCheck, tasty, tasty-golden, temporary, text, transformers - , unordered-containers + , bytestring, Cabal, cabal-install-parsers, containers, deepseq + , Diff, directory, exceptions, filepath, generic-lens, HsYAML + , lattices, microlens, mtl, network-uri, optparse-applicative + , parsec, pretty, process, ShellCheck, tasty, tasty-golden + , temporary, text, transformers, unordered-containers }: mkDerivation { pname = "haskell-ci"; - version = "0.6"; - sha256 = "1g9zfdw4z00sbh3mkaz2hzn09hjlawkb7h67mqn4qsdjw6dbwaab"; + version = "0.8"; + sha256 = "1wm5fs8fdy85lvjyy9n0yh66ax6bs0ll4gq7d8ba0ibsp69g6pm3"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat bytestring Cabal containers deepseq - directory exceptions filepath generic-lens HsYAML lattices - microlens mtl network-uri optparse-applicative parsec pretty - process ShellCheck temporary text transformers unordered-containers + aeson base base-compat bytestring Cabal cabal-install-parsers + containers deepseq directory exceptions filepath generic-lens + HsYAML lattices microlens mtl network-uri optparse-applicative + parsec pretty process ShellCheck temporary text transformers + unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -109511,7 +109910,8 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-cnc" = callPackage @@ -110051,7 +110451,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_17_0_0" = callPackage + "haskell-lsp_0_18_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -110060,8 +110460,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.17.0.0"; - sha256 = "17c95ndm6jadab04q707pmv6x9cwshk463c8gc9ai0m7763win7x"; + version = "0.18.0.0"; + sha256 = "0q9xpjgr3n7svhd9f7mmkw113avswvfm08fnbijdr1sblipd12sl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110120,15 +110520,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_17_0_0" = callPackage + "haskell-lsp-types_0_18_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.17.0.0"; - sha256 = "03i3s7f82imv4ysclhjv07mcs0dl3m5nmjxmfa5wafircai4yi3p"; + version = "0.18.0.0"; + sha256 = "1ypa3gxxcg7dl905d4nprcqzw2fcl7z7xy1hpg5har1dw3w9fyiq"; libraryHaskellDepends = [ aeson base bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -110772,14 +111172,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-meta_0_8_4" = callPackage + "haskell-src-meta_0_8_5" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.4"; - sha256 = "18zcsaz9cb65rpyxmxrs30vqmdighc4flyfv8ix623nlq247drsn"; + version = "0.8.5"; + sha256 = "1csqp3n7330rhia9msyw34z7qwwj64gdy5qlv8w4jbm49dap24ik"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -112108,6 +112508,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-crypto" = callPackage @@ -113406,21 +113808,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql-transaction_1" = callPackage + "hasql-transaction_1_0_0_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rebase , transformers }: mkDerivation { pname = "hasql-transaction"; - version = "1"; - sha256 = "1k82b0bx4j2g7lhr2p4z4a365kx1i23dr6zikwg1yyhpvhl3xbcj"; + version = "1.0.0.1"; + sha256 = "0jfvabsjpj56piny41hzbblhprjsk5xkpk35x502q2isl2mkk5ql"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers ]; testHaskellDepends = [ async hasql rebase ]; - description = "A composable abstraction over the retryable transactions for Hasql"; + description = "Composable abstraction over retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -114614,21 +115016,6 @@ self: { }: mkDerivation { pname = "hdaemonize"; - version = "0.5.5"; - sha256 = "17q2zr9bv6xwnldgbsh1idwfgybp8q4xzq79p2lmmi3f0q6cnl6j"; - libraryHaskellDepends = [ - base bytestring extensible-exceptions filepath hsyslog mtl unix - ]; - description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hdaemonize_0_5_6" = callPackage - ({ mkDerivation, base, bytestring, extensible-exceptions, filepath - , hsyslog, mtl, unix - }: - mkDerivation { - pname = "hdaemonize"; version = "0.5.6"; sha256 = "097fgjgskigy3grnd3ijzyhdq34vjmd9bjk2rscixi59j8j30vxd"; libraryHaskellDepends = [ @@ -114636,7 +115023,6 @@ self: { ]; description = "Library to handle the details of writing daemons for UNIX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdaemonize-buildfix" = callPackage @@ -115109,6 +115495,21 @@ self: { broken = true; }) {}; + "headed-megaparsec" = callPackage + ({ mkDerivation, base, case-insensitive, megaparsec + , parser-combinators, selective + }: + mkDerivation { + pname = "headed-megaparsec"; + version = "0.1.0.2"; + sha256 = "0npkkphm4gv7cgm08asr5qxjyk6jdbm4h4w0jwsvxzpxh3nfxgbr"; + libraryHaskellDepends = [ + base case-insensitive megaparsec parser-combinators selective + ]; + description = "More informative parser"; + license = stdenv.lib.licenses.mit; + }) {}; + "headergen" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, haskeline, time @@ -115527,6 +115928,25 @@ self: { broken = true; }) {}; + "hedgehog-golden" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , Diff, directory, extra, hedgehog, text + }: + mkDerivation { + pname = "hedgehog-golden"; + version = "1.0.0"; + sha256 = "17ja3ch042kvk0fpd1gd9nnj9x5jbl37vxn579hr9rimwgf99az7"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers Diff directory extra + hedgehog text + ]; + testHaskellDepends = [ base hedgehog ]; + description = "Golden testing capabilities for hedgehog using Aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -115905,7 +116325,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {newrelic-collector-client = null; newrelic-common = null; + }) {newrelic-collector-client = null; newrelic-common = null; newrelic-transaction = null;}; "helics-wai" = callPackage @@ -117308,7 +117728,7 @@ self: { description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; - }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; "hfusion" = callPackage @@ -118880,20 +119300,22 @@ self: { }) {}; "hip" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour - , criterion, deepseq, directory, filepath, hspec, JuicyPixels - , netpbm, primitive, process, QuickCheck, repa, repa-algorithms - , temporary, vector + ({ mkDerivation, array, base, bytestring, Chart, Chart-diagrams + , colour, criterion, deepseq, directory, filepath, hspec + , hspec-discover, JuicyPixels, netpbm, primitive, process + , QuickCheck, random, repa, repa-algorithms, temporary, vector }: mkDerivation { pname = "hip"; - version = "1.5.3.0"; - sha256 = "07jgqz5dz8qk96xz0q92hpn172jaqivfmn0mrynhicmvkx7a7izr"; + version = "1.5.4.0"; + sha256 = "09vv9zshgy6g9333pyny5lcja8662rxnldg1m0vvfiywcjafbn14"; libraryHaskellDepends = [ - base bytestring Chart Chart-diagrams colour deepseq directory - filepath JuicyPixels netpbm primitive process repa temporary vector + array base bytestring Chart Chart-diagrams colour deepseq directory + filepath JuicyPixels netpbm primitive process random repa temporary + vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq repa repa-algorithms vector ]; @@ -120183,6 +120605,8 @@ self: { pname = "hlrdb"; version = "0.3.0.0"; sha256 = "0pc3hqi6v9b78fijisnarfs59w6mw8jgyww25r1wmblgwyakl5ab"; + revision = "1"; + editedCabalFile = "1ycglx3b5n1l97pq0rd50wd313gwz1is10snf8s0c9bjlrzspbn5"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -122280,6 +122704,40 @@ self: { broken = true; }) {}; + "hopenpgp-tools_0_22" = callPackage + ({ mkDerivation, aeson, alex, array, attoparsec, base + , base16-bytestring, binary, binary-conduit, bytestring, conduit + , conduit-extra, containers, crypto-pubkey, cryptohash, cryptonite + , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client + , http-client-tls, http-types, ixset-typed, lens, monad-loops, mtl + , openpgp-asciiarmor, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, prettyprinter-convert-ansi-wl-pprint + , resourcet, text, time, time-locale-compat, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hopenpgp-tools"; + version = "0.22"; + sha256 = "1rcjwbnns5fj8x9sgyjlpjda2srmcixvdlmia4nid5nq01clc0c4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array attoparsec base base16-bytestring binary binary-conduit + bytestring conduit conduit-extra containers crypto-pubkey + cryptohash cryptonite directory errors fgl graphviz hOpenPGP + http-client http-client-tls http-types ixset-typed lens monad-loops + mtl openpgp-asciiarmor optparse-applicative prettyprinter + prettyprinter-ansi-terminal prettyprinter-convert-ansi-wl-pprint + resourcet text time time-locale-compat transformers + unordered-containers vector yaml + ]; + executableToolDepends = [ alex happy ]; + description = "hOpenPGP-based command-line tools"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hopenssl" = callPackage ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { @@ -122786,7 +123244,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; + }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "hp2any-manager" = callPackage @@ -123757,8 +124215,8 @@ self: { }: mkDerivation { pname = "hreq-client"; - version = "0.1.0.0"; - sha256 = "0slvpkypfxk4szrls0jsbjn00izgslskzixn9i2fq108wadm0b1b"; + version = "0.1.1.0"; + sha256 = "0bx4vhvwh4arkp5ly6clj55dmai3npl2p87l64radhyqr9z0il24"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -123774,6 +124232,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Type dependent Highlevel HTTP client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hreq-conduit" = callPackage @@ -123798,6 +124258,8 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Conduit streaming support for Hreq"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hreq-core" = callPackage @@ -123808,8 +124270,8 @@ self: { }: mkDerivation { pname = "hreq-core"; - version = "0.1.0.0"; - sha256 = "0ndbwdfcs89n8k96h2piw9n2hs0dbpp8vr7kpzdavaji0jzg0w20"; + version = "0.1.1.0"; + sha256 = "0lc1bc3kr3j6rkrz9w0s5aqb5bb60xhafg1v02n7vcyishdh2iwl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions @@ -123818,6 +124280,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Core functionality for Hreq Http client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hrfsize" = callPackage @@ -123962,7 +124426,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {brotlidec = null; brotlienc = null; libbrotlidec = null; + }) {brotlidec = null; brotlienc = null; libbrotlidec = null; libbrotlienc = null;}; "hs-captcha" = callPackage @@ -126154,7 +126618,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; "hsilop" = callPackage @@ -126224,8 +126688,8 @@ self: { }: mkDerivation { pname = "hsinspect"; - version = "0.0.7"; - sha256 = "0vwhxlycvmyczd412llpsjfl63f58bz4ad4fbhiiqw754d7qwaka"; + version = "0.0.8"; + sha256 = "1lqczihv7qjh1yy51qds4sg95riwaq1i0fd9mgn3kvhgbyx1r9nn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126537,10 +127001,10 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; - inherit (pkgs) jasper; inherit (pkgs) lcms; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) libxml2; tiff = null; wmflite = null; + }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; + inherit (pkgs) jasper; inherit (pkgs) lcms; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; + inherit (pkgs) libxml2; tiff = null; wmflite = null; inherit (pkgs) zlib;}; "hsmisc" = callPackage @@ -126887,6 +127351,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-bracket" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "hspec-bracket"; + version = "0.0.1.0"; + sha256 = "1d6262frfaghmq77nqsvcalm6w4jl7bn995bkphx461skhm8n300"; + libraryHaskellDepends = [ base hspec ]; + description = "The bracket definitions for Hspec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-checkers" = callPackage ({ mkDerivation, base, checkers, hspec }: mkDerivation { @@ -128382,7 +128857,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) ncurses; inherit (pkgs) readline; + }) {inherit (pkgs) ncurses; inherit (pkgs) readline; swipl = null;}; "hsx" = callPackage @@ -128436,8 +128911,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.5"; - sha256 = "0cw66j3firzgg5c7689y0kffgfq36yn4y17yprbbgv6kw4g7wid4"; + version = "0.14.1.6"; + sha256 = "09qynnmy5pq7yl8zic91wysrvjb1a1ibcjc9ry458wgbz236br4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129185,35 +129660,6 @@ self: { "http-api-data" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat - , bytestring, Cabal, cabal-doctest, containers, cookie, directory - , doctest, filepath, hashable, hspec, hspec-discover, http-types - , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text - , time-compat, unordered-containers, uuid-types - }: - mkDerivation { - pname = "http-api-data"; - version = "0.4.1"; - sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv"; - revision = "2"; - editedCabalFile = "14gvcqdxxs9s74r73i5f5g2819dfyp05m0p4s729ynwm7c20fzfs"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base base-compat bytestring - containers cookie hashable http-types tagged text time-compat - unordered-containers uuid-types - ]; - testHaskellDepends = [ - base base-compat bytestring cookie directory doctest filepath hspec - HUnit nats QuickCheck quickcheck-instances text time-compat - unordered-containers uuid-types - ]; - testToolDepends = [ hspec-discover ]; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_4_1_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat , bytestring, containers, cookie, hashable, hspec, hspec-discover , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged , text, time-compat, unordered-containers, uuid-types @@ -129235,7 +129681,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -130377,6 +130822,8 @@ self: { ]; description = "Encoders based on `proto3-wire` for gRPC over HTTP2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http2-grpc-types" = callPackage @@ -131310,6 +131757,29 @@ self: { broken = true; }) {}; + "hw-bits_0_7_0_9" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hedgehog + , hspec, hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.7.0.9"; + sha256 = "0k10r3xyk030h4j9mv7wksglwqm5i3jhfzm7fy6qw0ddqp59nynq"; + libraryHaskellDepends = [ + base bytestring deepseq hw-int hw-prim hw-string-parse vector + ]; + testHaskellDepends = [ + base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Bit manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-ci-assist" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog, optparse-applicative @@ -131546,6 +132016,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.1.1"; sha256 = "0fmbcddw13m49xvw8gnpjh246mw4k9h3hr94k956bi1vdvywyqv7"; + revision = "1"; + editedCabalFile = "1i5in5h9jnx4p873qv80jmdd1ak6yyyf70002j3lhxyaxx9byy7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132094,8 +132566,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.38"; - sha256 = "0669dkpwax4nh66c2ll4lb0fvzqhvpvirwnbzzskvykqkq1sj3kr"; + version = "0.6.2.39"; + sha256 = "06f4ygwmfb3ambzw972cninj9v0i7pir97qq0832a1mb19h4222g"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap semigroups transformers unliftio-core vector @@ -132388,25 +132860,26 @@ self: { }: mkDerivation { pname = "hw-xml"; - version = "0.4.0.2"; - sha256 = "122viqivv2csgrv144xc88xhafiq5vcsy545jpmg052d3kg1x4g2"; + version = "0.5.0.0"; + sha256 = "0cqrs19bd9yh67yczhhb1yf5dhcx2v6xikybd88vqwxdh51pxyyn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array attoparsec base bytestring cereal containers deepseq ghc-prim hw-balancedparens hw-bits hw-parser hw-prim - hw-rankselect hw-rankselect-base lens mmap mtl resourcet + hw-rankselect hw-rankselect-base lens mmap mtl resourcet text transformers vector word8 ]; executableHaskellDepends = [ - attoparsec base bytestring generic-lens hw-balancedparens hw-bits - hw-prim hw-rankselect lens mmap mtl optparse-applicative resourcet - text vector + attoparsec base bytestring deepseq generic-lens hw-balancedparens + hw-bits hw-prim hw-rankselect lens mmap mtl optparse-applicative + resourcet text vector ]; testHaskellDepends = [ attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text + vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -136173,6 +136646,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_5" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.5"; + sha256 = "0fdq3iwa2vgb5k19ck6jxzh7f1xsf1kpwx4p3agpdpsrylrcanvb"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -136415,16 +136908,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inline-c_0_8_0_1" = callPackage + "inline-c_0_9_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq - , regex-posix, template-haskell, transformers, unordered-containers - , vector + , regex-posix, split, template-haskell, transformers + , unordered-containers, vector }: mkDerivation { pname = "inline-c"; - version = "0.8.0.1"; - sha256 = "1w8njc8k1g8kmpk8c8q5p7m8adgpv5v4k4643hsi5422jdaq0g3i"; + version = "0.9.0.0"; + sha256 = "086kqca1vcxhi7wdzmdv3rjwh9k50k3wj4rzig1yjz3x12d0h6q6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136433,7 +136926,7 @@ self: { ]; testHaskellDepends = [ ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix template-haskell transformers + raw-strings-qq regex-posix split template-haskell transformers unordered-containers vector ]; description = "Write Haskell source files including C code inline. No FFI required."; @@ -136470,6 +136963,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c-cpp_0_4_0_0" = callPackage + ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions + , template-haskell + }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.4.0.0"; + sha256 = "10d0yxs3jfkws440wzxrzwcyxjszv8c3f45hbfmj5ln0b0hpfrq0"; + libraryHaskellDepends = [ + base containers inline-c safe-exceptions template-haskell + ]; + testHaskellDepends = [ + base containers hspec inline-c safe-exceptions + ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-win32" = callPackage ({ mkDerivation, base, containers, inline-c, template-haskell , Win32 @@ -136576,6 +137088,30 @@ self: { "insert-ordered-containers" = callPackage ({ mkDerivation, aeson, base, base-compat, hashable, lens + , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "insert-ordered-containers"; + version = "0.2.2"; + sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja"; + revision = "1"; + editedCabalFile = "1hlinc8nnjlzc6ds3wf8jvkihpcbhz2dk0rqxq1ns0c5zbbhnylq"; + libraryHaskellDepends = [ + aeson base base-compat hashable lens semigroupoids semigroups text + transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat hashable lens QuickCheck semigroupoids + semigroups tasty tasty-quickcheck text transformers + unordered-containers + ]; + description = "Associative containers retaining insertion order for traversals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "insert-ordered-containers_0_2_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, hashable, lens , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups , tasty, tasty-quickcheck, text, transformers, unordered-containers }: @@ -136594,6 +137130,7 @@ self: { ]; description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -137534,6 +138071,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "intro_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, dlist + , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers + , unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.6.0.0"; + sha256 = "11a9xnamk8n6fns86az1rhq2grx5173ywyby944jn2zvjkba7fkc"; + libraryHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable mtl safe + text transformers unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable lens mtl + QuickCheck safe text transformers unordered-containers + writer-cps-mtl + ]; + description = "Safe and minimal prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -137637,6 +138197,8 @@ self: { pname = "invariant"; version = "0.5.3"; sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp"; + revision = "1"; + editedCabalFile = "0sjy375npw6lqcckhyicizzv91v8jh3ca5yjkygiaj22bw5k8c74"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors StateVar stm tagged template-haskell th-abstraction @@ -137873,8 +138435,8 @@ self: { pname = "io-streams-haproxy"; version = "1.0.1.0"; sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; - revision = "1"; - editedCabalFile = "00zbqcxfkrxidrli5qd8jvdw0jkyvcb3bwv29w8nbk9cr8vmmfl3"; + revision = "2"; + editedCabalFile = "1pvw39f0vrzb5hdx6nqpdg4ccsxa59vwjspfjkh6vvw1zwmidgja"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -138055,6 +138617,8 @@ self: { pname = "ip"; version = "1.7.0"; sha256 = "18m8586ns6kijvk8wwflkhr9apki1h0gd7rkxd4w6qq66x034hk2"; + revision = "1"; + editedCabalFile = "1yjz4822vq22zh8mb96ccplqmm6rxrvy334n34gwyq0cfddsilr0"; libraryHaskellDepends = [ aeson attoparsec base byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive small-bytearray-builder text @@ -138106,8 +138670,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "2.1.0"; - sha256 = "0qcmqy8p13hg9aih8m9w7qpbr6zcbvgc9y6bzh2cqm2sbx7ksvqm"; + version = "2.2.0"; + sha256 = "12j8jd0ir24xgghvmac2npf9zqfbfq7fwj1ni2xdi8p673k3d0kd"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; @@ -138274,6 +138838,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "iproute_1_7_8" = callPackage + ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec + , network, QuickCheck, safe + }: + mkDerivation { + pname = "iproute"; + version = "1.7.8"; + sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad"; + libraryHaskellDepends = [ + appar base byteorder containers network + ]; + testHaskellDepends = [ + appar base byteorder containers doctest hspec network QuickCheck + safe + ]; + description = "IP Routing Table"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "iptables-helpers" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe , syb, utf8-string @@ -140363,6 +140947,21 @@ self: { broken = true; }) {}; + "jira-wiki-markup" = callPackage + ({ mkDerivation, base, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "0.1.1"; + sha256 = "1a6vk4aryppay87fyirxprwklqvpjh6nj9x2k9s3ybrwhapf1wdx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = stdenv.lib.licenses.mit; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -140639,36 +141238,6 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.8.1.0"; - sha256 = "02xg8axy6whbkn0mzg1gjy6b1mhxlmsh1x7vjk1fiawvg9nwzrkl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups template-haskell - text time unordered-containers vector x509 - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec - tasty-quickcheck template-haskell text time unordered-containers - vector x509 - ]; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_8_2_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, concise, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; version = "0.8.2.0"; sha256 = "0kv2kmws9kwymx8pm6j8nnlk1d8pwv22hw2ka2kwlipjvmb7mld4"; isLibrary = true; @@ -140688,7 +141257,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -141559,8 +142127,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "6"; - editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs"; + revision = "7"; + editedCabalFile = "1fjkl0p5glkk01jny6ar62356pmp2a2vf9v1jq67ly3y14dcvywq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142468,6 +143036,8 @@ self: { testHaskellDepends = [ base hw-kafka-client monad-parallel text ]; description = "Synchronous Kafka Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kafka-device" = callPackage @@ -143816,8 +144386,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "4"; - editedCabalFile = "081spzhywygv90i7jwhbcm7p1aqz6qqph02ddxvqncghar5kjc7n"; + revision = "5"; + editedCabalFile = "17fhzhlbqgd5pqp357n3z0k176q79c2jxvpwqryl3gbad3s8qsfw"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -144281,15 +144851,17 @@ self: { "knead" = callPackage ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf - , storable-record, storable-tuple, tfp, transformers, utility-ht + , prelude-compat, storable-enum, storable-record, storable-tuple + , tagged, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.4"; - sha256 = "1p1zfa2mihy2di5wjb189mdq6kygr47y19194ycxdx47sh8y6s6y"; + version = "0.4.1"; + sha256 = "07jjs6qx58whwh61n4avrbi6krpl3qawx3mp8wacbjyrjfskcyln"; libraryHaskellDepends = [ - base bool8 comfort-array llvm-extra llvm-tf storable-record - storable-tuple tfp transformers utility-ht + base bool8 comfort-array llvm-extra llvm-tf prelude-compat + storable-enum storable-record storable-tuple tagged tfp + transformers utility-ht ]; description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -145123,8 +145695,8 @@ self: { }: mkDerivation { pname = "lambda-options"; - version = "1.0.0.0"; - sha256 = "1cpd5s0m10d09mqbpy1qxnrpy8np21ci6fcd09d01xj7lx8p2yzx"; + version = "1.0.2.0"; + sha256 = "04h7i79iiq91606x3k7zr2gs3f7apswwv9xxv5lf4qr1h3i4lfix"; libraryHaskellDepends = [ base containers funspection mtl read-bounded ]; @@ -147337,6 +147909,8 @@ self: { pname = "latex-formulae-hakyll"; version = "0.2.0.4"; sha256 = "0q16p3ccql38ri3rnbsx54vj6jn154j3m6vic64zi4nk54g0sc5f"; + revision = "1"; + editedCabalFile = "08502482n0szzg32bcrdyhs853hlmx3r14bpjww1fv2dijk5asrw"; libraryHaskellDepends = [ base hakyll latex-formulae-image latex-formulae-pandoc lrucache pandoc-types @@ -147355,6 +147929,8 @@ self: { pname = "latex-formulae-image"; version = "0.1.1.4"; sha256 = "0s3r0qd235lgmw4g5j52r2d97zsr3nd0ikzffgpwigvcbzshddv0"; + revision = "1"; + editedCabalFile = "0m15dyrxala5dh5sh228bsrfa3nym9wd719byj19vfl4i2nabw9d"; libraryHaskellDepends = [ base directory errors filepath JuicyPixels process temporary transformers @@ -150396,6 +150972,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-generics_0_1_3" = callPackage + ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim + , hspec, hspec-discover, template-haskell + }: + mkDerivation { + pname = "lift-generics"; + version = "0.1.3"; + sha256 = "0r2rbik5lh5x8psy5cblzd1ly1ybizdcyjdg8n79m7k3rqp2w6v7"; + libraryHaskellDepends = [ + base generic-deriving ghc-prim template-haskell + ]; + testHaskellDepends = [ + base base-compat generic-deriving hspec template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -151760,7 +152356,7 @@ self: { description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) git; inherit (pkgs) nettools; + }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage @@ -152527,18 +153123,20 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bool8, containers, cpuid, llvm-tf, non-empty - , prelude-compat, tfp, transformers, unsafe, utility-ht + ({ mkDerivation, base, bool8, containers, cpuid, enumset, llvm-tf + , non-empty, prelude-compat, storable-enum, tagged, tfp + , transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.8.0.3"; - sha256 = "1cqxfrjhfgliwxjgbmjkbpcy4dlv0fwwqzdd9jd8fiq96njfqfvp"; + version = "0.8.2"; + sha256 = "0fv2q05w86xqak5b8w26iy9szzc6khghc622dgqkjywd9b72xs1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bool8 containers cpuid llvm-tf non-empty prelude-compat tfp - transformers unsafe utility-ht + base bool8 containers cpuid enumset llvm-tf non-empty + prelude-compat storable-enum tagged tfp transformers unsafe + utility-ht ]; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -152550,8 +153148,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "3.8.1.2"; - sha256 = "04k2ag8nh54f9hh3blgyn1xa88hfv6c6ps51i5b84g4jdvja7f5v"; + version = "3.9.1"; + sha256 = "0gyda3bh43iib5isp6fd0rsf1rxkgidnmxrdm31xwjc0qnz71yf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -152855,8 +153453,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1.1.1"; - sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay"; + version = "3.1.2"; + sha256 = "0k5aj63hl78h8lkxizragvgh57yzzc5ns7h8kz93wicsdxaca8cn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153356,6 +153954,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-domain_0_13" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving + , hashable, semigroupoids, semigroups, simple-reflect, vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.13"; + sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; + revision = "1"; + editedCabalFile = "0wcy54axpnym55f1skagnbmdpw6y2ys6zvn99x8i6qcfzw00i6l9"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects , monad-control, text, transformers-base @@ -153636,29 +154258,6 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.7"; - sha256 = "1m8f9s6v1xxfp3li1yjfwdhn2an29lk07ijqcrb1db8chrlx93vd"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl prettyprinter - semigroups stm stm-delay text time transformers transformers-base - unliftio-core - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - prettyprinter text time - ]; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_3_8" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, unliftio-core - }: - mkDerivation { - pname = "logging-effect"; version = "1.3.8"; sha256 = "0ksavyvcz0c9fadik9yksm4zskzh313srf3713migwrdza5ci5q3"; libraryHaskellDepends = [ @@ -153672,7 +154271,6 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -154498,8 +155096,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.1.1"; - sha256 = "0dynm0kib4lgyz00gbg4gi0ds5cgpbdx40davk53cknwxv7icri0"; + version = "2.1.2"; + sha256 = "0q0qzij6j0nv01hhrd417swyyf5vhgi2m83bmk98dvrd0309l9xl"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -154627,7 +155225,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_8_0_0" = callPackage + "lsp-test_0_8_2_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -154636,8 +155234,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.8.0.0"; - sha256 = "1w8ag6v8mdgxynz32nzxmvfaar68abmsh3fchdfbhz2ky07p6085"; + version = "0.8.2.0"; + sha256 = "1762avrs4fkkd9v8i76giaf6km5f3lds5laickn7la7zq7ysh8a3"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -155032,8 +155630,8 @@ self: { }: mkDerivation { pname = "lukko"; - version = "0.1.1"; - sha256 = "1wy2dqs304cynsgnwpc47fwnm9gcy7ch53xxhj5schc0kak3xxbq"; + version = "0.1.1.1"; + sha256 = "13wf2vgi3bq48h757qs0zi1sxa6ip9pk8fxfiq7qrrb9p5silcpj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -156788,8 +157386,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.6"; - sha256 = "1jvgxhc3x7867cryvsbpj7hks9syhpqbwyh4y0v6b0yp0xil8qrl"; + version = "0.5.4.0"; + sha256 = "0cp0xd4by5ml1526lybqvxr1g5ccgskmj9ibl3xnrcmkbi9a14y6"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -156996,8 +157594,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "1"; - editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44"; + revision = "2"; + editedCabalFile = "1cpiarychx4cmv7v71rbd5ccfsjac928isd52sf42mzs2nb492ya"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -157494,8 +158092,8 @@ self: { }: mkDerivation { pname = "marxup"; - version = "3.1.1.0"; - sha256 = "0b22mf14qajkpf7hlm6086d951g0wgihlyiw93m0nh4yl1kmgf5q"; + version = "3.1.2.0"; + sha256 = "0a6lfjh5brkjm66y4yizzskra4007shqnsb5bjljxwg0vwphp112"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -157557,32 +158155,43 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "massiv-io" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , directory, filepath, JuicyPixels, massiv, netpbm, process, vector + "massiv_0_4_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest + , data-default-class, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector }: mkDerivation { - pname = "massiv-io"; - version = "0.1.7.0"; - sha256 = "0w3yffkrsjkgfqdfmhq42am2hpmkblnfg0prifr2ja5pfwr02l5c"; + pname = "massiv"; + version = "0.4.4.0"; + sha256 = "13hwf1z9iqybrjsn21gkglqq3knin6x84rflv3wk6wplk7dfhd2n"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bytestring data-default-class deepseq directory filepath - JuicyPixels massiv netpbm process vector + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector ]; - description = "Import/export of Image files into massiv Arrays"; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "massiv-io_0_1_8_0" = callPackage + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , directory, filepath, JuicyPixels, massiv, netpbm, process, vector }: mkDerivation { pname = "massiv-io"; - version = "0.1.8.0"; - sha256 = "0c67lcqgbzwxcpp3gp0x35f3njai1sgainwxhjckn9bjddad6vrq"; + version = "0.1.9.0"; + sha256 = "0splwbavahv3g0p1pyhym9hwncaw7zd5f12girwxlwhcdwrsgz3r"; libraryHaskellDepends = [ base bytestring data-default-class deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -157590,6 +158199,7 @@ self: { description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-scheduler" = callPackage @@ -157631,6 +158241,8 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "master-plan" = callPackage @@ -157758,15 +158370,16 @@ self: { }) {}; "math-grads" = callPackage - ({ mkDerivation, aeson, array, base, containers, hspec, linear - , matrix, mtl, random, vector + ({ mkDerivation, aeson, array, base, bimap, containers, hspec + , ilist, lens, linear, matrix, mtl, random, vector }: mkDerivation { pname = "math-grads"; - version = "0.1.5.1"; - sha256 = "0bq08gh1fv83glx4i2gs560cynl2dv1610kby7vlvjnhg0kkyjgl"; + version = "0.1.6.2"; + sha256 = "02flkabfqwgmgcsrlxcfk9zm8b94l65imr3xprdap1g9z26si66l"; libraryHaskellDepends = [ - aeson array base containers linear matrix mtl random vector + aeson array base bimap containers ilist lens linear matrix mtl + random vector ]; testHaskellDepends = [ array base containers hspec random ]; description = "Library containing graph data structures and graph algorithms"; @@ -161075,8 +161688,8 @@ self: { }: mkDerivation { pname = "mini-egison"; - version = "0.1.5"; - sha256 = "19g5743q2h0vr9r7m854pi60r6z7f8cqr3l3fqi4b308jb492ngq"; + version = "0.1.6"; + sha256 = "08348nw7xnni81iwcah43x5hi0hyqz286g3zpmkhja8if99l59lj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161150,8 +161763,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.4.0"; - sha256 = "1ishxvijigfjfvrqiibbds2l7bb5vp51lsy933q4nphapvqrhk2m"; + version = "0.4.1"; + sha256 = "0zx21dhnzc8p0x6v827178rl2s215gik705fggmg31hqhwkzfy4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161631,15 +162244,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_1_3_0_0" = callPackage + "miso_1_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "1.3.0.0"; - sha256 = "1vz7k7ajngmrzczw4bl33g081hbmbk1bkixsm47y4x8jzxa0lk7x"; + version = "1.4.0.0"; + sha256 = "067z49ial3dwkbcza54aivdh8r4yx54zmpyxmd6mpyqlv96dv8gc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161992,6 +162605,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark_0_0_7_2" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.2"; + sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark @@ -162002,8 +162643,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "1"; - editedCabalFile = "11yrsr4hpl5vxrfav1nfg3gidcr1qy0rjv5mkh5hqsxdpxy6c7aj"; + revision = "2"; + editedCabalFile = "1kpxrf3gwcl0l8jqq3dic49705p338rcvach95vp1g1jjpwd8kbj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162067,8 +162708,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.2.0"; - sha256 = "1cjjdiyb1n5y5bswpm1lckqnn97lvn4mx8nrkydzsi1lfmxjvhk3"; + version = "0.1.3.0"; + sha256 = "0asxxv2ykwn82lr744ihfip8lhck888l3rvn4qadjdapv1sn3zfx"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = stdenv.lib.licenses.mit; @@ -162096,13 +162737,36 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.2.1"; - sha256 = "1cq8180xkq01jpqwiv6f7wiwyjhs76gh5a148hvxhffvfhnsarb8"; + version = "0.4.2.2"; + sha256 = "1y5f9fwc9k7hbmnk8fvm6m6h2lrdsfijr6jn0dfj6fhc17kmp46p"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; }) {}; + "mmsyn6ukr" = callPackage + ({ mkDerivation, base, bytestring, mmsyn2, mmsyn3, mmsyn5, process + , vector + }: + mkDerivation { + pname = "mmsyn6ukr"; + version = "0.3.2.0"; + sha256 = "1qv34s1aypm43xf51bf7mlp7jbkfcgsz8gil7xcly50is1a19z3n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring mmsyn2 mmsyn3 mmsyn5 process vector + ]; + executableHaskellDepends = [ + base bytestring mmsyn2 mmsyn3 mmsyn5 process vector + ]; + description = "Can be used as a musical instrument synthesizer or for Ukrainian language listening"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mmtf" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text @@ -163089,6 +163753,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_31" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.31"; + sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -163128,8 +163814,8 @@ self: { }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.4.0"; - sha256 = "1jwwpjn35mvl7z05xcykpxdyhaa6mgiighgcr8qzprrmw89kwb05"; + version = "0.1.5.0"; + sha256 = "0y96f5qan5na32s8xilky7z30mc7yci1s5i3585aqvqsyyvshchf"; libraryHaskellDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; @@ -163137,14 +163823,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "monad-logger-syslog_0_1_5_0" = callPackage + "monad-logger-syslog_0_1_6_0" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.5.0"; - sha256 = "0y96f5qan5na32s8xilky7z30mc7yci1s5i3585aqvqsyyvshchf"; + version = "0.1.6.0"; + sha256 = "1n4r0fl043r18683ym3k03sdm3b9wlxfzjgmnxi804kwna639rj3"; libraryHaskellDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; @@ -163930,7 +164616,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {gecodeint = null; gecodekernel = null; gecodesearch = null; + }) {gecodeint = null; gecodekernel = null; gecodesearch = null; gecodeset = null; gecodesupport = null;}; "monadio-unwrappable" = callPackage @@ -164489,16 +165175,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_6" = callPackage + "monoidal-containers_0_6_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens , newtype, semialign, semigroups, these, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.6"; - sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9"; - revision = "2"; - editedCabalFile = "17qv2kds7m4mi3r4rd89d2nhcjc06lzdfg93qsn6ldssnypq0rra"; + version = "0.6.0.1"; + sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -164654,6 +165338,8 @@ self: { ]; description = "Month, YearMonth, Quarter, YearQuarter types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monus" = callPackage @@ -164887,22 +165573,23 @@ self: { "morpheus-graphql" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , mtl, scientific, tasty, tasty-hunit, template-haskell, text - , transformers, unordered-containers, uuid, vector, websockets + , th-lift-instances, transformers, unordered-containers, uuid + , vector, websockets }: mkDerivation { pname = "morpheus-graphql"; - version = "0.6.2"; - sha256 = "160wg001xpwrhvv1wgdqbcwhdpxk4yhi0vf5sjyyzr0bq3j9x1dn"; + version = "0.7.1"; + sha256 = "1yh49icsq68xbw9gmvqssy4piaqb97cy39jg4a20360j9sfr87dp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec mtl scientific - template-haskell text transformers unordered-containers uuid vector - websockets + template-haskell text th-lift-instances transformers + unordered-containers uuid vector websockets ]; testHaskellDepends = [ aeson base bytestring containers megaparsec mtl scientific tasty - tasty-hunit template-haskell text transformers unordered-containers - uuid vector websockets + tasty-hunit template-haskell text th-lift-instances transformers + unordered-containers uuid vector websockets ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.mit; @@ -164926,6 +165613,8 @@ self: { ]; description = "Morpheus GraphQL CLI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morphisms" = callPackage @@ -165082,6 +165771,8 @@ self: { ]; description = "General purpose migrations library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "moto-postgresql" = callPackage @@ -165097,6 +165788,8 @@ self: { ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "motor" = callPackage @@ -167472,6 +168165,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mx-state-codes" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "mx-state-codes"; + version = "1.0.0.0"; + sha256 = "1jxw7hh24rqs1c5y4b7bmllvcwq3gsrrn0rixq9lzhn2915ykaq6"; + libraryHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ aeson base hspec QuickCheck text ]; + description = "ISO 3166-2:MX State Codes and Names"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mxnet" = callPackage ({ mkDerivation, base, c2hs, c2hs-extra, mxnet, pretty, tasty , tasty-hunit, template-haskell, unordered-containers, vector @@ -168471,7 +169176,7 @@ self: { license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; + }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "nanovg-simple" = callPackage @@ -168712,8 +169417,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "natural-arithmetic"; - version = "0.1.0.0"; - sha256 = "0h5ga04hw7v54xsxjj852238spl3px190g67qjqzxvnyn0f76jrp"; + version = "0.1.1.0"; + sha256 = "0n2330b2g4gy1ljpcww9vmj74ig23m0zxkg92721zpdfywlcy44g"; libraryHaskellDepends = [ base ]; description = "Arithmetic of natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -169044,8 +169749,8 @@ self: { }: mkDerivation { pname = "neko-obfs"; - version = "0.1.0.2"; - sha256 = "1kqki738d7jfjgr0jcybs9w0fzccmdb1i64caanydpfn6x9rkiac"; + version = "0.1.0.4"; + sha256 = "1vffkpxxvxykrjy9awx0vqda6gbpmzz2ybr5ijmb47dl7mr7sl88"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169289,8 +169994,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.6.2.0"; - sha256 = "0mryfsjcvybfx7zrakn6h8hw2l8fdq7g194kmiy9xafkkgyza1pk"; + version = "0.6.2.1"; + sha256 = "09l9m213x1v7cvrfr039hg2c1pa4dknyhj827h9n0w9pawj61r55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169935,14 +170640,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "network_3_1_1_0" = callPackage + "network_3_1_1_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit }: mkDerivation { pname = "network"; - version = "3.1.1.0"; - sha256 = "0gr99ksn7khijfjf0g4bkp13kb6jbxnq23b6pxflnvlsf5la8yks"; + version = "3.1.1.1"; + sha256 = "16ic2hgvadyiy0zfnyd2zknf8rxqmwzpy5mw5x9apwpzfc0mkvyp"; libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring directory hspec HUnit ]; testToolDepends = [ hspec-discover ]; @@ -170130,8 +170835,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; - revision = "2"; - editedCabalFile = "1cqb720gl960zfzbzxakc2wvrvw8plncgarbb1v1hdzmdxw07js7"; + revision = "3"; + editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; @@ -170173,6 +170878,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.2.0"; + sha256 = "1y2azf5zbydzvi4b0hxmy7am4kgpkq8ajnsbrpfrqz87b5y87ccy"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -170429,22 +171147,6 @@ self: { }: mkDerivation { pname = "network-messagepack-rpc"; - version = "0.1.1.4"; - sha256 = "040kj2rs80kg7746rqrrsgpbi3vpbfg4c6r5n08nvqqslcx932xb"; - libraryHaskellDepends = [ - base bytestring data-msgpack safe-exceptions text - unordered-containers - ]; - description = "MessagePack RPC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-messagepack-rpc_0_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions - , text, unordered-containers - }: - mkDerivation { - pname = "network-messagepack-rpc"; version = "0.1.2.0"; sha256 = "118agkkbvfyynk6qg5yzazbs0s7w0bw9n0ndj8nm35yy6cil9lky"; libraryHaskellDepends = [ @@ -170453,7 +171155,6 @@ self: { ]; description = "MessagePack RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-messagepack-rpc-websocket" = callPackage @@ -170463,8 +171164,8 @@ self: { }: mkDerivation { pname = "network-messagepack-rpc-websocket"; - version = "0.1.1.0"; - sha256 = "05cd6cqyydjwymnk8rscqngvz3knyibl674rcbjpz28him6gbc7d"; + version = "0.1.1.1"; + sha256 = "0adkav3nl7ghbx2r7dx83ki6m397clxaw37s54ivnkxydqscjv06"; libraryHaskellDepends = [ base network-messagepack-rpc text websockets wss-client ]; @@ -170729,6 +171430,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-simple-tls_0_4" = callPackage + ({ mkDerivation, base, bytestring, data-default, network + , network-simple, safe-exceptions, tls, tls-session-manager + , transformers, x509, x509-store, x509-system, x509-validation + }: + mkDerivation { + pname = "network-simple-tls"; + version = "0.4"; + sha256 = "0c5xxqp2xw1q046sngd5gnwp7gn0ima9wm8drxxry13l0i0bnmn1"; + libraryHaskellDepends = [ + base bytestring data-default network network-simple safe-exceptions + tls tls-session-manager transformers x509 x509-store x509-system + x509-validation + ]; + description = "Simple interface to TLS secured network sockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-simple-ws" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, network-simple , safe-exceptions, websockets @@ -171350,6 +172070,8 @@ self: { pname = "newtype-generics"; version = "0.5.4"; sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0"; + revision = "1"; + editedCabalFile = "1id9a6prj2bzdsyfsfr0pnfy9p8v9wlw59x12fny6y2szfcxcrv7"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -171763,26 +172485,26 @@ self: { ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, directory, file-embed, filepath, hashable , http-conduit, mtl, optparse-applicative, process, profunctors - , string-qq, tasty, tasty-hunit, text, unliftio + , pureMD5, string-qq, tasty, tasty-hunit, text, unliftio , unordered-containers }: mkDerivation { pname = "niv"; - version = "0.2.1"; - sha256 = "18ym8zqxillqf0psc9xyjzgnxhfrfgy5sj3hvrdmggy4dlnn500j"; + version = "0.2.3"; + sha256 = "182miqhcndb3fqxdcjnhpphma89pxdnbv8k3scrhzjd893ncxv8i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring directory file-embed filepath hashable http-conduit mtl optparse-applicative - process profunctors string-qq tasty tasty-hunit text unliftio - unordered-containers + process profunctors pureMD5 string-qq tasty tasty-hunit text + unliftio unordered-containers ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring directory file-embed filepath hashable http-conduit mtl optparse-applicative - process profunctors string-qq tasty text unliftio + process profunctors pureMD5 string-qq tasty text unliftio unordered-containers ]; description = "Easy dependency management for Nix projects"; @@ -171814,8 +172536,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.3"; - sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh"; + version = "1.0.4"; + sha256 = "1wmwrnm6wflkdaq0m84az1q6245iyvkzd2r47vdy9a2a1szqnvl3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172006,6 +172728,8 @@ self: { ]; description = "Tool for semi-automatic updating of nixpkgs repository"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nkjp" = callPackage @@ -172087,7 +172811,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {g = null; inherit (pkgs) glib; libnm-glib = null; + }) {g = null; inherit (pkgs) glib; libnm-glib = null; nm-glib = null;}; "nme" = callPackage @@ -172441,23 +173165,11 @@ self: { ({ mkDerivation, base, containers, semigroups }: mkDerivation { pname = "non-empty-sequence"; - version = "0.2.0.2"; - sha256 = "1qfidlv190wxrrp67h7rcrlczwfv7r0mdbwm31rrf08l1i6618yr"; - libraryHaskellDepends = [ base containers semigroups ]; - description = "Non-empty sequence"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "non-empty-sequence_0_2_0_4" = callPackage - ({ mkDerivation, base, containers, semigroups }: - mkDerivation { - pname = "non-empty-sequence"; version = "0.2.0.4"; sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0"; libraryHaskellDepends = [ base containers semigroups ]; description = "Non-empty sequence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "non-empty-text" = callPackage @@ -172540,6 +173252,25 @@ self: { "nonempty-containers" = callPackage ({ mkDerivation, base, comonad, containers, deepseq, hedgehog + , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these + }: + mkDerivation { + pname = "nonempty-containers"; + version = "0.3.1.0"; + sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l"; + libraryHaskellDepends = [ + base comonad containers deepseq semigroupoids these + ]; + testHaskellDepends = [ + base comonad containers hedgehog hedgehog-fn semigroupoids tasty + tasty-hedgehog text these + ]; + description = "Non-empty variants of containers data types, with full API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nonempty-containers_0_3_2_0" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, hedgehog , hedgehog-fn, nonempty-vector, semigroupoids, tasty , tasty-hedgehog, text, these, vector }: @@ -172557,6 +173288,7 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonempty-lift" = callPackage @@ -172814,6 +173546,8 @@ self: { transformers tuple ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "notmuch" = callPackage @@ -173510,23 +174244,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "numhask"; - version = "0.3.0.0"; - sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw"; - libraryHaskellDepends = [ base ]; - description = "numeric classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "numhask_0_3_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "numhask"; version = "0.3.1"; sha256 = "0r7raa7sw9k6p5xb3kl7jfpfkg4dym2kb8hrdkq9xvj2yrajzg77"; libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-array" = callPackage @@ -173639,6 +174361,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "numerical spaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-test" = callPackage @@ -174384,8 +175108,8 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXinerama; ovr = null; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXinerama; ovr = null; inherit (pkgs) systemd;}; "odbc" = callPackage @@ -176958,23 +177682,22 @@ self: { "ormolu" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc, ghc-boot-th, ghc-paths, gitrev, hspec - , hspec-discover, mtl, optparse-applicative, path, path-io, syb - , text + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text }: mkDerivation { pname = "ormolu"; - version = "0.0.1.0"; - sha256 = "1p4m9hiavirnhf941fb5pdnrlrknr5rhcvznhqywianvvw6qcm30"; + version = "0.0.2.0"; + sha256 = "10p3h98k5ph2awmdd89k8knavv4npvdmh00a9nrzaw6z32j0igfh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc ghc-boot-th - ghc-paths mtl syb text + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text ]; executableHaskellDepends = [ - base ghc gitrev optparse-applicative text + base ghc-lib-parser gitrev optparse-applicative text ]; testHaskellDepends = [ base containers filepath hspec path path-io text @@ -176982,6 +177705,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "os-release" = callPackage @@ -177266,10 +177991,8 @@ self: { }: mkDerivation { pname = "overloaded"; - version = "0.1.2"; - sha256 = "0m2ddb48vsl0x0hz6pq8wabl1s6vl7s66rz7z9v2i6d809zl83kw"; - revision = "1"; - editedCabalFile = "08w1f1g0vq0q8v93fdhb8w7a2xmq6mbyh8c3s5y5sli1bynsgbzb"; + version = "0.1.3"; + sha256 = "0yz94zzcwdw34c5v9qmqak9bwqz8gq1s80phf9rn8p0bg6a4l0h4"; libraryHaskellDepends = [ base bytestring containers fin ghc optics-core record-hasfield sop-core split syb symbols text time vec @@ -177940,6 +178663,61 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_8_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doclayout, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client + , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network + , network-uri, pandoc-types, parsec, process, QuickCheck, random + , safe, scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, vector + , weigh, xml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.8.0.1"; + sha256 = "0g8sg52319id1srfb7z9j85lsk84x2rbillrcl4qsjg81lgq7pzs"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive cmark-gfm + containers data-default deepseq directory doclayout doctemplates + exceptions filepath Glob haddock-library hslua hslua-module-system + hslua-module-text HsYAML HTTP http-client http-client-tls + http-types ipynb JuicyPixels mtl network network-uri pandoc-types + parsec process random safe scientific SHA skylighting + skylighting-core split syb tagsoup temporary texmath text + text-conversions time unicode-transforms unix unordered-containers + vector xml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + doctemplates executable-path filepath Glob hslua mtl pandoc-types + process QuickCheck tasty tasty-golden tasty-hunit tasty-lua + tasty-quickcheck temporary text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -177976,7 +178754,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_16_3_1" = callPackage + "pandoc-citeproc_0_16_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc @@ -177986,8 +178764,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.16.3.1"; - sha256 = "12fsvvjcl7mf52xggh6v7p9va7vhfxj62ziyl1idiz13wp0ipc2z"; + version = "0.16.4"; + sha256 = "0mnkhyj56pw8cnycf4ny082rz67gii1x6clzhmxi60zafg07v04c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178014,18 +178792,21 @@ self: { "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process + , text-conversions }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.4"; - sha256 = "0bdarf6rjncd8lfap4xn479675vsvqzxrmdqd367l2gxfi1nmrv5"; + version = "1.3"; + sha256 = "1lnsklvqvi9569wxdkyk2qwc33mm5d3n28xj64847i8g9af2jqs9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath pandoc-types process + base directory filepath pandoc-types process text-conversions ]; description = "Insert a preamble before pandoc-citeproc's bibliography"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-crossref" = callPackage @@ -178037,8 +178818,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.4.1"; - sha256 = "19hs4akqsg7nlspnbdbyncq8irj0a3h8akmyfzxmi2yb35x7c8ny"; + version = "0.3.5.0"; + sha256 = "1x01qf7v88f42p6h4mjm8rllxm8jl7bj8rq3512qjksns6qajvk4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178062,6 +178843,8 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -178267,8 +179050,6 @@ self: { ]; description = "Pandoc filter to include CSV files"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-plantuml-diagrams" = callPackage @@ -178327,7 +179108,7 @@ self: { broken = true; }) {}; - "pandoc-pyplot_2_2_0_0" = callPackage + "pandoc-pyplot_2_3_0_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl , open-browser, optparse-applicative, pandoc, pandoc-types @@ -178336,8 +179117,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.2.0.0"; - sha256 = "1090c3ilm2krz8wyhizlrbwdrn0hq05a7cyh1n0y57sfv3hxprbj"; + version = "2.3.0.0"; + sha256 = "04brh01arvmp3v8b006933n55m6z1pvz9v3x58732n693s7bhq8n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178374,17 +179155,17 @@ self: { }) {}; "pandoc-stylefrommeta" = callPackage - ({ mkDerivation, base, bytestring, containers, MissingH, pandoc + ({ mkDerivation, base, bytestring, containers, extra, pandoc , pandoc-types, text }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.1.1"; - sha256 = "0jqgpgz1yx85zhm4f6qjaqcj94zi71ab0gam5vdz0jad79szr5l8"; + version = "0.2.3.0"; + sha256 = "1145flz4jkn5knqkc5cppc1412m6hfzd13124k2kfm8dmw196k31"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers MissingH pandoc pandoc-types text + base bytestring containers extra pandoc pandoc-types text ]; description = "Pandoc filter to customize links, images and paragraphs"; license = stdenv.lib.licenses.bsd3; @@ -178454,17 +179235,17 @@ self: { "pandoc-vimhl" = callPackage ({ mkDerivation, base, cond, directory, filepath, pandoc-types - , process, regex-compat, temporary + , process, regex-compat, temporary, text }: mkDerivation { pname = "pandoc-vimhl"; - version = "0.1.2.4"; - sha256 = "16gvlskbp2d000mbx2rkbz6dg6758ni4x2mkzxjyk5m475h13w6b"; + version = "0.1.3.0"; + sha256 = "0ppn42jicmx3v0qk6ql0ccx61kk53c75n5wnl3dppgnv1xgmlnq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cond directory filepath pandoc-types process regex-compat - temporary + temporary text ]; description = "Pandoc filter for native Vim code highlighting"; license = stdenv.lib.licenses.bsd3; @@ -181144,18 +181925,6 @@ self: { }) {}; "pcre-light" = callPackage - ({ mkDerivation, base, bytestring, pcre }: - mkDerivation { - pname = "pcre-light"; - version = "0.4.0.4"; - sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82"; - libraryHaskellDepends = [ base bytestring ]; - libraryPkgconfigDepends = [ pcre ]; - description = "Portable regex library for Perl 5 compatible regular expressions"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) pcre;}; - - "pcre-light_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: mkDerivation { pname = "pcre-light"; @@ -181166,7 +181935,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit mtl ]; description = "Portable regex library for Perl 5 compatible regular expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage @@ -184260,6 +185028,8 @@ self: { testHaskellDepends = [ base containers sdl2 sdl2-image stm text ]; description = "Functional 2D Game Framework"; license = stdenv.lib.licenses.zlib; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ping" = callPackage @@ -185197,6 +185967,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-network-tls_0_4" = callPackage + ({ mkDerivation, base, bytestring, network, network-simple + , network-simple-tls, pipes, pipes-network, pipes-safe, tls + , transformers + }: + mkDerivation { + pname = "pipes-network-tls"; + version = "0.4"; + sha256 = "161nqwgv0r5vlnpa1bq0y2wyh2yp8b583dxbwpbgxfjrnsy5f5vm"; + libraryHaskellDepends = [ + base bytestring network network-simple network-simple-tls pipes + pipes-network pipes-safe tls transformers + ]; + description = "TLS-secured network connections support for pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-network-ws" = callPackage ({ mkDerivation, base, bytestring, network-simple-ws, pipes }: mkDerivation { @@ -186698,8 +187486,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.14"; - sha256 = "08b2dslkblxch8k6wlc6xx50lva8abdkdwibgfxdj2yw4mgdnhry"; + version = "1.1.1.15"; + sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186730,6 +187518,8 @@ self: { executableHaskellDepends = [ base ]; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pointless-fun" = callPackage @@ -187658,7 +188448,7 @@ self: { license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; + }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; inherit (pkgs) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage @@ -188314,6 +189104,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_2" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.2"; + sha256 = "1zkhwl8g141p1zgnbxjhh0r6wgvzlpwdbvyl80z31fdxd5v29bv8"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -188385,8 +189205,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "postgresql-copy-escape"; - version = "0.1"; - sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm"; + version = "0.1.0.1"; + sha256 = "08ld3rqjjjhlikcv1cpxjqs8wlsjhvv7qq9fjb032hx6mvcqwz0i"; libraryHaskellDepends = [ base bytestring ]; description = "Format data to feed to a PostgreSQL COPY FROM statement"; license = stdenv.lib.licenses.bsd3; @@ -189585,23 +190405,24 @@ self: { "predicate-typed" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, comonad - , containers, deepseq, directory, doctest, ghc-prim, lens, mtl - , pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck, safe - , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, these, time, tree-view + , containers, deepseq, directory, doctest, ghc-prim, hashable, lens + , mtl, pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck + , safe, stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, th-lift, these, time, tree-view }: mkDerivation { pname = "predicate-typed"; - version = "0.4.0.0"; - sha256 = "1inbwv7g98b8pc0z3ri4hrmang6caaam99mv6vd1pam11kpw6l8g"; + version = "0.6.0.0"; + sha256 = "0fk30pn759fg9v2k5gw51hk6vkp2vq4sh574zlqdk4vx6r2r5jrp"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory - ghc-prim lens mtl pcre-heavy pcre-light pretty pretty-terminal - QuickCheck safe template-haskell text th-lift these time tree-view + ghc-prim hashable lens mtl pcre-heavy pcre-light pretty + pretty-terminal QuickCheck safe template-haskell text th-lift these + time tree-view ]; testHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory - doctest ghc-prim lens mtl pcre-heavy pcre-light pretty + doctest ghc-prim hashable lens mtl pcre-heavy pcre-light pretty pretty-terminal QuickCheck safe stm tasty tasty-hunit tasty-quickcheck template-haskell text th-lift these time tree-view ]; @@ -191134,21 +191955,6 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5.2"; - sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers random transformers utility-ht - ]; - description = "Probabilistic Functional Programming"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "probability_0_2_6" = callPackage - ({ mkDerivation, base, containers, random, transformers, utility-ht - }: - mkDerivation { - pname = "probability"; version = "0.2.6"; sha256 = "12qzgn9jb9hvbpbkb75ad55yhmhai945rvdbamx6zspbrjlsb9sz"; enableSeparateDataOutput = true; @@ -191157,7 +191963,6 @@ self: { ]; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "probable" = callPackage @@ -191217,16 +192022,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_6_0" = callPackage + "process_1_6_7_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.6.0"; - sha256 = "140as37rfad7hy1lg03n19dzfbcdaahv64aydl6frv06qvdlc49w"; - revision = "1"; - editedCabalFile = "0y3v5ly6fg42ngv41d28ny4x06ddqkivxx16whsfss06k15x3vz5"; + version = "1.6.7.0"; + sha256 = "1qplrcdzdv8dhzh859f709facw7xc6kmfwhwmm26qks4arkih7j5"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -191718,6 +192521,8 @@ self: { ]; description = "Profunctor optics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "profunctors" = callPackage @@ -191738,14 +192543,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profunctors_5_5" = callPackage + "profunctors_5_5_1" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.5"; - sha256 = "0z7kf8hkfk5wfxw80zs9jsh22mk3mjzfvqbdkihrw1wiyw4xkjfl"; + version = "5.5.1"; + sha256 = "0nmiv7hhmimiwj4jnh5vd5n96bihpairq2rf6hrw11rignal2dqx"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -192585,6 +193390,8 @@ self: { ]; description = "JSON protobuf encoding for proto-lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-optparse" = callPackage @@ -193433,29 +194240,29 @@ self: { }) {}; "publish" = callPackage - ({ mkDerivation, base, bytestring, chronologique, deepseq - , directory, filepath, hinotify, hspec, megaparsec, pandoc - , pandoc-types, template-haskell, text, typed-process, unbeliever - , unix, unordered-containers + ({ mkDerivation, base, bytestring, chronologique, core-program + , core-text, deepseq, directory, filepath, hinotify, hspec + , megaparsec, pandoc, pandoc-types, template-haskell, text + , typed-process, unix, unordered-containers }: mkDerivation { pname = "publish"; - version = "2.0.1"; - sha256 = "12jhwihg6nlhs1q2cf4ivd7qw724qz1wk1i5rmi4akfga8ad7n4l"; + version = "2.1.0"; + sha256 = "03fwk0ami5xxqacqb8gikqzxdp7cavvni5bmxd5bi1lvavk49sh7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring chronologique deepseq directory filepath hinotify - megaparsec pandoc pandoc-types template-haskell text typed-process - unbeliever unix unordered-containers + base bytestring chronologique core-program core-text deepseq + directory filepath hinotify megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; testHaskellDepends = [ - base bytestring chronologique deepseq directory filepath hinotify - hspec megaparsec pandoc pandoc-types template-haskell text - typed-process unbeliever unix unordered-containers + base bytestring chronologique core-program core-text deepseq + directory filepath hinotify hspec megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -194873,7 +195680,7 @@ self: { description = "Qt bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {qtc_core = null; qtc_gui = null; qtc_network = null; + }) {qtc_core = null; qtc_gui = null; qtc_network = null; qtc_opengl = null; qtc_script = null; qtc_tools = null;}; "qtah-cpp-qt5" = callPackage @@ -196221,6 +197028,8 @@ self: { ]; description = "Test helpers which help generate data for projects that use postgresql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quoridor-hs" = callPackage @@ -196589,16 +197398,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rainbow_0_34_0_0" = callPackage - ({ mkDerivation, base, bytestring, lens, process, QuickCheck, text + "rainbow_0_34_2_0" = callPackage + ({ mkDerivation, base, bytestring, lens, QuickCheck, terminfo, text }: mkDerivation { pname = "rainbow"; - version = "0.34.0.0"; - sha256 = "17v87fkr2skdq1rqcfd5x6philvr5zvnw6sdy9qj0ljafcq31mdd"; - libraryHaskellDepends = [ base bytestring lens process text ]; + version = "0.34.2.0"; + sha256 = "1lamwlkq3g184h7ab2f03x8bhmmpmcn0f1piqp8zqn0594v76a0q"; + libraryHaskellDepends = [ base bytestring lens terminfo text ]; testHaskellDepends = [ - base bytestring lens process QuickCheck text + base bytestring lens QuickCheck terminfo text ]; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -196641,14 +197450,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rainbox_0_24_0_0" = callPackage + "rainbox_0_24_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, lens, QuickCheck , rainbow, tasty, tasty-quickcheck, text }: mkDerivation { pname = "rainbox"; - version = "0.24.0.0"; - sha256 = "1y2zs6062y7xfhcach4s4q4nhhhb111dwggziwgzl3a60cnfhln3"; + version = "0.24.2.0"; + sha256 = "1b1nkw7j24fcmgzkcn92j6c8v6abrhg9580hnwna1b4sjjx6ayak"; libraryHaskellDepends = [ base bytestring containers lens rainbow text ]; @@ -199275,8 +200084,8 @@ self: { pname = "recursion-schemes"; version = "5.1.3"; sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj"; - revision = "1"; - editedCabalFile = "0zxcmga4fy42arbyv1kzbyfnsghnll3prkpva58x654x4cg4diwk"; + revision = "2"; + editedCabalFile = "01q18gplv5k328qf74innnx2z2p15pg5nc6sikxq6fkkw4v3rkyb"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers @@ -199342,8 +200151,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.1.0.2"; - sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164"; + version = "2.1.0.3"; + sha256 = "0g1av0w52m0admcqif5imkla43yk6id4y8jmiy843xbdqs3qzcx4"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -200345,8 +201154,8 @@ self: { }: mkDerivation { pname = "reform-happstack"; - version = "0.2.5.2"; - sha256 = "0d6w500y47ghmiawlv116hqrknr1sx4k525c7arq340slzch03r6"; + version = "0.2.5.3"; + sha256 = "04fnn47rcm7n98q0qifyyg9jrh09mzchirwsgi2zzb6j9mciz6ci"; libraryHaskellDepends = [ base bytestring happstack-server mtl random reform text utf8-string ]; @@ -200460,6 +201269,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Register allocation API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reg-alloc-types" = callPackage @@ -200920,22 +201731,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "regex-tdfa_1_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, file-embed - , filepath, ghc-prim, mtl, parsec, regex-base, utf8-string + "regex-tdfa_1_3_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, mtl, parsec, regex-base, text, utf8-string }: mkDerivation { pname = "regex-tdfa"; - version = "1.3.0"; - sha256 = "1qzcix4bmz5lj0w433qrfi576rvy8y8flv5wvlp6cchb2s8mfq0v"; + version = "1.3.1.0"; + sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm"; libraryHaskellDepends = [ - array base bytestring containers ghc-prim mtl parsec regex-base + array base bytestring containers mtl parsec regex-base text ]; testHaskellDepends = [ - array base bytestring containers file-embed filepath mtl regex-base - utf8-string + array base bytestring containers directory filepath mtl regex-base + text utf8-string ]; - description = "Replaces/Enhances Text.Regex"; + description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204255,20 +205066,20 @@ self: { "rib" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clay - , cmdargs, containers, data-default, fsnotify, http-types, lens - , lens-aeson, lucid, mtl, pandoc, pandoc-include-code, pandoc-types - , safe, shake, skylighting, text, time, wai, wai-app-static - , wai-extra, warp + , cmdargs, containers, data-default, directory, fsnotify + , http-types, lens, lens-aeson, lucid, mtl, pandoc + , pandoc-include-code, pandoc-types, safe, shake, skylighting, text + , time, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "rib"; - version = "0.3.0.0"; - sha256 = "1dw86xrz310vrapgln48r46z0ss35jm85c0r95pqvnq4smbwiw18"; + version = "0.4.1.0"; + sha256 = "06rxf3fnj9csng69p815ff3wlrbh48wszjcdm7v2xg6vbild3xkg"; libraryHaskellDepends = [ aeson async base binary bytestring clay cmdargs containers - data-default fsnotify http-types lens lens-aeson lucid mtl pandoc - pandoc-include-code pandoc-types safe shake skylighting text time - wai wai-app-static wai-extra warp + data-default directory fsnotify http-types lens lens-aeson lucid + mtl pandoc pandoc-include-code pandoc-types safe shake skylighting + text time wai wai-app-static wai-extra warp ]; description = "Static site generator using Shake"; license = stdenv.lib.licenses.bsd3; @@ -204280,10 +205091,12 @@ self: { ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { pname = "ribbit"; - version = "0.4.0.0"; - sha256 = "0nmpsi8b6m88za9jxawz36jjhsybn39ldi503ap7m9wd765j1dbz"; + version = "0.4.1.0"; + sha256 = "1pgyh7ar03k62mpn09g8qm13m1j07wq257hpva3f9sx9n5qd8z2a"; + revision = "1"; + editedCabalFile = "11ky88hgkys3bzsqr3sl9j685h6l97r2zccpz1ylinsrvinwnq8s"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; - description = "Type-level Relational DB combinators"; + description = "Type-level Relational DB language"; license = stdenv.lib.licenses.mit; }) {}; @@ -204545,6 +205358,8 @@ self: { testHaskellDepends = [ base connections hedgehog property ]; description = "Rings, semirings, and dioids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rio" = callPackage @@ -208628,6 +209443,8 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -209696,6 +210513,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sdl-try-drivers" = callPackage + ({ mkDerivation, base, pretty-simple, sdl2, text }: + mkDerivation { + pname = "sdl-try-drivers"; + version = "0.0.0.1"; + sha256 = "1zwcf6l2v3k8hi33ssij9a8x2wvlsp4lsa0x7qb9zaq4nbb8nsqj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base pretty-simple sdl2 text ]; + description = "small testing tool for sdl2 and accelerated drivers"; + license = stdenv.lib.licenses.mit; + }) {}; + "sdl2" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh @@ -210761,6 +211591,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_4" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, tagged, template-haskell, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.4"; + sha256 = "0r49qpbi803jk3v4i09jr1a98l6hcgnjhrv1a9fhmay3ff4y9lh0"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -210864,10 +211716,8 @@ self: { }: mkDerivation { pname = "semiring-num"; - version = "1.6.0.1"; - sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi"; - revision = "1"; - editedCabalFile = "123jk59i4ziv6ghmy8349icpvzgw90xjd6dxzlnayf0qg01adzsr"; + version = "1.6.0.4"; + sha256 = "1wpszhdjh2hmgnfzwdsdai1xzq0y1panay9jz5sa82hg11p4wa44"; libraryHaskellDepends = [ base containers deepseq hashable log-domain scientific template-haskell time unordered-containers vector @@ -212186,6 +213036,37 @@ self: { pname = "servant-cli"; version = "0.1.0.1"; sha256 = "12d18ca90b7mijaav3glx60b9c9qd1f2g4p5m4m7hzz2m22dyimn"; + revision = "1"; + editedCabalFile = "1h29x87kqyylwigz86bwrgjdykk1119alsy65a7jkkcrj7a3syqa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers filepath free + functor-combinators http-types optparse-applicative profunctors + recursion-schemes servant servant-client-core servant-docs text + transformers vinyl + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-client optparse-applicative + random servant servant-client servant-server text vinyl warp + ]; + description = "Command line interface for Servant API clients"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "servant-cli_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, free, functor-combinators, http-client + , http-types, optparse-applicative, profunctors, random + , recursion-schemes, servant, servant-client, servant-client-core + , servant-docs, servant-server, text, transformers, vinyl, warp + }: + mkDerivation { + pname = "servant-cli"; + version = "0.1.0.2"; + sha256 = "11pl9z3l2f7py16drqq9zvl9z5358jv1q7pqslhkhrqg5vhp822k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214137,8 +215018,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.9.3"; - sha256 = "09mxwqzwcv7dzrb39jiqfay91jh64ajdcp2j2zsp0j1d6g3n8ywf"; + version = "0.9.4"; + sha256 = "11svl9km810xw4vbn3vd9jqnv9fglf5jqfyfshnjachiz38fdsih"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -215480,8 +216361,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.22"; - sha256 = "1mc1a0vv070gcawwcx6vzpj6gpfh1qnlqrndiyfic3p500y656vh"; + version = "2.0.23"; + sha256 = "0i1k6ahpvc45z05lycxs0f70ngm8xrazp6ayyxv1bzw8q8d4bkz3"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -218082,6 +218963,28 @@ self: { broken = true; }) {}; + "singular-factory" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hgmp + , process, QuickCheck, random, singular-factory, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "singular-factory"; + version = "0.1"; + sha256 = "0gz9p32y37ci7i1xnq4n086p1ql5nli84z15xyq6dl1jaz0f541r"; + libraryHaskellDepends = [ + base containers directory filepath hgmp process text + ]; + libraryPkgconfigDepends = [ singular-factory ]; + testHaskellDepends = [ + base QuickCheck random tasty tasty-hunit tasty-quickcheck + ]; + description = "Multivariate polynomial factorization via bindings to Singular-factory"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {singular-factory = null;}; + "sink" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -218206,8 +219109,8 @@ self: { }: mkDerivation { pname = "sitepipe"; - version = "0.4.0.0"; - sha256 = "0y8llic3imc1zs53glig24vjm59f2dnw4sw32gzkvlzq33689s7s"; + version = "0.4.0.1"; + sha256 = "1iq7i2zs1bqnxqjp5bwsx8q2vvp1kngwg45mzsiwmhzq4m88x80h"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache @@ -218633,14 +219536,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_8_2_3" = callPackage + "skylighting_0_8_3" = callPackage ({ mkDerivation, base, binary, bytestring, containers , skylighting-core }: mkDerivation { pname = "skylighting"; - version = "0.8.2.3"; - sha256 = "10byr42qnsrqs368li412n8zz405annwmh4vvq2yh6xskipgb32p"; + version = "0.8.3"; + sha256 = "1gsmbzgfxwsfvnk3mbd29llv5wkvn5v7ybs46y6kvf51sdf4v6i6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218683,7 +219586,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_8_2_3" = callPackage + "skylighting-core_0_8_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -218693,8 +219596,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.2.3"; - sha256 = "005ancb8y846xsiagnb4gp4bn4h86r551rvpm3x4xj5zpr795pnc"; + version = "0.8.3"; + sha256 = "07l8n290wm533qp7h1kdn99b47f2lrq4mag2snfpllll8ss35773"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219198,20 +220101,21 @@ self: { "small-bytearray-builder" = callPackage ({ mkDerivation, base, byteslice, bytestring, gauge , natural-arithmetic, primitive, primitive-offset, QuickCheck - , run-st, tasty, tasty-hunit, tasty-quickcheck, text, text-short - , vector + , quickcheck-classes, run-st, tasty, tasty-hunit, tasty-quickcheck + , text, text-short, vector, wide-word }: mkDerivation { pname = "small-bytearray-builder"; - version = "0.3.0.0"; - sha256 = "17c0mwanwj96djirh6vac9k5dh8qsl9inx237wwbln4j3br4mkz4"; + version = "0.3.1.0"; + sha256 = "1swv0cwsxrmffkvx16qxxxkxfhqfwxwfz7d2msp5fzzz6all6vli"; libraryHaskellDepends = [ base byteslice bytestring natural-arithmetic primitive - primitive-offset run-st text-short + primitive-offset run-st text-short wide-word ]; testHaskellDepends = [ base byteslice bytestring natural-arithmetic primitive QuickCheck - tasty tasty-hunit tasty-quickcheck text vector + quickcheck-classes tasty tasty-hunit tasty-quickcheck text vector + wide-word ]; benchmarkHaskellDepends = [ base byteslice gauge natural-arithmetic primitive text-short @@ -220021,10 +220925,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.4.0"; - sha256 = "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr"; - revision = "1"; - editedCabalFile = "1nw74vpfag6gdh66kq82a0kdb05c2xnwcfacwlcg77j24gxcgi6s"; + version = "1.0.4.1"; + sha256 = "19dmfqbsfyk1rkjnnrnajpjfam2xjxgmpfmx10yr5qffgza7gcf0"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -221953,8 +222855,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; - version = "1.0.0.3"; - sha256 = "0c2y51gw94faafa0jvb3awnsvj89saan4ryy0d5dwivp0zp9gg64"; + version = "1.0.1"; + sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -222117,6 +223019,26 @@ self: { broken = true; }) {}; + "souffle-haskell" = callPackage + ({ mkDerivation, base, hspec, mtl, template-haskell + , type-errors-pretty + }: + mkDerivation { + pname = "souffle-haskell"; + version = "0.0.1"; + sha256 = "1sz5xaw24fknq4y9a9cpp36h6fm46ipclp3nwmpqpnc5svsslgbz"; + libraryHaskellDepends = [ + base mtl template-haskell type-errors-pretty + ]; + testHaskellDepends = [ + base hspec mtl template-haskell type-errors-pretty + ]; + description = "Souffle Datalog bindings for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sound-collage" = callPackage ({ mkDerivation, array, base, Cabal, carray, containers, fft , filepath, numeric-prelude, optparse-applicative, pathtype @@ -223931,6 +224853,8 @@ self: { ]; description = "A file-packing application"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sr-extra" = callPackage @@ -224238,6 +225162,8 @@ self: { libraryHaskellDepends = [ base gdp ghc-prim primitive ]; description = "shared heap regions between local mutable state threads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stable-heap" = callPackage @@ -226852,7 +227778,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "store_0_7_0" = callPackage + "store_0_7_1" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -226866,8 +227792,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.0"; - sha256 = "0vm0gmdgay66wyvg3inlpdc4p7clpvd23767wldfilvvq5zcjq1q"; + version = "0.7.1"; + sha256 = "0mxvyy7l0vg545f3v1y5kh7q58ajhwz02fhfk0km2198bhsdfrij"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -226999,15 +227925,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_44_0" = callPackage + "stratosphere_0_46_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.44.0"; - sha256 = "10brxs6hs8s0nb17aycbpn4xhiixxhxnv1wgmkc4jy0pbbrp942w"; + version = "0.46.0"; + sha256 = "07qm0bi5f3fkpnbsjbyi4qv2kp7w0wb7zd75q4cikjwkm1wxlldr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227187,12 +228113,12 @@ self: { }) {}; "streamdeck" = callPackage - ({ mkDerivation, base, bytestring, hidapi, mtl }: + ({ mkDerivation, base, bytestring, hidapi, mtl, split }: mkDerivation { pname = "streamdeck"; - version = "0.0.3"; - sha256 = "1cjvdf9ld55pv7n9cx2c4rsczqjxkrx1mkci8aziz59bs2ipqhak"; - libraryHaskellDepends = [ base bytestring hidapi mtl ]; + version = "0.1.0"; + sha256 = "0dg5hmv61jnpqby4v5g4wpsb7ynsm56fmb3xj2pixswnzqz31ian"; + libraryHaskellDepends = [ base bytestring hidapi mtl split ]; description = "Control library for the Elgato Stream Deck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -227625,8 +228551,8 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.3"; - sha256 = "1gy6yy14q18zfbbj6rvsnhvhkra78m2jwbyd3hnpbx25jgvz230n"; + version = "0.2.0.4"; + sha256 = "1qdfqp1w7pszks4iqbvgqsxmr2c6bx81jgkyz9k8wfz7vajg6f67"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -228706,8 +229632,8 @@ self: { pname = "structs"; version = "0.1.2"; sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4"; - revision = "1"; - editedCabalFile = "1snsprlbv9npn06iliy937vxqpsjpcmv880bnkbzj3nz4c6c59pa"; + revision = "2"; + editedCabalFile = "0ma2s0by622kaq7p57g859pxha02bqrd7n86cczfb2gzcm7kqma7"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell @@ -230304,6 +231230,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.5"; + sha256 = "0ywj4536daz43vrxibqn271gq96bzkawx3qcwbm547315jfd4fqf"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -230890,7 +231849,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; inherit (pkgs) symengine;}; "symengine-hs" = callPackage @@ -230910,7 +231869,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; inherit (pkgs) symengine;}; "symmetric-properties" = callPackage @@ -232261,8 +233220,8 @@ self: { pname = "tagged"; version = "0.8.6"; sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md"; - revision = "1"; - editedCabalFile = "070xwfw7y81hd63il76dmwbdl9ca1rd07c54zynfx6vpr4wyx4vh"; + revision = "2"; + editedCabalFile = "1y8z8hmm846z7h3wqncpi0d4zhsnkwf08q0wchivkjw8di7ahz0z"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -232556,8 +233515,8 @@ self: { }: mkDerivation { pname = "tagsoup-navigate"; - version = "0.1.0.3"; - sha256 = "1vfadi0ls4wqv8kzpil5ph715mihxp70nb2nnjq70gsdgarndv2j"; + version = "0.1.0.4"; + sha256 = "1mds95a0xz3iklidmvczjpmm9vjhzdrdvcj3dg0n3ivwwli672m9"; libraryHaskellDepends = [ base deriving-compat lens mmorph mtl semigroupoids semigroups tagsoup tagsoup-selection transformers @@ -233164,8 +234123,8 @@ self: { pname = "taskwarrior"; version = "0.1.0.0"; sha256 = "0af58ns601bqih7nvg614wclxvd2f9j3rqakz9djjybdk1771j2v"; - revision = "1"; - editedCabalFile = "0idswz48jgl48grmbbynh1447bblw99wpqifjcwr6apcl63hrn3a"; + revision = "3"; + editedCabalFile = "1b2v1rl2impngxn8bw9j36nr0id4s5dy6pnj0nw5p69mfb046zd5"; libraryHaskellDepends = [ aeson base bytestring process string-interpolate text time unordered-containers uuid @@ -233705,6 +234664,8 @@ self: { ]; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-test-vector" = callPackage @@ -233740,8 +234701,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.1"; - sha256 = "07jx1ik8bmirc6ycimzv763kfqvhi712ivk32npw5iprpn94k6h2"; + version = "0.1.0.2"; + sha256 = "0lksanhb1nsk45vqg1h9jigllfg0lrqsynxkplh8lyx6g8k0naav"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -235214,7 +236175,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; - }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; + }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -237097,6 +238058,8 @@ self: { pname = "th-abstraction"; version = "0.3.1.0"; sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb"; + revision = "1"; + editedCabalFile = "1c0sy614vfcdvshn0z09nzfiq89v5if31yvvpxzrivrdy9gf912s"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -237333,8 +238296,8 @@ self: { }: mkDerivation { pname = "th-format"; - version = "0.1.2.0"; - sha256 = "1wc9ndqv2qxk75b47s44j0lrx5h9hc1r4h1nvl01pbdks6yyi43j"; + version = "0.1.3.0"; + sha256 = "0ckyf5r5sz3x8ixj5nclqsi6ifk7zz08b6wf09gbwb4gbydklw7c"; libraryHaskellDepends = [ base Earley haskell-src-meta template-haskell text ]; @@ -237490,6 +238453,8 @@ self: { pname = "th-orphans"; version = "0.13.9"; sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z"; + revision = "1"; + editedCabalFile = "100gpi0np50vxlapyl6d05w8ss9l2gqacn28i228hsvhvrxxwjdy"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -238252,8 +239217,8 @@ self: { }: mkDerivation { pname = "thrift"; - version = "0.12.0"; - sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf"; + version = "0.13.0"; + sha256 = "005gaw3n548l7ij8m2di2b7nmfz2sg6nhafb3xjccw9wgwzl9qs2"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers ghc-prim hashable hspec-core HTTP network network-uri QuickCheck @@ -238584,8 +239549,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.4.4"; - sha256 = "0ibaq9gyn0iz00jsdmifw5fcj4f01l6z8ds13gxz365r1wgcn2pj"; + version = "1.4.5"; + sha256 = "146nhi2y8c5acqmkhgh4f1bb3wrasba0i1w4v2vwnbznpdv6cxs1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -239464,8 +240429,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "timers-tick"; - version = "0.4.1.0"; - sha256 = "1dbkgsvzfxgf4cgkzlmn1dcjw3rb7rrx56ix7n5r1k42n0wsyfsg"; + version = "0.4.2.0"; + sha256 = "079pgfgpgdmn9yqyd81rz615a035zjw24na8q332m1ld51xc0n8f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "tick based timers"; @@ -240209,27 +241174,36 @@ self: { broken = true; }) {}; - "tmp-postgres_1_13_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring - , containers, criterion, directory, generic-monoid, hspec, mtl - , port-utils, postgres-options, postgresql-simple, process, random - , temporary, transformers, unix + "tmp-postgres_1_23_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring + , bytestring, containers, criterion, cryptohash-sha1, deepseq + , directory, generic-monoid, hspec, mtl, network, port-utils + , postgres-options, postgresql-simple, process, stm, temporary + , transformers, unix }: mkDerivation { pname = "tmp-postgres"; - version = "1.13.0.0"; - sha256 = "01xpa5jignp7a3fw2rczyciaz9h6m1hf0i1iwanadbacnvzh7ing"; + version = "1.23.0.3"; + sha256 = "1fjp6021lxz1a2drd1f9g3n7sxdrq17wgc2cbjiihcqrjld5qqs0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring containers directory - generic-monoid port-utils postgres-options postgresql-simple - process random temporary transformers unix + ansi-wl-pprint async base base64-bytestring bytestring containers + cryptohash-sha1 deepseq directory generic-monoid port-utils + postgres-options postgresql-simple process stm temporary + transformers unix + ]; + executableHaskellDepends = [ + async base directory postgres-options postgresql-simple process + temporary ]; testHaskellDepends = [ - base containers directory hspec mtl port-utils postgres-options - postgresql-simple process temporary unix + base containers directory generic-monoid hspec mtl network + port-utils postgres-options postgresql-simple process temporary + unix ]; benchmarkHaskellDepends = [ - base criterion postgres-options postgresql-simple + base criterion deepseq postgres-options postgresql-simple ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; @@ -241108,10 +242082,10 @@ self: { ({ mkDerivation, base, containers, semiring-num }: mkDerivation { pname = "total-map"; - version = "0.1.0"; - sha256 = "0fqgazhs3ppv4ywdxjrhrdzp5z1szgkq4l0lqpbzqwrhi7axgl69"; + version = "0.1.3"; + sha256 = "015bj6g4hjp38fc8bm5z57w6akdgvyab6j2sc666x0qdxgrdwp88"; libraryHaskellDepends = [ base containers semiring-num ]; - description = "Finitely represented /total/ maps"; + description = "Finitely represented total maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -242409,8 +243383,8 @@ self: { }: mkDerivation { pname = "tree-sitter"; - version = "0.5.0.0"; - sha256 = "0gf2mcrrib4id0374hs9mf24g09d4rz7nrrgf92ls7b8279xvjkd"; + version = "0.6.0.0"; + sha256 = "1kdx7axkx34h6jlmpzvmqbabyiqj3yp78bl1qn6aj5c2mql4hi12"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects semantic-source split template-haskell text unordered-containers @@ -242453,26 +243427,35 @@ self: { }) {}; "tree-sitter-java" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, bytestring, pathtype, semantic-source, tasty + , tasty-hunit, template-haskell, text, tree-sitter + , tree-sitter-test-helpers + }: mkDerivation { pname = "tree-sitter-java"; - version = "0.4.0.0"; - sha256 = "0v8mw4slp6rgyw2h3qpqkjqs13kg8dcigq7014dh77h804plk0w7"; + version = "0.5.0.0"; + sha256 = "0rmmsp1alyvc94f61qfha5wm0z2605n9wz3yxaac58bqghsqjx8f"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + libraryHaskellDepends = [ + base semantic-source template-haskell tree-sitter + ]; + testHaskellDepends = [ + base bytestring pathtype tasty tasty-hunit text tree-sitter + tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for Java"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-json" = callPackage ({ mkDerivation, base, template-haskell, text, tree-sitter }: mkDerivation { pname = "tree-sitter-json"; - version = "0.3.0.0"; - sha256 = "09489gikbmddw28ckgf6mg526j43386sdilvb7gzs5x9kc86sd4q"; + version = "0.4.0.0"; + sha256 = "1syd5md8gwxhcfqwvfy4f3rilpn8fr83ib54wa3mmf7165jscwpz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base template-haskell text tree-sitter ]; doHaddock = false; @@ -242498,24 +243481,29 @@ self: { "tree-sitter-python" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hedgehog, semantic-source, template-haskell, tree-sitter + , hedgehog, pathtype, semantic-source, tasty, tasty-hedgehog + , tasty-hunit, template-haskell, text, tree-sitter + , tree-sitter-test-helpers }: mkDerivation { pname = "tree-sitter-python"; - version = "0.6.0.0"; - sha256 = "041qrxdkn19x9h0vcjb0jvc6d0mp6ysdak7i4yqqww683npxjkp1"; + version = "0.7.0.0"; + sha256 = "0s86c4jbfp8dbkkqxdq9k28xphx5vrkf2ss1xzjq88bkzz6q7hqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base directory filepath semantic-source template-haskell tree-sitter ]; - testHaskellDepends = [ base bytestring hedgehog tree-sitter ]; + testHaskellDepends = [ + base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit + text tree-sitter tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for Python"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-ruby" = callPackage ({ mkDerivation, base, template-haskell, tree-sitter }: @@ -244220,6 +245208,8 @@ self: { ]; description = "Haskell twirp foundations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twisty" = callPackage @@ -244362,8 +245352,8 @@ self: { }: mkDerivation { pname = "twitter-types"; - version = "0.9.0"; - sha256 = "0hfm2zdgvpkfn06x140pnnbylmgram3i5zqf62c4yg6khi78m7hg"; + version = "0.10.0"; + sha256 = "0a2wgidg5dk3cxszb0q07cg0sywqgyxl5scswlr91yjvmjmlnkby"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; @@ -244384,8 +245374,8 @@ self: { }: mkDerivation { pname = "twitter-types-lens"; - version = "0.9.0"; - sha256 = "0xp6dwzw0mba4i6vq1sginn7d6ini2c3ig2ss0pn1m0sjwj8x7yq"; + version = "0.10.0"; + sha256 = "1x9w68mr6r6354in9l4vmawk5symvfh2qlhjn2gd30m8b1mzbrjg"; libraryHaskellDepends = [ base lens template-haskell text time twitter-types ]; @@ -245721,8 +246711,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.3.2"; - sha256 = "0k35pw27a3hwg5wqjpfqij0y7rkdlmd85n4kj4ckna4z2v86dl7h"; + version = "0.1.3.3"; + sha256 = "1cnin3dlk6xmvk5cz1sjj88djdv1rq87hvwmhc2dj22hgbs3p3ni"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -246503,12 +247493,16 @@ self: { }) {}; "unexceptionalio" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + }: mkDerivation { pname = "unexceptionalio"; - version = "0.4.0"; - sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p"; + version = "0.5.0"; + sha256 = "04jrmv075cas6qs58m3j0q9h4w14kd4b87bp42k3x3v6hcl62xi9"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; description = "IO without any non-error, synchronous exceptions"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -246518,8 +247512,8 @@ self: { ({ mkDerivation, base, transformers, unexceptionalio }: mkDerivation { pname = "unexceptionalio-trans"; - version = "0.4.0"; - sha256 = "19jzvxx0z4w7d1mp09spiz01sd349376hf5xkg8r2zfr8fx7hj71"; + version = "0.5.0"; + sha256 = "1sd5q97zjk1qkffbhj4rzdrvwwz4q7b6vwrmb6mpkbg7ra4ks49p"; libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; @@ -247506,7 +248500,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_6_0" = callPackage + "universum_1_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -247514,8 +248508,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.6.0"; - sha256 = "12gz4hpwmykb73dplbd8j628f54ipk0pygrswy0k1k7j68awnjl6"; + version = "1.6.1"; + sha256 = "007nh8kw5a2m681bjwvcdjdf69nb768kwdsckj2kdd7406mfgdm7"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -248934,8 +249928,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.3"; - sha256 = "1p1dfbr68bkn09zpy50i1xazvfblds46bs60vra2sqn4hv8vj0s9"; + version = "0.1.3.4"; + sha256 = "149c32v5fa4aqkknqwlamf1r06ki0g0q03nbsc0giaw5qsavf7x1"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -250681,6 +251675,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-algorithms_0_8_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, mwc-random + , primitive, QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.8.0.2"; + sha256 = "05jc15ckdmh4hbwmqax8jyahqslj7c03la1vgz5a5gw0hwspyq34"; + libraryHaskellDepends = [ base bytestring primitive vector ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + benchmarkHaskellDepends = [ base mwc-random vector ]; + description = "Efficient algorithms for vector arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { @@ -255157,8 +256169,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.14.2"; - sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg"; + version = "0.27.14.3"; + sha256 = "1a66m261ilqafbwwgjvalh3rz38qxcwxw9a99wr18lm0ah27lvx4"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -255198,8 +256210,8 @@ self: { }: mkDerivation { pname = "web-routes-happstack"; - version = "0.23.11"; - sha256 = "0jzxcwh3g6y5y4whjbw86y94hfrl73iwnwhhm728l69z5knqry9y"; + version = "0.23.12"; + sha256 = "0p5fa2cdpk6s9n0wa7nllhk1naa3a8a8vx63q6da8ifk6x8jn68a"; libraryHaskellDepends = [ base bytestring happstack-server text web-routes ]; @@ -255265,8 +256277,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.4"; - sha256 = "0r0z39hdxm3ggqq9n71wy0k44gb27zpka4pnmp07855czc4l61ca"; + version = "0.22.6.5"; + sha256 = "1amzab59hhd723clg9skcn5nhwvlw1la1acc9qdbyg302a75s0l9"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -256151,6 +257163,8 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weigh" = callPackage @@ -256646,6 +257660,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; + revision = "1"; + editedCabalFile = "17d44pzi4q5yvrygimdrwdrabz62s1ylw918w28sxgcvj64ir22g"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; @@ -257338,8 +258354,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.7"; - sha256 = "06xz5xk14fiy1z4j6q7lbjwj13m4hy22pzrcdwk6c078w85rp4yd"; + version = "0.1.2.8"; + sha256 = "0ncs3g174db6508fic7x2xibvkccmz068g6hizp8fi20bwxb9js8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258195,10 +259211,8 @@ self: { }: mkDerivation { pname = "wss-client"; - version = "0.2.1.1"; - sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w"; - revision = "1"; - editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702"; + version = "0.3.0.0"; + sha256 = "1licynhnyhfdq4gxpsya3gaypjs9inqzr2xqmjs9f99ymbvin8d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258434,7 +259448,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -259307,6 +260321,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_8_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.8.0"; + sha256 = "1wp2ybkf5z4x87a73yygi3g1nqjy6pfb1wdwyvmjqk64ibjz0p7d"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -260229,7 +261272,7 @@ self: { description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; + }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage @@ -261339,6 +262382,8 @@ self: { ]; description = "YAML parsing combinators for improved validation and error reporting"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaml-config" = callPackage @@ -262595,39 +263640,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , http-client, http-client-tls, http-reverse-proxy, http-types - , network, optparse-applicative, parsec, process, project-template - , resourcet, say, shakespeare, split, stm, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp - , warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0.3"; - sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; - revision = "4"; - editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory - file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types network optparse-applicative parsec - process project-template resourcet say shakespeare split stm - streaming-commons tar template-haskell text time transformers - transformers-compat unix-compat unliftio unordered-containers wai - wai-extra warp warp-tls yaml zlib - ]; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-bin_1_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath , fsnotify, http-client, http-client-tls, http-reverse-proxy @@ -262652,7 +263664,6 @@ self: { ]; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -264123,8 +265134,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.7"; - sha256 = "1x7fmp1q3zn15av6rhdddnilkb54xmkpb6pkfzfpjm3vff27i7jj"; + version = "1.6.8"; + sha256 = "1c8xana3lf79db17mc74q88ygdskhyhvrv325fpwdw00fcwc0fn6"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -265066,8 +266077,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.7.0.1"; - sha256 = "1cmdx2bghp508qm26xydnljswgldvvv5rapmzcivmnn8pzp9g9kl"; + version = "0.7.1"; + sha256 = "0clvfkdrmw7lmrcyn8cilgf0k7438c384vwvjx256pyl46y3ym5m"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -265887,6 +266898,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "zinza" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-golden, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "zinza"; + version = "0.1"; + sha256 = "0p7m15qkp7lsdhckkj2xz7ck54kkaz8pw0gz9dddll57mqjyy6zk"; + libraryHaskellDepends = [ + base containers parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers tasty tasty-golden tasty-hunit + ]; + description = "Typed templates with jinja like syntax"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "zip" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 8b667a1e66931..c292eeec128ff 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -13,4 +13,7 @@ self: super: { # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + # spago is not released to Hackage. + # https://github.com/spacchetti/spago/issues/512 + spago = self.callPackage ../tools/purescript/spago { }; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 3f1c21cc88199..9a1594da933db 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, ncurses, openssl, perl, autoconf , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport -, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , withSystemd ? stdenv.isLinux, systemd # systemd support in epmd }: @@ -18,7 +18,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] -, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] +, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" @@ -32,7 +32,7 @@ assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else libGLU_combined != null && wxGTK != null && xorg != null); + else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 883d53c82697e..f763274c15d74 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, - ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile, + ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype - libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2 + libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl pkgconfig glfw openssl libpthreadstubs libXdmcp libmemcached python3 diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 91b4c0b9a9e62..09d7fa622fc11 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -5,35 +5,53 @@ let in stdenv.mkDerivation rec { pname = "jimtcl"; - version = "0.78"; + version = "0.79"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = version; - sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j"; + sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h"; }; - buildInputs = [ - sqlite readline asciidoc SDL SDL_gfx + nativeBuildInputs = [ + asciidoc ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; + buildInputs = [ + sqlite readline SDL SDL_gfx + ]; configureFlags = [ + "--shared" "--with-ext=oo" "--with-ext=tree" "--with-ext=binary" "--with-ext=sqlite3" "--with-ext=readline" "--with-ext=sdl" + "--with-ext=json" "--enable-utf8" "--ipv6" ]; + NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; + + enableParallelBuilding = true; + + doCheck = true; + preCheck = '' + # test exec2-3.2 fails depending on platform or sandboxing (?) + rm tests/exec2.test + ''; + + postInstall = '' + ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so + ''; + meta = { description = "An open source small-footprint implementation of the Tcl programming language"; - homepage = http://jim.tcl.tk/; + homepage = "http://jim.tcl.tk/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 7e90c6dfb2872..6a3aa9f648f48 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 7f39259c298e7..3bf8aee0d07b2 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, libGLU_combined, openal, lua +, SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg , libmng @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL libGLU_combined openal lua + SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng ]; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 792fe299e4dda..57c1a6ce5641a 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, libGLU_combined, openal, lua +, SDL, libGLU, libGL, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL libGLU_combined openal lua + SDL libGLU libGL openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index f1571dc726c01..a2182f4543616 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL2, libGLU_combined, openal, luajit +, SDL2, libGLU, libGL, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 libGLU_combined openal luajit + SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 6f3f7161a0b8d..0a60a4cacfe73 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 5a241fbf83eec..a8db08e87a2cd 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU_combined, SDL +{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 libSM xorgproto indent readline gsl freeglut libGLU_combined SDL blas libbfd + libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd intltool gettext zlib ]; diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 82b2aac39a9fe..7e0580ce063d8 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -229,6 +229,8 @@ def _determine_extension(text, fetcher): raise ValueError("Don't know how to update a Flit package.") elif src_format == 'other': raise ValueError("Don't know how to update a format='other' package.") + elif src_format == 'pyproject': + raise ValueError("Don't know how to update a pyproject package.") extension = FORMATS[src_format] elif fetcher == 'fetchurl': diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 42c68ed7e8005..759a44b5760fc 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, pkgconfig, SDL2 -, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib +, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python cython wrapPython tkinter - SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib + SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); buildPhase = '' diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index 94b36b855f25f..1ae6346cbe581 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, xorg, libGLU_combined }: +{ stdenv, fetchurl, unzip, xorg, libGLU, libGL }: stdenv.mkDerivation { name = "AntTweakBar-1.16"; - buildInputs = [ unzip xorg.libX11 libGLU_combined ]; + buildInputs = [ unzip xorg.libX11 libGLU libGL ]; src = fetchurl { url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index b267c62d6c706..5f5368f2866dd 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU_combined, libjpeg, flac +, libXxf86vm, openal, libGLU, libGL, libjpeg, flac , libXi, libXfixes, freetype, libopus, libtheora , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - libXxf86vm openal libGLU_combined + libXxf86vm openal libGLU libGL libjpeg flac libXi libXfixes enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 6b44ec1b598a4..64488b25b094b 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU_combined }: +, libXxf86vm, openal, libGLU, libGL }: stdenv.mkDerivation rec { pname = "allegro"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - libXxf86vm openal libGLU_combined + libXxf86vm openal libGLU libGL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 6e2db870068eb..21e93a8cd4922 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig , cudatoolkit, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl -, blas, openblas, boost, mesa, libGLU_combined +, blas, openblas, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas , doxygen, buildDocs ? false }: @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { opencl-clhpp fftw fftwFloat mkl openblas - libGLU_combined + libGLU libGL mesa freeimage boost.out boost.dev ] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ]) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 5c3c6272f83d8..ad0f910dcbf6c 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -15,26 +15,20 @@ let in stdenv.mkDerivation rec { - name = "aspell-0.60.6.1"; + name = "aspell-0.60.8"; src = fetchurl { url = "mirror://gnu/aspell/${name}.tar.gz"; - sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; + sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; - patches = [ - (fetchpatch { # remove in >= 0.60.7 - name = "gcc-7.patch"; - url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff"; - sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix"; - }) - ] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} ''; - nativeBuildInputs = [ perl ]; + buildInputs = [ perl ]; doCheck = true; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 328ac434d85af..d4b4c33f35b5a 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xorgproto +{ stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto , libXi, pkgconfig }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake libGLU_combined freeglut libX11 xorgproto libXi + unzip cmake libGLU libGL freeglut libX11 xorgproto libXi ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 1b6c56f13afd4..5b4e37eff9f60 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut +{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut , Cocoa, OpenGL }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 8b0901832d11e..34a9ee3b6ee87 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut +{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut , Cocoa, OpenGL }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 82570fbf7b40b..d2e52638d0719 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,7 +5,7 @@ , xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) -, libGL ? null # libGLU_combined is no longer a big dependency +, libGL ? null # libGLU libGL is no longer a big dependency , pdfSupport ? true , darwin }: diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 76f722f31aa7a..5dd9917bc52bb 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xorgproto +{ stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto , libXi, libXmu }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut libGLU_combined glfw2 glew libX11 xorgproto libXi libXmu ]; + [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 9ab112dac127c..0a9fa64afe378 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -104,7 +104,7 @@ #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering -, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering +, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null @@ -234,7 +234,7 @@ assert gnutls != null -> !opensslExtlib; assert libxcbshmExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> libGLU_combined != null; +assert openglExtlib -> libGL != null && libGLU != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { @@ -424,7 +424,7 @@ stdenv.mkDerivation rec { libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib - ] ++ optional openglExtlib libGLU_combined + ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index ccdf4662719a5..ba59b0c16e6ff 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,7 +2,7 @@ , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d -, openglSupport ? false, libGLU_combined ? null +, openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null , libaomSupport ? false, libaom ? null # Build options @@ -63,7 +63,7 @@ let vpxSupport = reqMin "0.6" && !isAarch32; in -assert openglSupport -> libGLU_combined != null; +assert openglSupport -> libGL != null && libGLU != null; assert libmfxSupport -> intel-media-sdk != null; assert libaomSupport -> libaom != null; @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers - ] ++ optional openglSupport libGLU_combined + ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional vpxSupport libaom ++ optional vpxSupport libvpx diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 183f0c2bb70cf..1fe50b402cb64 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi -, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng +, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng , libtiff, freetype, Cocoa, AGL, GLUT }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ] + buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] ++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; propagatedBuildInputs = [ xorgproto ] diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix index e6e002f16c5a0..83630aef9aa80 100644 --- a/pkgs/development/libraries/forge/default.nix +++ b/pkgs/development/libraries/forge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , arrayfire, expat, fontconfig, freeimage, freetype, boost -, mesa, libGLU_combined, glfw3, SDL2, cudatoolkit +, mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { boost.dev freeimage mesa - libGLU_combined + libGLU libGL glfw3 SDL2 cudatoolkit diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index af387b7232f41..bb59a34b1cc79 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor -, libXrandr, libGLU_combined, libXft, libXfixes, xinput +, libXrandr, libGLU, libGL, libXft, libXfixes, xinput , CoreServices }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr - libXft libGLU_combined libXfixes xinput + libXft libGLU libGL libXfixes xinput ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; doCheck = true; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 41480789a08af..9520542481c80 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6"; }; - buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ] + buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 859258f595650..3b0b30f573b52 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation rec { sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-18397.patch"; + url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch"; + sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8"; + }) + ]; + postPatch = '' patchShebangs test ''; diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index c8c0b8c6800c4..b154f80c1dd26 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , libyaml , swig +, eigen , pkgconfig , wafHook , makeWrapper @@ -19,13 +20,13 @@ assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { pname = "gaia"; - version = "2.4.5"; + version = "2.4.6"; src = fetchFromGitHub { owner = "MTG"; repo = "gaia"; rev = "v${version}"; - sha256 = "12jxb354s2dblr2ghnl3w05m23jgzvrrgywfj8jaa32j3gw48fv2"; + sha256 = "03vmdq7ca4f7zp2f4sxyqa8sdpdma3mn9fz4z7d93qryl0bhi7z3"; }; # Fix installation error when waf tries to put files in /etc/ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { buildInputs = [ libyaml + eigen qt4 ]; diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 757fa9de6f344..8ac42375bf924 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl +{ stdenv +, fetchurl , freeglut , libGL , libGLU diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 735ab4e6e18e2..22815c956472e 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,16 +1,40 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext +{ stdenv +, fetchurl +, meson +, ninja +, gettext , config -, pkgconfig, python3, gst-plugins-base, orc +, pkgconfig +, python3 +, gst-plugins-base +, orc , gobject-introspection , enableZbar ? true -, faacSupport ? false, faac ? null -, faad2, libass, libkate, libmms, librdf, ladspaH -, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom -, libbs2b, libmodplug, mpeg2dec -, openjpeg, libopus, librsvg +, faacSupport ? false +, faac ? null +, faad2 +, libass +, libkate +, libmms +, librdf +, ladspaH +, libnice +, webrtc-audio-processing +, lilv +, lv2 +, serd +, sord +, sratom +, libbs2b +, libmodplug +, mpeg2dec +, openjpeg +, libopus +, librsvg , bluez , chromaprint , curl +, darwin , directfb , fdk_aac , flite @@ -27,7 +51,7 @@ , libusb1 , neon , openal -, opencv3 +, opencv4 , openexr , openh264 , pango @@ -38,10 +62,21 @@ , srtp , zbar , wayland-protocols -, wildmidi, fluidsynth, libvdpau, wayland -, libwebp, xvidcore, gnutls, mjpegtools -, libGLU_combined, libintl, libgme -, openssl, x265, libxml2 +, wildmidi +, fluidsynth +, libvdpau +, wayland +, libwebp +, xvidcore +, gnutls +, mjpegtools +, libGLU +, libGL +, libintl +, libgme +, openssl +, x265 +, libxml2 , srt }: @@ -49,113 +84,128 @@ assert faacSupport -> faac != null; let inherit (stdenv.lib) optional optionals; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.16.0"; + version = "1.16.1"; - meta = with stdenv.lib; { - description = "Gstreamer Bad Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a set of plug-ins that aren't up to par compared to the - rest. They might be close to being good quality, but they're missing - something - be it a good code review, some documentation, a set of tests, - a real live maintainer, or some actual wide use. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; - preConfigure = '' - patchShebangs . - ''; + src = fetchurl { + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n"; + }; patches = [ ./fix_pkgconfig_includedir.patch - # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/99790eaad9083cce5ab2b1646489e1a1c0faad1e.patch"; - sha256 = "11bqy4sl05qq5mj4bx5s09rq106s3j0vnpjl4np058im32j69lr3"; - }) - # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/1872da81c48d3a719bd39955fd97deac7d037d74.patch"; - sha256 = "11zwrr5ggflmvr0qfssj7dmhgd3ybiadmy79b4zh24022zgw3xpz"; - }) ]; - src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz"; - sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"; - }; - - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ - meson ninja pkgconfig python3 gettext gobject-introspection - ] - ++ optionals stdenv.isLinux [ + meson + ninja + pkgconfig + python3 + gettext + gobject-introspection + ] ++ optionals stdenv.isLinux [ wayland-protocols ]; buildInputs = [ - gst-plugins-base orc - faad2 libass libkate libmms - libnice webrtc-audio-processing # webrtc + gst-plugins-base + orc + faad2 + libass + libkate + libmms + webrtc-audio-processing # webrtc libbs2b - ladspaH librdf # ladspa plug-in - lilv lv2 serd sord sratom # lv2 plug-in - libmodplug mpeg2dec - openjpeg libopus librsvg - bluez - chromaprint + libmodplug + mpeg2dec + openjpeg + libopus + librsvg curl.dev - directfb fdk_aac - flite gsm libaom libdc1394 libde265 - libdrm libdvdnav libdvdread - libgudev - libofa libsndfile libusb1 + mjpegtools neon openal - opencv3 + opencv4 openexr openh264 rtmpdump pango - sbc soundtouch - spandsp srtp - fluidsynth libvdpau - libwebp xvidcore gnutls libGLU_combined - libgme openssl x265 libxml2 + fluidsynth + libvdpau + libwebp + xvidcore + gnutls + libGL + libGLU + libgme + openssl + x265 + libxml2 libintl srt - ] - ++ optional enableZbar zbar - ++ optional faacSupport faac - ++ optional stdenv.isLinux wayland + ] ++ optionals enableZbar [ + zbar + ] ++ optionals faacSupport [ + faac + ] ++ optionals stdenv.isLinux [ + bluez + wayland + ] ++ optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - ++ optional (!stdenv.isDarwin) wildmidi + wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin - ++ optional (!stdenv.isDarwin) mjpegtools; + mjpegtools - mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + chromaprint + directfb + flite + libdrm + libgudev + libnice + libofa + librdf + sbc + spandsp + + # ladspa plug-in + ladspaH + librdf # TODO: make build on Darwin + # lv2 plug-in + lilv + lv2 + serd + sord + sratom + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + # For unknown reasons the order is important, e.g. if + # VideoToolbox is last, we get: + # fatal error: 'VideoToolbox/VideoToolbox.h' file not found + VideoToolbox + AudioToolbox + AVFoundation + CoreMedia + CoreVideo + Foundation + MediaToolbox + ]); + + mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" @@ -191,10 +241,50 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/issues/54395 "-Dnvdec=disabled" "-Dnvenc=disabled" + ] + ++ optionals stdenv.isDarwin [ + "-Dbluez=disabled" + "-Dchromaprint=disabled" + "-Ddirectfb=disabled" + "-Dflite=disabled" + "-Dkms=disabled" # renders to libdrm output + "-Dofa=disabled" + "-Dlv2=disabled" + "-Dsbc=disabled" + "-Dspandsp=disabled" + "-Ddvb=disabled" + "-Dfbdev=disabled" + "-Duvch264=disabled" # requires gudev + "-Dladspa=disabled" # requires lrdf + "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs + "-Dwildmidi=disabled" # see dependencies above + ] ++ optionals (!gst-plugins-base.glEnabled) [ + "-Dgl=disabled"] + ++ optionals (!gst-plugins-base.waylandEnabled) [ + "-Dwayland=disabled" + ] ++ optionals (!gst-plugins-base.glEnabled) [ + # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, + # but its meson build system does not declare the dependency. + "-Dapplemedia=disabled" ]; - enableParallelBuilding = true; + # This package has some `_("string literal")` string formats + # that trip up clang with format security enabled. + hardeningDisable = [ "format" ]; doCheck = false; # fails 20 out of 58 tests, expensive + meta = with stdenv.lib; { + description = "GStreamer Bad Plugins"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that aren't up to par compared to the + rest. They might be close to being good quality, but they're missing + something - be it a good code review, some documentation, a set of tests, + a real live maintainer, or some actual wide use. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 81d914581321f..d38199cf7873e 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,100 +1,153 @@ -{ stdenv, fetchurl, fetchpatch, lib -, pkgconfig, meson, ninja, gettext, gobject-introspection -, python3, gstreamer, orc, pango, libtheora -, libintl, libopus +{ stdenv +, fetchurl +, lib +, pkgconfig +, meson +, ninja +, gettext +, gobject-introspection +, python3 +, gstreamer +, orc +, pango +, libtheora +, libintl +, libopus , isocodes , libjpeg +, libpng , libvisual , tremor # provides 'virbisidec' , libGL -, gtk-doc, docbook_xsl, docbook_xml_dtd_412 -, enableX11 ? stdenv.isLinux, libXv -, enableWayland ? stdenv.isLinux, wayland -, enableAlsa ? stdenv.isLinux, alsaLib -, enableCocoa ? false, darwin -, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, enableX11 ? stdenv.isLinux +, libXv +, enableWayland ? stdenv.isLinux +, wayland +, enableAlsa ? stdenv.isLinux +, alsaLib +# Enabling Cocoa seems to currently not work, giving compile +# errors. Suspected is that a newer version than clang +# is needed than 5.0 but it is not clear. +, enableCocoa ? false +, darwin +, enableGl ? (enableX11 || enableWayland || enableCocoa) +, enableCdparanoia ? (!stdenv.isDarwin) +, cdparanoia +}: stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.16.0"; + version = "1.16.1"; - meta = with lib; { - description = "Base plugins and helper libraries"; - homepage = https://gstreamer.freedesktop.org; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz"; - sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w"; }; - outputs = [ "out" "dev" ]; + patches = [ + ./fix_pkgconfig_includedir.patch + ]; nativeBuildInputs = [ - pkgconfig python3 gettext gobject-introspection + meson + ninja + pkgconfig + python3 + gettext + gobject-introspection + + # docs gtk-doc - # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` - docbook_xsl docbook_xml_dtd_412 - ] - # Broken meson with Darwin. Should hopefully be fixed soon. Tracking - # in https://bugzilla.gnome.org/show_bug.cgi?id=781148. - ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ]; + docbook_xsl + docbook_xml_dtd_43 + ]; - # On Darwin, we currently use autoconf, on all other systems Meson - # TODO Switch to Meson on Darwin as well + buildInputs = [ + orc + libtheora + libintl + libopus + isocodes + libpng + libjpeg + tremor + libGL + ] ++ lib.optional (!stdenv.isDarwin) [ + libvisual + ] ++ lib.optionals stdenv.isDarwin [ + pango + darwin.apple_sdk.frameworks.OpenGL + ] ++ lib.optional enableAlsa alsaLib + ++ lib.optionals enableX11 [ libXv pango ] + ++ lib.optional enableWayland wayland + ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa + ++ lib.optional enableCdparanoia cdparanoia; - # TODO How to pass these to Meson? - configureFlags = lib.optionals stdenv.isDarwin [ - "--enable-x11=${if enableX11 then "yes" else "no"}" - "--enable-wayland=${if enableWayland then "yes" else "no"}" - "--enable-cocoa=${if enableCocoa then "yes" else "no"}" - ] - # Introspection fails on my MacBook currently - ++ lib.optional stdenv.isDarwin "--disable-introspection"; + propagatedBuildInputs = [ + gstreamer + ]; - mesonFlags = lib.optionals (!stdenv.isDarwin) [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing + "-Dgl_platform=[${lib.optionalString (enableX11 || enableWayland || enableCocoa) "auto"}]" # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=[${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}]" # We must currently disable gtk_doc API docs generation, # because it is not compatible with some features being disabled. # See for example - # https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/38 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564 # for it failing because some Wayland symbols are missing. # This problem appeared between 1.15.1 and 1.16.0. + # In 1.18 they should switch to hotdoc, which should make this issue irrelevant. "-Dgtk_doc=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? + ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ; - - buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ] - ++ lib.optional (!stdenv.isDarwin) libvisual - ++ lib.optional enableAlsa alsaLib - ++ lib.optionals enableX11 [ libXv pango ] - ++ lib.optional enableWayland wayland - ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa - ++ lib.optional enableCdparanoia cdparanoia; - - propagatedBuildInputs = [ gstreamer ]; + ++ lib.optionals stdenv.isDarwin [ + "-Dlibvisual=disabled" + ]; postPatch = '' - patchShebangs . + patchShebangs common/scangobj-merge.py ''; - enableParallelBuilding = true; + # This package has some `_("string literal")` string formats + # that trip up clang with format security enabled. + hardeningDisable = [ "format" ]; doCheck = false; # fails, wants DRI access for OpenGL - patches = [ - ./fix_pkgconfig_includedir.patch - ]; + passthru = { + # Downstream `gst-*` packages depending on `gst-plugins-base` + # have meson build options like 'gl' etc. that depend + # on these features being built in `-base`. + # If they are not built here, then the downstream builds + # will fail, as they, too, use `-Dauto_features=enabled` + # which would enable these options unconditionally. + # That means we must communicate to these downstream packages + # if the `-base` enabled these options or not, so that + # the can enable/disable those features accordingly. + # The naming `*Enabled` vs `enable*` is intentional to + # distinguish inputs from outputs (what is to be built + # vs what was built) and to make them easier to search for. + glEnabled = enableGl; + waylandEnabled = enableWayland; + }; + + meta = with lib; { + description = "Base GStreamer plug-ins and helper libraries"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index f0f01a977fd11..bbef017831236 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,10 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja -, pkgconfig, gettext, gobject-introspection -, bison, flex, python3, glib, makeWrapper -, libcap,libunwind, darwin +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, gettext +, gobject-introspection +, bison +, flex +, python3 +, glib +, makeWrapper +, libcap +, libunwind +, darwin , elfutils # for libdw , bash-completion -, docbook_xsl, docbook_xml_dtd_412 +, docbook_xsl +, docbook_xml_dtd_43 , gtk-doc , lib , CoreServices @@ -12,50 +25,66 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.16.0"; + version = "1.16.1"; - meta = with lib ;{ - description = "Open source multimedia framework"; - homepage = https://gstreamer.freedesktop.org; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ttuegel matthewbauer ]; - }; + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz"; - sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882"; }; patches = [ ./fix_pkgconfig_includedir.patch ]; - outputs = [ "out" "dev" ]; - outputBin = "dev"; - nativeBuildInputs = [ - meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection + meson + ninja + pkgconfig + gettext + bison + flex + python3 + makeWrapper + gobject-introspection bash-completion + + # documentation gtk-doc - # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` - docbook_xsl docbook_xml_dtd_412 + docbook_xsl + docbook_xml_dtd_43 ]; - buildInputs = - lib.optionals stdenv.isLinux [ libcap libunwind elfutils ] - ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optionals stdenv.isLinux [ + libcap + libunwind + elfutils + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; - propagatedBuildInputs = [ glib ]; + propagatedBuildInputs = [ + glib + ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - ] + ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. - ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; + "-Dlibunwind=disabled" + "-Dlibdw=disabled" + ]; + + postPatch = '' + patchShebangs \ + gst/parse/get_flex_version.py \ + gst/parse/gen_grammar.py.in \ + gst/parse/gen_lex.py.in \ + libs/gst/helpers/ptp_helper_post_install.sh + ''; postInstall = '' for prog in "$dev/bin/"*; do @@ -64,21 +93,17 @@ stdenv.mkDerivation rec { done ''; - preConfigure= - # These files are not executable upstream, so we need to - # make them executable for `patchShebangs` to pick them up. - # Can be removed when this is merged and available: - # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/141 - '' - chmod +x gst/parse/get_flex_version.py - '' + - '' - patchShebangs . - ''; - preFixup = '' moveToOutput "share/bash-completion" "$dev" ''; setupHook = ./setup-hook.sh; + + meta = with lib ;{ + description = "Open source multimedia framework"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ttuegel matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 810cee650ca89..d62af71d3aea0 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,39 +1,66 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja -, pkgconfig, python, gst-plugins-base, libxml2 -, flex, perl, gettext, gobject-introspection +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, python +, gst-plugins-base +, libxml2 +, flex +, perl +, gettext +, gobject-introspection }: stdenv.mkDerivation rec { pname = "gstreamer-editing-services"; - version = "1.16.0"; + version = "1.16.1"; - meta = with stdenv.lib; { - description = "Library for creation of audio/video non-linear editors"; - homepage = "https://gstreamer.freedesktop.org"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz"; - sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "10375z5mc3bwfs07mhmfx943sbp55z8m8ihp9xpcknkdks7qg168"; }; - outputs = [ "out" "dev" ]; + patches = [ + ./fix_pkgconfig_includedir.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + gobject-introspection + python + flex + perl + ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection python flex perl ]; + buildInputs = [ + libxml2 + ]; - propagatedBuildInputs = [ gst-plugins-base libxml2 ]; + propagatedBuildInputs = [ + gst-plugins-base + ]; mesonFlags = [ "-Dgtk_doc=disabled" ]; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - postPatch = '' + # for some reason, gst-plugins-bad cannot be found + # fortunately, they are only used by tests, which we do not run sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build ''; + + meta = with stdenv.lib; { + description = "Library for creation of audio/video non-linear editors"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c801684b0659a..9fa94a02f88ad 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,14 +1,37 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, python -, gst-plugins-base, orc, bzip2, gettext -, libv4l, libdv, libavc1394, libiec61883 -, libvpx, speex, flac, taglib, libshout -, cairo, gdk-pixbuf, aalib, libcaca -, libsoup, libpulseaudio, libintl -, darwin, lame, mpg123, twolame +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, python +, gst-plugins-base +, orc +, bzip2 +, gettext +, libv4l +, libdv +, libavc1394 +, libiec61883 +, libvpx +, speex +, flac +, taglib +, libshout +, cairo +, gdk-pixbuf +, aalib +, libcaca +, libsoup +, libpulseaudio +, libintl +, darwin +, lame +, mpg123 +, twolame , gtkSupport ? false, gtk3 ? null -# As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. -# In the fuure we should probably split `ffado`. -, enableJack ? false + # As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. + # In the future we should probably split `ffado`. +, enableJack ? false, jack2 , libXdamage , libXext , libXfixes @@ -16,49 +39,53 @@ , xorg , libgudev , wavpack -, jack2 }: assert gtkSupport -> gtk3 != null; let - inherit (stdenv.lib) optional optionals; + inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.16.0"; + version = "1.16.1"; - meta = with stdenv.lib; { - description = "Gstreamer Good Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a set of plug-ins that we consider to have good quality code, - correct functionality, our preferred license (LGPL for the plug-in - code, LGPL or LGPL-compatible for the supporting library). - ''; - license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz"; - sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz"; }; - outputs = [ "out" "dev" ]; - patches = [ ./fix_pkgconfig_includedir.patch ]; - nativeBuildInputs = [ pkgconfig python meson ninja gettext ]; - - NIX_LDFLAGS = "-lncurses"; + nativeBuildInputs = [ + pkgconfig + python + meson + ninja + gettext + ]; buildInputs = [ - gst-plugins-base orc bzip2 - libdv libvpx speex flac taglib - cairo gdk-pixbuf aalib libcaca - libsoup libshout lame mpg123 twolame libintl + gst-plugins-base + orc + bzip2 + libdv + libvpx + speex + flac + taglib + cairo + gdk-pixbuf + aalib + libcaca + libsoup + libshout + lame + mpg123 + twolame + libintl libXdamage libXext libXfixes @@ -66,29 +93,59 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack - ] - ++ optional gtkSupport gtk3 # for gtksink - ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ] - ++ optionals (stdenv.isLinux && enableJack) [ + ] ++ optionals gtkSupport [ + # for gtksink + gtk3 + ] ++ optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ] ++ optionals stdenv.isLinux [ + libv4l + libpulseaudio + libavc1394 + libiec61883 + libgudev + ] ++ optionals (stdenv.isLinux && enableJack) [ jack2 ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps - ] - ++ optional (!gtkSupport) "-Dgtk3=disabled" - ++ optionals (!stdenv.isLinux || !enableJack) [ + ] ++ optionals (!gtkSupport) [ + "-Dgtk3=disabled" + ] ++ optionals (!stdenv.isLinux || !enableJack) [ "-Djack=disabled" # unclear whether Jack works on Darwin - ] - ++ optionals (!stdenv.isLinux) [ - "-Dv4l2-gudev=disabled" + ] ++ optionals (!stdenv.isLinux) [ + "-Ddv1394=disabled" # Linux only + "-Doss4=disabled" # Linux only + "-Doss=disabled" # Linux only + "-Dpulse=disabled" # TODO check if we can keep this enabled + "-Dv4l2-gudev=disabled" # Linux-only + "-Dv4l2=disabled" # Linux-only + "-Dximagesrc=disabled" # Linux-only + "-Dpulse=disabled" # TODO check if we can keep this enabled + ]; + + + NIX_LDFLAGS = [ + # linking error on Darwin + # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553694896 + "-lncurses" ]; # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; + meta = with stdenv.lib; { + description = "GStreamer Good Plugins"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that we consider to have good quality code, + correct functionality, our preferred license (LGPL for the plug-in + code, LGPL or LGPL-compatible for the supporting library). + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 1847b8d0c12be..5319de255e7f5 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -1,43 +1,46 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig -, python, yasm, gst-plugins-base, orc, bzip2 -, gettext, withSystemLibav ? true, libav ? null +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkgconfig +, python3 +, gst-plugins-base +, gettext +, libav }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See # https://gstreamer.freedesktop.org/releases/1.6/ for more info. -assert withSystemLibav -> libav != null; - stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.16.0"; - - meta = { - homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz"; - sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = with stdenv.lib; - [ meson ninja gettext pkgconfig python ] - ++ optional (!withSystemLibav) yasm - ; - - buildInputs = with stdenv.lib; - [ gst-plugins-base orc bzip2 ] - ++ optional withSystemLibav libav - ; + nativeBuildInputs = [ + meson + ninja + gettext + pkgconfig + python3 + ]; - mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + buildInputs = [ + gst-plugins-base + libav ]; + meta = with lib; { + description = "FFmpeg/libav plugin for GStreamer"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 5c571fa4a1e74..e602a96291e26 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,38 +1,50 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig -, gettext, gobject-introspection +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gobject-introspection , gst-plugins-base , gst-plugins-bad }: stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.16.0"; - - meta = with stdenv.lib; { - description = "Gstreamer RTSP server"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a library on top of GStreamer for building an RTSP server. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bkchr ]; - }; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz"; - sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0i01f1nr0921z6z4nrh8icz76s2n7i228aqxg1ihvxl65ynsraxh"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ]; + nativeBuildInputs = [ + meson + ninja + gettext + gobject-introspection + pkgconfig + ]; - buildInputs = [ gst-plugins-base gst-plugins-bad ]; + buildInputs = [ + gst-plugins-base + gst-plugins-bad + ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; + + meta = with stdenv.lib; { + description = "GStreamer RTSP server"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + A library on top of GStreamer for building an RTSP server. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bkchr ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 552ab1ec29218..a117190a9e10e 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,53 +1,76 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, python -, gst-plugins-base, orc, gettext -, a52dec, libcdio, libdvdread -, libmad, libmpeg2, x264, libintl, lib +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, python +, gst-plugins-base +, orc +, gettext +, a52dec +, libcdio +, libdvdread +, libmad +, libmpeg2 +, x264 +, libintl +, lib , opencore-amr , darwin }: stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.16.0"; + version = "1.16.1"; - meta = with lib; { - description = "Gstreamer Ugly Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a set of plug-ins that have good quality and correct functionality, - but distributing them might pose problems. The license on either - the plug-ins or the supporting libraries might not be how we'd - like. The code might be widely known to present patent problems. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz"; - sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab"; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja gettext pkgconfig python ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkgconfig + python + ]; buildInputs = [ - gst-plugins-base orc - a52dec libcdio libdvdread - libmad libmpeg2 x264 + gst-plugins-base + orc + a52dec + libcdio + libdvdread + libmad + libmpeg2 + x264 libintl opencore-amr - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; - [ IOKit CoreFoundation DiskArbitration ]); + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + IOKit + CoreFoundation + DiskArbitration + ]); mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing ]; - NIX_LDFLAGS = [ "-lm" ]; + meta = with lib; { + description = "Gstreamer Ugly Plugins"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that have good quality and correct functionality, + but distributing them might pose problems. The license on either + the plug-ins or the supporting libraries might not be how we'd + like. The code might be widely known to present patent problems. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index adb495689e33c..0b47ef2244c67 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,49 +1,72 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm -, libvpx, python, fetchpatch +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gst-plugins-base +, bzip2 +, libva +, wayland +, libdrm +, udev +, xorg +, libGLU +, libGL +, gstreamer +, gst-plugins-bad +, nasm +, libvpx +, python }: stdenv.mkDerivation rec { - pname = "gst-vaapi"; - version = "1.16.0"; + pname = "gstreamer-vaapi"; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0fk0nymvbfc04fv63fj2r6q9vvi431svhkrwpr7kdjvq3rphymyb"; }; - patches = [ - # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html - # Note that the patch has now been actually accepted upstream. - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch"; - sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb"; - }) - ]; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig bzip2 ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + bzip2 + ]; buildInputs = [ - gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev - xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM - xorg.libICE libGLU_combined nasm libvpx python + gstreamer + gst-plugins-base + gst-plugins-bad + libva + wayland + libdrm + udev + xorg.libX11 + xorg.libXext + xorg.libXv + xorg.libXrandr + xorg.libSM + xorg.libICE + libGL + libGLU + nasm + libvpx + python ]; - preConfigure = '' - export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 - mkdir -p $GST_PLUGIN_PATH_1_0 - ''; - mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; - meta = { - homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + meta = with stdenv.lib; { + description = "Set of VAAPI GStreamer Plug-ins"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index ad013d1570e1a..ad424641b8111 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,39 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobject-introspection, json-glib +{ stdenv +, fetchurl +, pkgconfig +, gstreamer +, gst-plugins-base +, python +, gobject-introspection +, json-glib }: stdenv.mkDerivation rec { pname = "gst-validate"; - version = "1.16.0"; - - meta = { - description = "Integration testing infrastructure for the GStreamer framework"; - homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz"; - sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1698arvmpb0cvyi8ll1brvs51vs7i3f3fw19iswh8xhj5adrn1vz"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig gobject-introspection + pkgconfig + gobject-introspection ]; buildInputs = [ - python json-glib + python + json-glib ]; - propagatedBuildInputs = [ gstreamer gst-plugins-base ]; - - enableParallelBuilding = true; - - mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + propagatedBuildInputs = [ + gstreamer + gst-plugins-base ]; + + meta = with stdenv.lib; { + description = "Integration testing infrastructure for the GStreamer framework"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 35ef14cbc1352..788772888c6d3 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libGLU_combined, unzip, libXrandr, libX11, libXxf86vm }: +{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip libGLU_combined libXrandr libX11 libXxf86vm ]; + buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { homepage = http://irrlicht.sourceforge.net/; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index a93d77742915f..6eb5a1f535530 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 -, libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg +, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg , pango, gdk-pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 630b17121587e..c0a43efc27eac 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined +, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { "--enable-nls=yes" "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" - "--with-gl=${libGLU_combined}" + "--with-gl=${libGL}" "--with-mysql=${libmysqlclient}" "--with-manpages=yes" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig libtool gettext ]; buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc + bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7f3a2678da5da..e9fccaf28abf8 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,7 +1,7 @@ # TODO: Resolve the issues with the Mono bindings. -{ stdenv, fetchurl, fetchpatch, lib, file -, pkgconfig, autoconf +{ stdenv, fetchurl, fetchpatch, lib +, pkgconfig, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; }; - nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ]; propagatedBuildInputs = if gtkVersion == "2" @@ -46,14 +46,6 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' - autoconf - for f in {configure,ltmain.sh,m4/libtool.m4}; do - substituteInPlace $f \ - --replace /usr/bin/file ${file}/bin/file - done - ''; - configureFlags = [ "CFLAGS=-Wno-error" "--sysconfdir=/etc" @@ -61,11 +53,6 @@ stdenv.mkDerivation rec { "--with-gtk=${gtkVersion}" ]; - postConfigure = '' - substituteInPlace configure \ - --replace /usr/bin/file ${file}/bin/file - ''; - doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix index fd5ee8dcaaf96..0ffb208596770 100644 --- a/pkgs/development/libraries/libcerf/default.nix +++ b/pkgs/development/libraries/libcerf/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, cmake, perl }: -stdenv.mkDerivation { - name = "libcerf-1.5"; +stdenv.mkDerivation rec { + pname = "libcerf"; + version = "1.13"; src = fetchurl { - url = "http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz"; - sha256 = "11jwr8ql4a9kmv04ycgwk4dsqnlv4l65a8aa0x1i3y7zwx3w2vg3"; + url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; + sha256 = "01d3fr4qa0080xdgp66mjbsa884qivn9y83p7rdyz2l3my0rysg4"; }; + nativeBuildInputs = [ cmake perl ]; + meta = with lib; { description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; - homepage = http://apps.jcns.fz-juelich.de/doku/sc/libcerf; + homepage = https://jugit.fz-juelich.de/mlz/libcerf; license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index fc12096ef5be1..c4a351739b619 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.0"; + version = "3.14.1"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl"; + sha256 = "0yrcfw5i1jddz7x3j9zzlcwjlzdbi10wns7kbblbp03nx7vk2vqy"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2085d27a1ee13..8d48082e1d9c7 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { (mkFlag documentationSupport "documentation") (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") + "--sysconfdir=/etc" "--libexecdir=${placeholder "bin"}/libexec" ]; diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index cefce19d46596..633f19cef798b 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisoburn"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; + sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc"; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index f4ce1f6eea03f..90bdb06bb7f64 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, python3 +, gobject-introspection +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +, gupnp-igd +, gst_all_1 +, gnutls +}: stdenv.mkDerivation rec { name = "libnice-0.1.16"; @@ -21,27 +36,40 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig python3 gobject-introspection + meson + ninja + pkgconfig + python3 + gobject-introspection + + # documentation gtk-doc - # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` - docbook_xsl docbook_xml_dtd_412 + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gnutls + gupnp-igd + ]; + + propagatedBuildInputs = [ + glib ]; - buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; - propagatedBuildInputs = [ glib gupnp-igd ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; - # TODO; see #53293 etc. - #doCheck = true; + # Tests are flaky + # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 + doCheck = false; meta = with stdenv.lib; { - homepage = https://nice.freedesktop.org/wiki/; - description = "The GLib ICE implementation"; + description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal @@ -49,6 +77,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; + homepage = "https://nice.freedesktop.org/wiki/"; platforms = platforms.linux; license = with licenses; [ lgpl21 mpl11 ]; }; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 15aa7c9e22d1f..d2012760dcf61 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip -, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind +{ stdenv +, fetchurl +, autoreconfHook +, docbook_xsl +, docbook_xml_dtd_43 +, gtk-doc +, lzip +, libidn2 +, libunistring +, libxslt +, pkgconfig +, python3 +, valgrind , publicsuffix-list }: @@ -12,9 +23,26 @@ stdenv.mkDerivation rec { sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ]; - buildInputs = [ libidn2 libunistring libxslt ]; - propagatedBuildInputs = [ publicsuffix-list ]; + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gtk-doc + lzip + pkgconfig + python3 + valgrind + ]; + + buildInputs = [ + libidn2 + libunistring + libxslt + ]; + + propagatedBuildInputs = [ + publicsuffix-list + ]; postPatch = '' patchShebangs src/psl-make-dafsa @@ -25,7 +53,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ -# "--enable-gtk-doc" + # "--enable-gtk-doc" "--enable-man" "--enable-valgrind-tests" "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" @@ -35,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "C library for the Publix Suffix List"; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 468bcfb0a18fe..91c093c991ac0 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}: +{ stdenv, fetchFromGitHub, cmake, libusb1, ninja, pkgconfig }: stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.25.0"; + version = "2.29.0"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "IntelRealSense"; - repo = "librealsense"; + repo = pname; rev = "v${version}"; - sha256 = "029qps0bbck0m2xj0mb5g3pgkk7a1zq8wcilfkvpx72sn7039xvw"; + sha256 = "0wrg1c4fcd5ky96hmnczg9izfgd0yxls8ghxxzrdvgdlg269f443"; }; buildInputs = [ - libusb + libusb1 ]; nativeBuildInputs = [ @@ -25,9 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; - homepage = https://github.com/IntelRealSense/librealsense; + homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 6d95d81e5d9c9..5a7fb3395ebe0 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: +{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; - buildInputs = [ cmake SDL libGLU_combined upx zlib ]; + buildInputs = [ cmake SDL libGLU libGL upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 0a7819743e036..c9adad6f6454d 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,41 +1,43 @@ -{stdenv, fetchurl, fetchpatch, - libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, - systemd +{ stdenv, fetchzip, fetchpatch, cmake +, libjpeg, openssl, zlib, libgcrypt, libpng +, systemd }: let s = # Generated upstream information rec { - baseName="libvncserver"; - version="0.9.11"; - name="${baseName}-${version}"; - url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; - sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r"; + pname = "libvncserver"; + version = "0.9.12"; + url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; + sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum }; in stdenv.mkDerivation { - inherit (s) name version; - src = fetchurl { + inherit (s) pname version; + src = fetchzip { inherit (s) url sha256; }; patches = [ - # CVE-2018-7225. Remove with the next release (fetchpatch { - url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch; - sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3"; + name = "CVE-2018-20750.patch"; + url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch"; + sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm"; + }) + (fetchpatch { + name = "CVE-2019-15681.patch"; + url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch"; + sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s"; }) ]; - preConfigure = '' - sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure - ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - libtool libjpeg openssl libgcrypt libpng + libjpeg openssl libgcrypt libpng ] ++ stdenv.lib.optional stdenv.isLinux systemd; propagatedBuildInputs = [ zlib ]; meta = { inherit (s) version; - description = "VNC server library"; + description = "VNC server library"; + homepage = "https://libvnc.github.io/"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index fc9932567cfa3..56c3f638d52de 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut ? null, libGLU_combined ? null # OpenGL (required for vwebp) +, openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format , jpegSupport ? true, libjpeg ? null # JPEG image format , tiffSupport ? true, libtiff ? null # TIFF image format @@ -14,7 +14,7 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder }: -assert openglSupport -> ((freeglut != null) && (libGLU_combined != null)); +assert openglSupport -> freeglut != null && libGL != null && libGLU != null; assert pngSupport -> (libpng != null); assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut libGLU_combined ] + ++ optionals openglSupport [ freeglut libGL libGLU ] ++ optional pngSupport libpng ++ optional jpegSupport libjpeg ++ optional tiffSupport libtiff diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 7ed50f612243d..f5dcb3357f7ca 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.9"; + version = "2.9.10"; src = fetchurl { url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; + sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma"; }; patches = [ # Upstream bugs: @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # disable test that's problematic with newer pythons: see + # https://mail.gnome.org/archives/xml/2017-August/msg00014.html + preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) '' + echo "" > python/tests/tstLastError.py + ''; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && stdenv.hostPlatform.libc != "musl"; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ed77a1873a809..6d12329a7f513 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -10,31 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.33"; + version = "1.1.34"; src = fetchurl { url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; + sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-11068.patch"; - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; - sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1.patch"; - name = "CVE-2019-13117.patch"; - sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b.patch"; - name = "CVE-2019-13118.patch"; - sha256 = "0bglz9m9sh2vi50qxcm06iqrazw3h45ycgxnp15iankq95z283iq"; - }) - ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 2df7ef94cf36d..74952456e6422 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, cmake, libGLU_combined, libX11, libXi }: +{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: let sourceInfo = rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; inherit (sourceInfo) name version; - buildInputs = [ cmake libGLU_combined libX11 libXi ]; + buildInputs = [ cmake libGLU libGL libX11 libXi ]; sourceRoot = "liquidfun/Box2D/"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index f1ab28dfa1cea..1605ec355cc0b 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm -, libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp +, libopus, ffmpeg, libX11, libXv, libGLU, libGL, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , python, libXext, libmatroska, fetchpatch }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ alsaLib libpulseaudio speex gsm libopus - ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp + ffmpeg libX11 libXv libGLU libGL glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp bctoolbox libXext libmatroska ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ca73f3bdeb6f2..2ebd5893e6287 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.2.4"; + version = "19.2.6"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "03z393jrd1cnh68k5h3mm5yap3hi1jzz3a417ccjxn5vgl7hl009"; + sha256 = "15vpj2v1j5j065f8syhcsyr6rkjm58250r0ri13v6bf8c3x28ywx"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 0907f0174c995..c277b7934b9ba 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, - boost, pkgconfig, withOgre ? false, ogre ? null, libGLU_combined ? null } : + boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let renderSystem = if withOgre then "3" else "4"; @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else libGLU_combined) ]; + buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ] + ++ (if withOgre then [ ogre ] else [libGL libGLU]); # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 5c0238fe41ea2..8480cc868c1fa 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,24 +1,28 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv"; + sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih"; }; buildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + ]; + doCheck = true; checkTarget = "test"; meta = { - homepage = https://github.com/jlblancoc/nanoflann; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/jlblancoc/nanoflann"; + license = stdenv.lib.licenses.bsd2; description = "Header only C++ library for approximate nearest neighbor search"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 72d425e8918f5..43a7cf15c15b1 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nlohmann_json"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap"; + sha256 = "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 79eb4d1e10e40..40ee4f890d49e 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.6"; + name = "nss_wrapper-1.1.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1hijnwabj4nh0m0a913pq07iqq0bw8qb2zxcv73zbnsaay7pa55h"; + sha256 = "1pa7gakprkxblxdqbcy2242lk924gvzdgfr5648wb7cslksm7hbq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index db542ec93a92a..c1f354a1ac98e 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0n5cajrp1fhk8p54ch3akkd9nl8b9c6wwf25980dhagcdys3vab3"; + sha256 = "1cyvvf5f92a777qgh00ja43z43j5nhc9dw5l3wvw9j6j9bqc4i8p"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index d847f447048d3..b66759524fafb 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, libGLU_combined +, cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = - [ cmake libGLU_combined + [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 2855d1139c3d4..ced0158018599 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, lib -, cmake, libGLU_combined +, cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake libGLU_combined + [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index dc3bf8cf0097e..235da872392d8 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, libGLU_combined +, cmake, libGLU, libGL , freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake libGLU_combined + [ cmake libGLU libGL freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 724c0d7c76410..cf46077a56cd2 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11 +{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11 , qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ glew ] - ++ stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut libXmu libXext libX11 ] + ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; doCheck = false; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index b8a3c4a81e00d..92cd343cf6a1e 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: stdenv.mkDerivation { pname = "openexrid-unstable"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { -I${openfx.dev}/include/OpenFX ''; - buildInputs = [ unzip re2 openfx zlib ilmbase libGLU_combined openexr ]; + buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index b08936dd34de6..ba042562320be 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: stdenv.mkDerivation { pname = "partio"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "lib" ]; nativeBuildInputs = [ unzip cmake doxygen ]; - buildInputs = [ freeglut libGLU_combined zlib swig python xorg.libXi xorg.libXmu ]; + buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index dbd87a822c1d0..86e3caaa1486c 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,6 +1,16 @@ -{ stdenv, lib, fetchurl, cmake, libGLU_combined, pkgconfig, libpulseaudio -, extra-cmake-modules, qtbase, qttools -, debug ? false }: +{ stdenv +, lib +, fetchurl +, cmake +, libGLU +, libGL +, pkgconfig +, libpulseaudio +, extra-cmake-modules +, qtbase +, qttools +, debug ? false +}: with lib; @@ -27,7 +37,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libGLU_combined + libGLU + libGL libpulseaudio qtbase qttools diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 96715882c2316..007e4ad0c32fb 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -30,7 +30,7 @@ , libXpm # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. -, libGLU_combined +, libGLU, libGL , xlibsWrapper , libXmu }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] + buildInputs = [ clhep expat zlib libGLU libGL xlibsWrapper libXmu ] ++ stdenv.lib.optionals enableGDML [ xercesc ] ++ stdenv.lib.optionals enableXM [ motif ] ++ stdenv.lib.optionals enableQT [ qtbase ] diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index c9e8c632c7f18..bbc5eb21c2767 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, libGLU_combined, freeglut, SDL +{ fetchurl, fetchpatch, stdenv, libGLU, libGL, freeglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - libGLU_combined freeglut SDL + libGLU libGL freeglut SDL # The following libs ought to be propagated build inputs of Mesa. libXi libSM libXmu libXext libX11 diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 6f49db4d206f5..b047322c35e66 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "prometheus-cpp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jupp0r"; repo = pname; rev = "v${version}"; - sha256 = "15bda1q1jbvixbx1qf41ykcdmsywhhwmi4xgsha12r5m9fh8jzxj"; + sha256 = "0j12ir8skw3y2q8n743zql4ddp7v1j4h030pjcsqn0xqrqw7m5hg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix deleted file mode 100644 index 7dfbdc4d64a0a..0000000000000 --- a/pkgs/development/libraries/pybind11/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }: - -stdenv.mkDerivation rec { - pname = "pybind"; - version = "2.2.4"; - - src = fetchFromGitHub { - owner = "pybind"; - repo = "pybind11"; - rev = "v${version}"; - sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv"; - }; - - nativeBuildInputs = [ cmake ]; - checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ]; - - # Disable test_cmake_build test, as it fails in sandbox - # https://github.com/pybind/pybind11/issues/1355 - patches = [ - ./no_test_cmake_build.patch - (fetchurl { # Remove on bump to v2.2.5 - name = "pytest_namespace_to_configure.patch"; - url = "https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch"; - sha256 = "1dhv6p0b5fxzxc8j3sfy8kvfmdshczk22xfxh6bk0cfnfdy9iqrq"; - }) - ]; - - doCheck = true; - - cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${python.interpreter}" - "-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}" - ]; - - meta = { - homepage = https://github.com/pybind/pybind11; - description = "Seamless operability between C++11 and Python"; - longDescription = '' - Pybind11 is a lightweight header-only library that exposes - C++ types in Python and vice versa, mainly to create Python - bindings of existing C++ code. - ''; - platforms = with stdenv.lib.platforms; unix; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - }; -} diff --git a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch deleted file mode 100644 index c5d6ecc4481ea..0000000000000 --- a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100 -+++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100 -@@ -233,4 +233,3 @@ - add_subdirectory(test_embed) - - # Test CMake build using functions and targets from subdirectory or installed location --add_subdirectory(test_cmake_build) diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index a46dcec031283..98519ae294a4e 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -8,7 +8,7 @@ , mysqlSupport ? false, libmysqlclient ? null , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, libGLU_combined ? null, libXmu ? null +, libGL ? null, libGLU ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: @@ -17,7 +17,7 @@ assert xrenderSupport -> xftSupport && libXrender != null; assert xrandrSupport -> libXrandr != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> libmysqlclient != null; -assert openglSupport -> libGLU_combined != null && libXmu != null; +assert openglSupport -> libGL != null && libGLU != null && libXmu != null; stdenv.mkDerivation { name = "qt-3.3.8"; @@ -51,7 +51,7 @@ stdenv.mkDerivation { (mk xftSupport "xft") ] ++ stdenv.lib.optionals openglSupport [ "-dlopen-opengl" - "-L${libGLU_combined}/lib" "-I${libGLU_combined}/include" + "-L${libGL}/lib" "-I${libGLU}/include" "-L${libXmu.out}/lib" "-I${libXmu.dev}/include" ] ++ stdenv.lib.optionals xrenderSupport [ "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix deleted file mode 100644 index e22dc4dbae309..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ /dev/null @@ -1,175 +0,0 @@ -/* - -# Updates - -Before a major version update, make a copy of this directory. (We like to -keep the old version around for a short time after major updates.) Add a -top-level attribute to `top-level/all-packages.nix`. - -1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. -2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. - -*/ - -{ - newScope, - stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, libGL, perl, - gstreamer, gst-plugins-base, gtk3, dconf, - llvmPackages_5, - - # options - developerBuild ? false, - decryptSslTraffic ? false, - debug ? false, -}: - -with stdenv.lib; - -let - - qtCompatVersion = srcs.qtbase.version; - - stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; - - mirror = "https://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { - # Community port of the now unmaintained upstream qtwebkit. - qtwebkit = { - src = fetchFromGitHub { - owner = "annulen"; - repo = "webkit"; - rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; - sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; - }; - version = "5.212-alpha-01-26-2018"; - }; - }; - - patches = { - qtbase = [ - ./qtbase.patch - ./qtbase-fixguicmake.patch - ]; - qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ - ./qtscript.patch - # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196 - # fixed in qtscript 5.12.2 - (fetchpatch { - url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff"; - sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi"; - }) - ]; - qtserialport = [ ./qtserialport.patch ]; - qttools = [ ./qttools.patch ]; - qtwebengine = [ - ./qtwebengine-no-build-skip.patch - ./qtwebengine-darwin-no-platform-check.patch - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 - # https://bugreports.qt.io/browse/QTBUG-77037 - (fetchpatch { - name = "fix-build-with-pulseaudio-13.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; - sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; - }) - ]; - qtwebkit = [ ./qtwebkit.patch ]; - }; - - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit (stdenv) lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } - stdenvActual.mkDerivation; - } - { inherit self srcs patches; }; - - addPackages = self: with self; - let - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; - in { - - mkDerivationWith = - import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; - - mkDerivation = mkDerivationWith stdenvActual.mkDerivation; - - qtbase = callPackage ../modules/qtbase.nix { - inherit (srcs.qtbase) src version; - patches = patches.qtbase; - inherit bison cups harfbuzz libGL; - withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; - }; - - qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; - qtdoc = callPackage ../modules/qtdoc.nix {}; - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; - qtimageformats = callPackage ../modules/qtimageformats.nix {}; - qtlocation = callPackage ../modules/qtlocation.nix { }; - qtmacextras = callPackage ../modules/qtmacextras.nix {}; - qtmultimedia = callPackage ../modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; - qtquick1 = null; - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; - qtscript = callPackage ../modules/qtscript.nix {}; - qtsensors = callPackage ../modules/qtsensors.nix {}; - qtserialport = callPackage ../modules/qtserialport.nix {}; - qtspeech = callPackage ../modules/qtspeech.nix {}; - qtsvg = callPackage ../modules/qtsvg.nix {}; - qttools = callPackage ../modules/qttools.nix {}; - qttranslations = callPackage ../modules/qttranslations.nix {}; - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; - qtwayland = callPackage ../modules/qtwayland.nix {}; - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix {}; - qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix {}; - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; - qtwebview = callPackage ../modules/qtwebview.nix {}; - qtx11extras = callPackage ../modules/qtx11extras.nix {}; - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 - qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns - ] ++ optional (!stdenv.isDarwin) qtwayland - ++ optional (stdenv.isDarwin) qtmacextras); - - qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; - substitutions = { - fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; - }; - } ../hooks/qmake-hook.sh; - - wrapQtAppsHook = makeSetupHook { - deps = - [ self.qtbase.dev makeWrapper ] - ++ optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; - }; - - self = makeScope newScope addPackages; - -in self diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh deleted file mode 100644 index 2ab3dd71c24fb..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch deleted file mode 100644 index 8b46d432812a8..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 0bbc871..3673634 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -286,7 +286,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}) - -- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"${PLUGIN_LOCATION}\") - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 5baf0fd..3583745 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -2,10 +2,10 @@ - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch deleted file mode 100644 index 7d8407f6daf86..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch +++ /dev/null @@ -1,1106 +0,0 @@ -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf 2019-01-31 00:42:55.843577249 +0100 -@@ -23,7 +23,7 @@ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf 2019-01-31 00:42:55.843577249 +0100 -@@ -21,7 +21,7 @@ - # at cmake time whether package has been found via a symlink, and correct - # that to an absolute path. This is only done for installations to - # the /usr or / prefix. --CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) -+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) - 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 @@ - $$cmake_extra_source_includes.output - } - --CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { -- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ -- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True --} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - --CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_LIB_DIR,"^\\.\\./.*") { -- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ -- CMAKE_LIB_DIR_IS_ABSOLUTE = True --} else { -- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) -- # We need to go up another two levels because the CMake files are -- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" --} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True - --CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_BIN_DIR, "^\\.\\./.*") { -- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ -- CMAKE_BIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - --CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { -- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ -- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True --} -- --win32:!static:!staticlib { -- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ -- CMAKE_DLL_DIR_IS_ABSOLUTE = True -- } --} else { -- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR -- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE --} -+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ -+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True -+ -+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_DLL_DIR_IS_ABSOLUTE = True - - static|staticlib:CMAKE_STATIC_TYPE = true - -@@ -169,7 +144,7 @@ - cmake_target_file - - cmake_qt5_plugin_file.files = $$cmake_target_file.output -- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - INSTALLS += cmake_qt5_plugin_file - - return() -@@ -316,7 +291,7 @@ - cmake_qt5_module_files.files += $$cmake_macros_file.output - } - --cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - - # 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 -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-01-31 00:42:55.843577249 +0100 -@@ -3,30 +3,6 @@ - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") - endif() - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!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 @@ - macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ENDIF - _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 @@ - ) - - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ - !!IF !no_module_headers - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" - ) - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE --!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -269,25 +225,13 @@ - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -306,25 +250,13 @@ - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -343,11 +275,7 @@ - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf 2019-01-31 00:45:14.585621324 +0100 -@@ -62,199 +62,3 @@ - } - } - } -- --# 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 -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- !isEmpty(VERSION) { -- l = $$split(VERSION, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- } -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator: \ -- version_identifier = $$simulator.deployment_identifier -- else: \ -- version_identifier = $$device.deployment_identifier -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- 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 -Only in qtbase-everywhere-src-5.11.3/mkspecs/features/mac: default_post.prf.orig -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf 2019-01-31 00:42:55.843577249 +0100 -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --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 -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf 2019-01-31 00:42:55.843577249 +0100 -@@ -1,58 +1 @@ - --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --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 --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf 2019-01-31 00:42:55.843577249 +0100 -@@ -23,13 +23,8 @@ - - load(qt_build_paths) - --qml1_target { -- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH -- instbase = $$[QT_INSTALL_IMPORTS] --} else { -- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -- instbase = $$[QT_INSTALL_QML] --} -+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -+instbase = $$NIX_OUTPUT_QML - - !qml1_target:static: CONFIG += builtin_resources - -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -48,13 +48,8 @@ - - load(qt_build_paths) - --qml1_target { -- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH -- instbase = $$[QT_INSTALL_IMPORTS] --} else { -- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -- instbase = $$[QT_INSTALL_QML] --} -+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -+instbase = $$NIX_OUTPUT_QML - - target.path = $$instbase/$$TARGETPATH - INSTALLS += target -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -33,7 +33,7 @@ - target.path = $$[QT_HOST_BINS] - } else { - !build_pass:qtConfig(debug_and_release): CONFIG += release -- target.path = $$[QT_INSTALL_BINS] -+ target.path = $$NIX_OUTPUT_BIN/bin - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable - } - INSTALLS += target -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -24,6 +24,6 @@ - !force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. -- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] -- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] -+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT -+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT - } -Only in qtbase-everywhere-src-5.11.3/mkspecs/features: qt_build_paths.prf.orig -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -32,8 +32,8 @@ - qqt_libdir = \$\$\$\$[QT_HOST_LIBS] - qt_libdir = $$[QT_HOST_LIBS] - } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -+ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - } - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { - lib_replace.match = "[^ ']*$$rplbase/lib" -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -45,7 +45,7 @@ - - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) - !build_online_docs: \ -- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) - PREP_DOC_INDEXES = - DOC_INDEXES = - !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) - } else { - prepare_docs: \ -- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) -+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) - } - - qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) - - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR -- inst_html_docs.path = $$[QT_INSTALL_DOCS] -+ inst_html_docs.path = $$NIX_OUTPUT_DOC - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch -- inst_qch_docs.path = $$[QT_INSTALL_DOCS] -+ inst_qch_docs.path = $$NIX_OUTPUT_DOC - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -88,7 +88,7 @@ - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) --sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -69,7 +69,7 @@ - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -+ cmd = $$system("command -v $$2") - exists($${cmd}.pl) { - $${1}_EXE = $${cmd}.pl - cmd = perl -w $$system_path($${cmd}.pl) -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -12,16 +12,10 @@ - #library - !qt_no_install_library { - win32 { -- host_build: \ -- dlltarget.path = $$[QT_HOST_BINS] -- else: \ -- dlltarget.path = $$[QT_INSTALL_BINS] -+ dlltarget.path = $$NIX_OUTPUT_BIN/bin - INSTALLS += dlltarget - } -- host_build: \ -- target.path = $$[QT_HOST_LIBS] -- else: \ -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - !static: target.CONFIG = no_dll - INSTALLS += target - } -@@ -29,33 +23,33 @@ - #headers - qt_install_headers { - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES -- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += gen_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES -- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += targ_headers - - 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 - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES -- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa -+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers - } - - #module - qt_install_module { - !isEmpty(MODULE_PRI) { -- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { -- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf ---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf 2019-01-31 00:42:55.844577264 +0100 -@@ -88,7 +88,7 @@ - } - } - --target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE - INSTALLS += target - - TARGET = $$qt5LibraryTarget($$TARGET) -diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp ---- qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp 2019-01-31 00:42:55.845577279 +0100 -@@ -2612,6 +2612,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)); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -Only in qtbase-everywhere-src-5.11.3/src/corelib/kernel: qcoreapplication.cpp.orig -diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-01-31 00:42:55.844577264 +0100 -@@ -3,7 +3,7 @@ - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -116,7 +116,7 @@ - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -130,7 +130,7 @@ - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-01-31 00:42:55.844577264 +0100 -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-01-31 00:42:55.844577264 +0100 -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp ---- qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-01-31 00:42:55.845577279 +0100 -@@ -70,7 +70,11 @@ - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -644,12 +648,16 @@ - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - -diff -ur qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 -@@ -2,11 +2,7 @@ - if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ - if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff -ur qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-01-31 00:42:55.845577279 +0100 -@@ -265,12 +265,9 @@ - m_possibleLocations.reserve(7); - if (qEnvironmentVariableIsSet("QTCOMPOSE")) - m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); -+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); - } - - QString TableGenerator::findComposeFile() -diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2019-01-31 00:42:55.845577279 +0100 -@@ -650,9 +650,14 @@ - #if QT_CONFIG(library) - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -+ // Check system library paths first - QLibrary lib(QLatin1String("GL")); -- if (!lib.load()) -- lib.setFileNameAndVersion(QLatin1String("GL"), 1); -+#ifdef NIXPKGS_MESA_GL -+ if (!lib.load()) { -+ // Fallback to Mesa driver -+ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL)); -+ } -+#endif // NIXPKGS_MESA_GL - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - #endif - } -Only in qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx: qglxintegration.cpp.orig -diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp ---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-01-31 00:42:55.846577295 +0100 -@@ -316,10 +316,10 @@ - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { -diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp ---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp 2019-01-31 00:42:55.846577295 +0100 -@@ -39,6 +39,7 @@ - - #include <qpa/qplatformthemeplugin.h> - #include "qgtk3theme.h" -+#include <QFile> - - QT_BEGIN_NAMESPACE - -@@ -54,8 +55,22 @@ - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) - { - Q_UNUSED(params); -- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) -+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { -+ -+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS -+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); -+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); -+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); -+#endif -+ -+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES -+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); -+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); -+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); -+#endif -+ - return new QGtk3Theme; -+ } - - return 0; - } -diff -ur qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h ---- qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h 2019-01-31 00:42:55.846577295 +0100 -@@ -44,10 +44,13 @@ - - QT_BEGIN_NAMESPACE - -- -+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -+#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) -+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) -+#else - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -- - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) -+#endif - - QT_END_NAMESPACE - -diff -ur qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in ---- qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 -+++ qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-01-31 00:42:55.846577295 +0100 -@@ -3,7 +3,7 @@ - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch deleted file mode 100644 index cfa68eb8102ce..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 005db4248..685c5b1b2 100644 ---- a/src/qml/qml/qqmlimport.cpp -+++ b/src/qml/qml/qqmlimport.cpp -@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add import paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); -+ } -+ } -+ - // env import paths - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { - const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); -diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake -index 56cb3fb55..74509d601 100644 ---- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake -+++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake -@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) - - find_package(Qt5 COMPONENTS Qml Core) - -- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen") -+ set(compiler_path "qmlcachegen") - - get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) - -diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf -index 537eaf62e..e21de58f6 100644 ---- a/tools/qmlcachegen/qmlcache.prf -+++ b/tools/qmlcachegen/qmlcache.prf -@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { - } - - qmlcacheinst.base = $$QMLCACHE_DESTDIR --qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH - qmlcacheinst.CONFIG = no_check_exist - - qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.11/qtscript.patch b/pkgs/development/libraries/qt-5/5.11/qtscript.patch deleted file mode 100644 index 5508dec1280e3..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtscript.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include <pthread.h> - #elif PLATFORM(GTK) - #include <wtf/gtk/GOwnPtr.h> --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.11/qtserialport.patch b/pkgs/development/libraries/qt-5/5.11/qtserialport.patch deleted file mode 100644 index f25524e80bcfe..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtserialport.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index af2dab2..8e17f64 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+#endif - if (!udevLibrary->load()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+#endif - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; diff --git a/pkgs/development/libraries/qt-5/5.11/qttools.patch b/pkgs/development/libraries/qt-5/5.11/qttools.patch deleted file mode 100644 index 622efc35b6b64..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qttools.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in -index 3b97923a..63336bd5 100644 ---- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in -@@ -2,11 +2,10 @@ - if (NOT TARGET Qt5::qcollectiongenerator) - add_executable(Qt5::qcollectiongenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qcollectiongenerator PROPERTIES -@@ -17,11 +16,7 @@ endif() - if (NOT TARGET Qt5::qhelpgenerator) - add_executable(Qt5::qhelpgenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qhelpgenerator PROPERTIES -diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16f..d60db4ff 100644 ---- a/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -44,11 +44,7 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +55,7 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +66,7 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES ---- a/src/macdeployqt/shared/shared.cpp -+++ b/src/macdeployqt/shared/shared.cpp -@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf - if (!QFile(qmlImportScannerPath).exists()) - qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; - -+#ifdef NIXPKGS_QMLIMPORTSCANNER -+ // Fallback: Nixpkgs hardcoded path -+ if (!QFile(qmlImportScannerPath).exists()) -+ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; -+#endif -+ - // Verify that we found a qmlimportscanner binary - if (!QFile(qmlImportScannerPath).exists()) { - LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch deleted file mode 100644 index 3e1a8762b3615..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { - return(false) - } - } else:osx { -- !isMinXcodeVersion(7, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") -- return(false) -- } - !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") - return(false) -@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { - skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") - return(false) - } -- !isMinOSXSDKVersion(10, 10): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) -- } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") - return(false) -diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri ---- a/src/core/config/mac_osx.pri -+++ b/src/core/config/mac_osx.pri -@@ -5,8 +5,6 @@ load(functions) - # otherwise query for it. - QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) - isEmpty(QMAKE_MAC_SDK_VERSION) { -- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") - } - - QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch deleted file mode 100644 index f332d5e1bb2b0..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/qtwebengine.pro b/qtwebengine.pro ---- a/qtwebengine.pro -+++ b/qtwebengine.pro -@@ -5,7 +5,7 @@ runConfigure() - - !isEmpty(skipBuildReason) { - SUBDIRS = -- log($${skipBuildReason}$${EOL}) -+ error($${skipBuildReason}$${EOL}) - log(QtWebEngine will not be built.$${EOL}) - } - diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch deleted file mode 100644 index b94a4b76cbaba..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake ---- a/Source/WebKit2/PlatformQt.cmake -+++ b/Source/WebKit2/PlatformQt.cmake -@@ -261,6 +261,7 @@ - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES - ${GLIB_INCLUDE_DIRS} - ${GSTREAMER_INCLUDE_DIRS} -+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS} - ${Qt5Quick_INCLUDE_DIRS} - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} - ${SQLITE_INCLUDE_DIR} - diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix deleted file mode 100644 index cff49b1803374..0000000000000 --- a/pkgs/development/libraries/qt-5/5.11/srcs.nix +++ /dev/null @@ -1,325 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz"; - sha256 = "1awyv40jgbb30yp5zxf6j9wq96nmk8zyhbh4fpn9gn35ychmr984"; - name = "qt3d-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtactiveqt-everywhere-src-5.11.3.tar.xz"; - sha256 = "0g35yhp01c34m91fp5vzzq0d2kzz0yswpjjk5cg36j0ddnfcsh4d"; - name = "qtactiveqt-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtandroidextras-everywhere-src-5.11.3.tar.xz"; - sha256 = "0clqz10ry70f0v8hbw37fhlwrsr5jddg99yjsk9db250dwbqzq27"; - name = "qtandroidextras-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtbase = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz"; - sha256 = "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6"; - name = "qtbase-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz"; - sha256 = "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m"; - name = "qtcanvas3d-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtcharts = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz"; - sha256 = "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627"; - name = "qtcharts-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz"; - sha256 = "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l"; - name = "qtconnectivity-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz"; - sha256 = "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3"; - name = "qtdatavis3d-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz"; - sha256 = "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf"; - name = "qtdeclarative-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtdoc = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdoc-everywhere-src-5.11.3.tar.xz"; - sha256 = "06nl8lzrilj8yify5qy4fm9la6dh71aamg19jhvvi657cshiclsq"; - name = "qtdoc-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtgamepad = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgamepad-everywhere-src-5.11.3.tar.xz"; - sha256 = "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9"; - name = "qtgamepad-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; - sha256 = "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l"; - name = "qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtimageformats = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz"; - sha256 = "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4"; - name = "qtimageformats-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtlocation = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz"; - sha256 = "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q"; - name = "qtlocation-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtmacextras = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmacextras-everywhere-src-5.11.3.tar.xz"; - sha256 = "1j9sqmcwswr8v9z8mcbm10bj7nz8nv9mir0xsc5123ik1gw2c3lk"; - name = "qtmacextras-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz"; - sha256 = "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j"; - name = "qtmultimedia-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtnetworkauth = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz"; - sha256 = "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50"; - name = "qtnetworkauth-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtpurchasing-everywhere-src-5.11.3.tar.xz"; - sha256 = "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n"; - name = "qtpurchasing-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz"; - sha256 = "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf"; - name = "qtquickcontrols-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; - sha256 = "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl"; - name = "qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtremoteobjects = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtremoteobjects-everywhere-src-5.11.3.tar.xz"; - sha256 = "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp"; - name = "qtremoteobjects-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtscript = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz"; - sha256 = "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v"; - name = "qtscript-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtscxml = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz"; - sha256 = "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk"; - name = "qtscxml-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtsensors = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz"; - sha256 = "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7"; - name = "qtsensors-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtserialbus = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz"; - sha256 = "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n"; - name = "qtserialbus-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtserialport = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz"; - sha256 = "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n"; - name = "qtserialport-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtspeech = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz"; - sha256 = "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr"; - name = "qtspeech-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtsvg = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz"; - sha256 = "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1"; - name = "qtsvg-everywhere-src-5.11.3.tar.xz"; - }; - }; - qttools = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz"; - sha256 = "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2"; - name = "qttools-everywhere-src-5.11.3.tar.xz"; - }; - }; - qttranslations = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz"; - sha256 = "0j8i2kabz22vqb0qj41pkjv848zblqxs71sydc3xcd5av22b517s"; - name = "qttranslations-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; - sha256 = "17jb7cbfy5c19fr9frql6q22in3ra3a4fbff0kjykllxb8j40p4c"; - name = "qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwayland = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz"; - sha256 = "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2"; - name = "qtwayland-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz"; - sha256 = "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w"; - name = "qtwebchannel-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwebengine = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz"; - sha256 = "1zmqsdais85cdfh2jh8h4a5jcamp1mzdk3vgqm6xnldqf6nrxd2v"; - name = "qtwebengine-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwebglplugin = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebglplugin-everywhere-src-5.11.3.tar.xz"; - sha256 = "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9"; - name = "qtwebglplugin-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz"; - sha256 = "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402"; - name = "qtwebsockets-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwebview = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz"; - sha256 = "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh"; - name = "qtwebview-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtwinextras = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwinextras-everywhere-src-5.11.3.tar.xz"; - sha256 = "1xf9gc0wqk9jz2ayx29vx0vmm72x9h4qxp2fvgpclns621wyhw72"; - name = "qtwinextras-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtx11extras = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz"; - sha256 = "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr"; - name = "qtx11extras-everywhere-src-5.11.3.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.11.3"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; - sha256 = "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b"; - name = "qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 0a37b1ce39a3c..8d27f3a0d4bac 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -80,15 +80,6 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) - # patch for CVE-2019-13720, can be removed when it is included in the next upstream release - # https://bugreports.qt.io/browse/QTBUG-1019226 - (fetchpatch { - name = "qtwebengine-CVE-2019-13720.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10"; - sha256 = "0ywc12m196pr6xn7l5xbascihygkjj4pbcgcn9wxvi5ssdr6z46z"; - extraPrefix = "src/3rdparty/"; - stripLen = 1; - }) ] ++ 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 575115c9bdf41..9f99879511e6b 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.5/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.6/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix index 3b4d761c16cdd..b4494593fd0b5 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.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qt3d-everywhere-src-5.12.5.tar.xz"; - sha256 = "2a35b144768c7ad8a9265d16a04f038d9bc51016bd2c4b2b516e374f81ff29c4"; - name = "qt3d-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qt3d-everywhere-src-5.12.6.tar.xz"; + sha256 = "cf34ce99a2592270abbf32a13fa824d99c76412fc493a3f1c37e37892b198baf"; + name = "qt3d-everywhere-src-5.12.6.tar.xz"; }; }; qtactiveqt = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtactiveqt-everywhere-src-5.12.5.tar.xz"; - sha256 = "d673a1269dd900c78dbfe88eb16e086e36d236571722712a64401cdec7b73a40"; - name = "qtactiveqt-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtactiveqt-everywhere-src-5.12.6.tar.xz"; + sha256 = "c50f082588bf7dad2091a5b67c426791bf36d7d1503c56dc79b9e26444931f09"; + name = "qtactiveqt-everywhere-src-5.12.6.tar.xz"; }; }; qtandroidextras = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtandroidextras-everywhere-src-5.12.5.tar.xz"; - sha256 = "f115ccef1e808da7c5d0348f3e245952a2973966f34d18b935f9e3eb16062eab"; - name = "qtandroidextras-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtandroidextras-everywhere-src-5.12.6.tar.xz"; + sha256 = "a0f15a4ba29abe90de2b2c221efd22ecfb6793590ff9610f85e6e6b6562784fe"; + name = "qtandroidextras-everywhere-src-5.12.6.tar.xz"; }; }; qtbase = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz"; - sha256 = "fc8abffbbda9da3e593d8d62b56bc17dbaab13ff71b72915ddda11dabde4d625"; - name = "qtbase-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtbase-everywhere-src-5.12.6.tar.xz"; + sha256 = "6ab52649d74d7c1728cf4a6cf335d1142b3bf617d476e2857eb7961ef43f9f27"; + name = "qtbase-everywhere-src-5.12.6.tar.xz"; }; }; qtcanvas3d = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtcanvas3d-everywhere-src-5.12.5.tar.xz"; - sha256 = "1553e06ce3cc5afb36aed3698b85c00e734eac07f7f41895426bebd84216d80c"; - name = "qtcanvas3d-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtcanvas3d-everywhere-src-5.12.6.tar.xz"; + sha256 = "2d33e6c944e5a2eed7528fdfe9deadfb1b7a0fcf17bab1f8b83988b1327d9d08"; + name = "qtcanvas3d-everywhere-src-5.12.6.tar.xz"; }; }; qtcharts = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtcharts-everywhere-src-5.12.5.tar.xz"; - sha256 = "4c7c30a916ba0100a1635b89f48bc5a8af4cdedac79c3fc18456af54dc0a6608"; - name = "qtcharts-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtcharts-everywhere-src-5.12.6.tar.xz"; + sha256 = "14dbdb5bb18d774e3b7ac3042a3f349080ab42c2588527ff04123df1c9ccaa3d"; + name = "qtcharts-everywhere-src-5.12.6.tar.xz"; }; }; qtconnectivity = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtconnectivity-everywhere-src-5.12.5.tar.xz"; - sha256 = "bdf62c72d689f47c4d17ecdde934d9f85a1164091e58fce02873de259e8de88b"; - name = "qtconnectivity-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtconnectivity-everywhere-src-5.12.6.tar.xz"; + sha256 = "10f1c6727aedc375a1bfab4bb33fd2111bf2c1dfc19049e361c0f58608ea22da"; + name = "qtconnectivity-everywhere-src-5.12.6.tar.xz"; }; }; qtdatavis3d = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdatavis3d-everywhere-src-5.12.5.tar.xz"; - sha256 = "1de165bf5330c7fb18c6fbb8c0e5cda47fa19c2eaba657b3792fd75e653444f3"; - name = "qtdatavis3d-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdatavis3d-everywhere-src-5.12.6.tar.xz"; + sha256 = "414d91aae5e7d3404a0b526f944961871b1abf1fda51f0861d19cb28a2eba4fe"; + name = "qtdatavis3d-everywhere-src-5.12.6.tar.xz"; }; }; qtdeclarative = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdeclarative-everywhere-src-5.12.5.tar.xz"; - sha256 = "22c5323d4b01259e6e352eef1b54129d6dfee00a406f0312905fa7db322b9190"; - name = "qtdeclarative-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdeclarative-everywhere-src-5.12.6.tar.xz"; + sha256 = "34b1d1ae5562f1d433e22c255ac1a37a2fb030ef05bf6123d4b9496644b686d3"; + name = "qtdeclarative-everywhere-src-5.12.6.tar.xz"; }; }; qtdoc = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdoc-everywhere-src-5.12.5.tar.xz"; - sha256 = "f1de30227b8854c284e9c23e9c0c44d9fe768880aef826b0f880a44dd7c7538d"; - name = "qtdoc-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdoc-everywhere-src-5.12.6.tar.xz"; + sha256 = "82549278120236ece0e02f9bab351319e4469c242ce97b05f269964aee924aac"; + name = "qtdoc-everywhere-src-5.12.6.tar.xz"; }; }; qtgamepad = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtgamepad-everywhere-src-5.12.5.tar.xz"; - sha256 = "de88f01d47f7cc5d54a1af783c5fae9f2b0101948ff33b8290f71b2657aded33"; - name = "qtgamepad-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtgamepad-everywhere-src-5.12.6.tar.xz"; + sha256 = "e1ebc5f3593c5234724663106790fbf1831d4ac8ea50a9d9805d2dd0a1c5b3b3"; + name = "qtgamepad-everywhere-src-5.12.6.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtgraphicaleffects-everywhere-src-5.12.5.tar.xz"; - sha256 = "bdbddba7e0e0d041809a98d97c07da8be8936ec48537335cbaea9b0049c646ad"; - name = "qtgraphicaleffects-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtgraphicaleffects-everywhere-src-5.12.6.tar.xz"; + sha256 = "ded0327624a13bf7fab07e5fe762473194ed898b0442ef9325498e41c8c077ef"; + name = "qtgraphicaleffects-everywhere-src-5.12.6.tar.xz"; }; }; qtimageformats = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtimageformats-everywhere-src-5.12.5.tar.xz"; - sha256 = "9f19394830542fb9e6bde6806b6216b7207f96bff674b91e8e8a8f89699e1f0a"; - name = "qtimageformats-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtimageformats-everywhere-src-5.12.6.tar.xz"; + sha256 = "330d1c29a135c44bb36b5ffc2ba4f8915dbc446d5d75563523ebcfd373617858"; + name = "qtimageformats-everywhere-src-5.12.6.tar.xz"; }; }; qtlocation = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtlocation-everywhere-src-5.12.5.tar.xz"; - sha256 = "12c8b59755abc4ca56e135e8ae3db7c6ba1bd95c779060f10a01393ae1040122"; - name = "qtlocation-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtlocation-everywhere-src-5.12.6.tar.xz"; + sha256 = "7ae231ca4de3c0915e92bb95440b0ddc7113790b1acb536c9394472e8dde2278"; + name = "qtlocation-everywhere-src-5.12.6.tar.xz"; }; }; qtmacextras = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtmacextras-everywhere-src-5.12.5.tar.xz"; - sha256 = "984c3c95834aaa6fd85234ab1987a79662911c510e419611ce88fb4756313194"; - name = "qtmacextras-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtmacextras-everywhere-src-5.12.6.tar.xz"; + sha256 = "eae25b8858fef348667b938f5c88a014ee78945c419e4e6d856d4a6adc5e43a3"; + name = "qtmacextras-everywhere-src-5.12.6.tar.xz"; }; }; qtmultimedia = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtmultimedia-everywhere-src-5.12.5.tar.xz"; - sha256 = "d5a0a4fddc5ef14d641160a1fc0011b190ff8d9f19009498d586516b8ee3479c"; - name = "qtmultimedia-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtmultimedia-everywhere-src-5.12.6.tar.xz"; + sha256 = "9f580e8962ca6a09608570e77b38d7c3f71d344ff6de1c39bc6905226b679570"; + name = "qtmultimedia-everywhere-src-5.12.6.tar.xz"; }; }; qtnetworkauth = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtnetworkauth-everywhere-src-5.12.5.tar.xz"; - sha256 = "0933475a2d30550c70ce4026c72678cbfdac73211593c78d442e038ef531a9f1"; - name = "qtnetworkauth-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtnetworkauth-everywhere-src-5.12.6.tar.xz"; + sha256 = "ea122d86a960863bbe0e0f4b5a12f0a376455beed3c26f1b61926e065b366abd"; + name = "qtnetworkauth-everywhere-src-5.12.6.tar.xz"; }; }; qtpurchasing = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtpurchasing-everywhere-src-5.12.5.tar.xz"; - sha256 = "7bcebc4985d387f3fa4ffcc19eada1f4f0f000ed0fd3e1d1dc37eb1db0be615b"; - name = "qtpurchasing-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtpurchasing-everywhere-src-5.12.6.tar.xz"; + sha256 = "1fa0b7e3da4755b64559177f507718320c1aa9e66ec49e17595e04c3f3af70cd"; + name = "qtpurchasing-everywhere-src-5.12.6.tar.xz"; }; }; qtquickcontrols = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols-everywhere-src-5.12.5.tar.xz"; - sha256 = "46deaefbdac3daa576c748e807956f5f82b2318923b1a36e434a3ff32d1d2559"; - name = "qtquickcontrols-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtquickcontrols-everywhere-src-5.12.6.tar.xz"; + sha256 = "c48d96a187ff924f1ae4b4abe9cc073adeb06a6c2b07c4191aa595ad22df2c99"; + name = "qtquickcontrols-everywhere-src-5.12.6.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols2-everywhere-src-5.12.5.tar.xz"; - sha256 = "d744bdc492486db6cb521b1d4891e2358719399825ca1cf2a50968a80f6acb8f"; - name = "qtquickcontrols2-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtquickcontrols2-everywhere-src-5.12.6.tar.xz"; + sha256 = "5cab0712f946405db269851b96cca02ef8ba98f3ee2c4fa9c0877dba3808a970"; + name = "qtquickcontrols2-everywhere-src-5.12.6.tar.xz"; }; }; qtremoteobjects = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtremoteobjects-everywhere-src-5.12.5.tar.xz"; - sha256 = "acf131af93dd1fefbf30c7e03e29b8a1da3180e00c49f95c14a1cb6158cfeacd"; - name = "qtremoteobjects-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtremoteobjects-everywhere-src-5.12.6.tar.xz"; + sha256 = "49b5353d020fb6ab9bdf90c941a4b3acc6b036266f6c68a42fc44a7ac151d699"; + name = "qtremoteobjects-everywhere-src-5.12.6.tar.xz"; }; }; qtscript = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtscript-everywhere-src-5.12.5.tar.xz"; - sha256 = "0083734ae827840334b774decb15de37f1b4ea5c88e442e2f485c530f24f1df4"; - name = "qtscript-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtscript-everywhere-src-5.12.6.tar.xz"; + sha256 = "a18082ad338e2378cccab932045804ad3077ec924fed2efc59d4b726d622777c"; + name = "qtscript-everywhere-src-5.12.6.tar.xz"; }; }; qtscxml = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtscxml-everywhere-src-5.12.5.tar.xz"; - sha256 = "6f1ec74100cdb2e7dfc3535e09d356fc53ba42e61b32fc3b93d5a7efed49960c"; - name = "qtscxml-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtscxml-everywhere-src-5.12.6.tar.xz"; + sha256 = "53d7837c8b5b1f9beb26cb64ea4334211218533e0126167e4e7e75238f7ac68b"; + name = "qtscxml-everywhere-src-5.12.6.tar.xz"; }; }; qtsensors = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtsensors-everywhere-src-5.12.5.tar.xz"; - sha256 = "e3a86a706f475bb23fc874de56026482de223ebd24f8cb4e94a28d1985ca0b85"; - name = "qtsensors-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtsensors-everywhere-src-5.12.6.tar.xz"; + sha256 = "59dba4c0bc72846d938e0862f14d8064fb664d893f270a41d3abf4e871290ef5"; + name = "qtsensors-everywhere-src-5.12.6.tar.xz"; }; }; qtserialbus = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtserialbus-everywhere-src-5.12.5.tar.xz"; - sha256 = "8474ae61a703c56e327ae0755c27643f2eafe0d915e8c6afb21728548dc02c22"; - name = "qtserialbus-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtserialbus-everywhere-src-5.12.6.tar.xz"; + sha256 = "071b421282118c507a996e3cee4070f2c545335dfd891a44bf54100935cff5de"; + name = "qtserialbus-everywhere-src-5.12.6.tar.xz"; }; }; qtserialport = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtserialport-everywhere-src-5.12.5.tar.xz"; - sha256 = "f8ef0321a59ecfe2c72adc2ee220e0047403439a3c7b9efb719b1476af1fb862"; - name = "qtserialport-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtserialport-everywhere-src-5.12.6.tar.xz"; + sha256 = "77d0def93078fb5d9de6faa9ccff05cce5b934899e856b04bcf7f721a4e190be"; + name = "qtserialport-everywhere-src-5.12.6.tar.xz"; }; }; qtspeech = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtspeech-everywhere-src-5.12.5.tar.xz"; - sha256 = "f94c0cd7236d1a20d97d314d2c17c45c967cd7f24b869c43f5f46253f436f25b"; - name = "qtspeech-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtspeech-everywhere-src-5.12.6.tar.xz"; + sha256 = "27ae7b2c7073377a617f32b0f4adfc1807774f02d13469ed4bcd282799cf878a"; + name = "qtspeech-everywhere-src-5.12.6.tar.xz"; }; }; qtsvg = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtsvg-everywhere-src-5.12.5.tar.xz"; - sha256 = "75a791cf749f671d7ea9090b403ca513f745795018db512e7eecbf418b679840"; - name = "qtsvg-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtsvg-everywhere-src-5.12.6.tar.xz"; + sha256 = "46243e6c425827ab4e91fbe31567f683ff14cb01d12f9f7543a83a571228ef8f"; + name = "qtsvg-everywhere-src-5.12.6.tar.xz"; }; }; qttools = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz"; - sha256 = "28e095047b4985437dd66120cbcb49ac091bf4f12576ecad7ebc781b7dd44025"; - name = "qttools-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qttools-everywhere-src-5.12.6.tar.xz"; + sha256 = "e94991c7885c2650cefd71189873e45b1d64d6042e439a0a0d9652c191d3c777"; + name = "qttools-everywhere-src-5.12.6.tar.xz"; }; }; qttranslations = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qttranslations-everywhere-src-5.12.5.tar.xz"; - sha256 = "72eb6317190fdcc3f8de37996adc646ab8772988766bacaab60a5bcc7d6a3f2a"; - name = "qttranslations-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qttranslations-everywhere-src-5.12.6.tar.xz"; + sha256 = "798ac44414206898d0192653118de3f115c59016e2bf82ad0c659f9f8c864768"; + name = "qttranslations-everywhere-src-5.12.6.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz"; - sha256 = "786d745b34b1f145073488d492325e98bcde81b07ab984032ea5eb2fb52e6e5e"; - name = "qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz"; + sha256 = "04699888d6e1e8e04db8043a37212fa3b1fcb1b23aef41c2f3ae7a4278e34d2c"; + name = "qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz"; }; }; qtwayland = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwayland-everywhere-src-5.12.5.tar.xz"; - sha256 = "29fd31267149451f93faa15f031e0a14506e704086033f70d51479522c6f3846"; - name = "qtwayland-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwayland-everywhere-src-5.12.6.tar.xz"; + sha256 = "fa9c6aa84ddc0334b44f0f47d69569e496e5d9f3a1ed67aab42214854d2351c4"; + name = "qtwayland-everywhere-src-5.12.6.tar.xz"; }; }; qtwebchannel = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebchannel-everywhere-src-5.12.5.tar.xz"; - sha256 = "9f1d1ac20722ee053ecf071d4ec0070a45a765cb67b6e31add61004fb4b3c5e8"; - name = "qtwebchannel-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebchannel-everywhere-src-5.12.6.tar.xz"; + sha256 = "2745d1703de1a749405727a74786184c950ba7465dc5d02e2f39f51635dbc8d7"; + name = "qtwebchannel-everywhere-src-5.12.6.tar.xz"; }; }; qtwebengine = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebengine-everywhere-src-5.12.5.tar.xz"; - sha256 = "31881130e69eb8336e9480f9f33cd5a93e86de8d7323c0ae1893e1a72ce70743"; - name = "qtwebengine-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebengine-everywhere-src-5.12.6.tar.xz"; + sha256 = "caa5f257c3bc33c1d2fcb9b7cd414fd5c46e8eee8a103231ab28d592a0058621"; + name = "qtwebengine-everywhere-src-5.12.6.tar.xz"; }; }; qtwebglplugin = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebglplugin-everywhere-src-5.12.5.tar.xz"; - sha256 = "aac3b2b2e5b6f26dd7abba6eab616777fecbb4d06de05ddab68c1296652bc4f7"; - name = "qtwebglplugin-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebglplugin-everywhere-src-5.12.6.tar.xz"; + sha256 = "21d88852f69f0f06c5899e61fe76b2cefc2b65be4ed3c334ec01431ba16f50dd"; + name = "qtwebglplugin-everywhere-src-5.12.6.tar.xz"; }; }; qtwebsockets = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebsockets-everywhere-src-5.12.5.tar.xz"; - sha256 = "5d58e697c49c0ea19a8299deba84b5360dca8c336a1636d38de0351757293262"; - name = "qtwebsockets-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebsockets-everywhere-src-5.12.6.tar.xz"; + sha256 = "f00bfbaa73e60a4c3371e729167d7acb465cbb2db32535d745982cab21fed61e"; + name = "qtwebsockets-everywhere-src-5.12.6.tar.xz"; }; }; qtwebview = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebview-everywhere-src-5.12.5.tar.xz"; - sha256 = "a6d4d8c335cd6838f4638874fcd67655e80db569ed567a774a84f6bf7d332f26"; - name = "qtwebview-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebview-everywhere-src-5.12.6.tar.xz"; + sha256 = "42c0623c1c066620ab1afc3736a4a5f42115f9c190dafdf643e16ccec6e7727a"; + name = "qtwebview-everywhere-src-5.12.6.tar.xz"; }; }; qtwinextras = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwinextras-everywhere-src-5.12.5.tar.xz"; - sha256 = "7ee2fc73bc95c5e36e8ed2d02fc89822d56c406c540fbfa52bb0e3929ff2f93d"; - name = "qtwinextras-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwinextras-everywhere-src-5.12.6.tar.xz"; + sha256 = "02c2b2393073a22498a5645faed34040428ace9cf09f18e2f12e75e31be54bea"; + name = "qtwinextras-everywhere-src-5.12.6.tar.xz"; }; }; qtx11extras = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtx11extras-everywhere-src-5.12.5.tar.xz"; - sha256 = "89425af3e48b040878c6a64ace58c17a83b87c9330e6366b09a41d6797062a68"; - name = "qtx11extras-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtx11extras-everywhere-src-5.12.6.tar.xz"; + sha256 = "5f3991f557116034731ed059895e73b5d34e1b22e85536a8eb6e92350b3a1d6b"; + name = "qtx11extras-everywhere-src-5.12.6.tar.xz"; }; }; qtxmlpatterns = { - version = "5.12.5"; + version = "5.12.6"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtxmlpatterns-everywhere-src-5.12.5.tar.xz"; - sha256 = "b905d9107f87798ef0f142942fc45c0f63fc113522ab041e791d3cb744a8babd"; - name = "qtxmlpatterns-everywhere-src-5.12.5.tar.xz"; + url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtxmlpatterns-everywhere-src-5.12.6.tar.xz"; + sha256 = "76977bc834e6c6118ae2bab31e68ae54843358936b03e432d919ad15cd2184d0"; + name = "qtxmlpatterns-everywhere-src-5.12.6.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix deleted file mode 100644 index 8854ed5470013..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ /dev/null @@ -1,179 +0,0 @@ -/* - -# Updates - -Before a major version update, make a copy of this directory. (We like to -keep the old version around for a short time after major updates.) Add a -top-level attribute to `top-level/all-packages.nix`. - -1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. -2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. - -*/ - -{ - newScope, - stdenv, fetchurl, fetchpatch, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, libGL, perl, - gstreamer, gst-plugins-base, gtk3, dconf, - - # options - developerBuild ? false, - decryptSslTraffic ? false, - debug ? false, -}: - -with stdenv.lib; - -let - - qtCompatVersion = srcs.qtbase.version; - - mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; - - patches = { - qtbase = [ - ./qtbase.patch - ./qtbase-fixguicmake.patch - ./qtbase-openssl_1_1.patch - ]; - qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ - ./qtscript.patch - # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196 - # fixed in qtscript 5.12.2 - (fetchpatch { - url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff"; - sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi"; - }) - ]; - qtserialport = [ ./qtserialport.patch ]; - qttools = [ ./qttools.patch ]; - qtwebengine = [ - ./qtwebengine-no-build-skip.patch - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 - # https://bugreports.qt.io/browse/QTBUG-77037 - (fetchpatch { - name = "fix-build-with-pulseaudio-13.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; - sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; - }) - ] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - - qtwebkit = [ ./qtwebkit.patch ]; - qtvirtualkeyboard = [ - (fetchpatch { - name = "CVE-2018-19865-A.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=61780a113f02b3c62fb14516fe8ea47d91f9ed9a"; - sha256 = "0jd4nzaz9ndm9ryvrkav7kjs437l661288diklhbmgh249f8gki0"; - }) - (fetchpatch { - name = "CVE-2018-19865-B.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c0ac7a4c684e2fed60a72ceee53da89eea3f95a7"; - sha256 = "0yvxrx5vx6845vgnq8ml3q93y61py5j0bvhqj7nqvpbmyj1wy1p3"; - - }) - (fetchpatch { - name = "CVE-2018-19865-C.patch"; - url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=a2e7b8412f56841e12ed20a39f4a38e32d3c1e30"; - sha256 = "1yijysa9gy5xbxndx5ri0dkfrjqja0d1bsx52qz4mhzi4pkbib02"; - }) - ]; - - }; - - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit (stdenv) lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; - - addPackages = self: with self; - let - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; - in { - - mkDerivationWith = - import ../mkDerivation.nix - { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; - - mkDerivation = mkDerivationWith stdenv.mkDerivation; - - qtbase = callPackage ../modules/qtbase.nix { - inherit (srcs.qtbase) src version; - patches = patches.qtbase; - inherit bison cups harfbuzz libGL; - withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; - }; - - qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; - qtdoc = callPackage ../modules/qtdoc.nix {}; - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; - qtimageformats = callPackage ../modules/qtimageformats.nix {}; - qtlocation = callPackage ../modules/qtlocation.nix {}; - qtmacextras = callPackage ../modules/qtmacextras.nix {}; - qtmultimedia = callPackage ../modules/qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; - qtquick1 = null; - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; - qtscript = callPackage ../modules/qtscript.nix {}; - qtsensors = callPackage ../modules/qtsensors.nix {}; - qtserialport = callPackage ../modules/qtserialport.nix {}; - qtsvg = callPackage ../modules/qtsvg.nix {}; - qttools = callPackage ../modules/qttools.nix {}; - qttranslations = callPackage ../modules/qttranslations.nix {}; - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; - qtwayland = callPackage ../modules/qtwayland.nix {}; - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix {}; - qtwebkit = callPackage ../modules/qtwebkit.nix {}; - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; - qtx11extras = callPackage ../modules/qtx11extras.nix {}; - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 - qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtx11extras qtxmlpatterns - ] ++ optional (!stdenv.isDarwin) qtwayland - ++ optional (stdenv.isDarwin) qtmacextras); - - qmake = makeSetupHook { - deps = [ self.qtbase.dev ]; - substitutions = { - fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; - }; - } ../hooks/qmake-hook.sh; - - wrapQtAppsHook = makeSetupHook { - deps = - [ self.qtbase.dev makeWrapper ] - ++ optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; - }; - - self = makeScope newScope addPackages; - -in self diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh deleted file mode 100644 index 17ebe1e532dff..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch deleted file mode 100644 index 8b46d432812a8..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 0bbc871..3673634 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -286,7 +286,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}) - -- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"${PLUGIN_LOCATION}\") - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 5baf0fd..3583745 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -2,10 +2,10 @@ - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch deleted file mode 100644 index d5f4d7527cb4e..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch +++ /dev/null @@ -1,3985 +0,0 @@ -commit 2d88fc0ce4ac76924a65ffd797183de9422ba672 -Author: Andreas Rammhold <andreas@rammhold.de> -Date: Wed Mar 6 00:18:51 2019 +0100 - - openssl1.1 compat - -diff --git a/config.tests/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp -index 6c8a9e8f19..d33b62389c 100644 ---- a/config.tests/openssl/openssl.cpp -+++ b/config.tests/openssl/openssl.cpp -@@ -39,8 +39,8 @@ - - #include <openssl/opensslv.h> - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL || OPENSSL_VERSION_NUMBER-0 >= 0x10100000L --# error "OpenSSL >= 0.9.7, and < 1.1.0 is required" -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL -+# error "OpenSSL >= 0.9.7 is required" - #endif - - #include <openssl/ssl.h> -diff --git a/config.tests/openssl11/openssl.cpp b/config.tests/openssl11/openssl.cpp -new file mode 100644 -index 0000000000..c20cc59deb ---- /dev/null -+++ b/config.tests/openssl11/openssl.cpp -@@ -0,0 +1,48 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the config.tests of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include <openssl/opensslv.h> -+ -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -+# error "OpenSSL >= 1.1 is required" -+#endif -+ -+int main() -+{ -+} -diff --git a/config.tests/openssl11/openssl11.pro b/config.tests/openssl11/openssl11.pro -new file mode 100644 -index 0000000000..a023aee4aa ---- /dev/null -+++ b/config.tests/openssl11/openssl11.pro -@@ -0,0 +1,2 @@ -+SOURCES = openssl.cpp -+CONFIG -= x11 qt -diff --git a/src/network/configure.json b/src/network/configure.json -index 2cf90ed94b..a021c0734b 100644 ---- a/src/network/configure.json -+++ b/src/network/configure.json -@@ -77,6 +77,17 @@ - }, - { "libs": "-lssl -lcrypto", "condition": "!config.win32" } - ] -+ }, -+ "openssl11": { -+ "label": "OpenSSL v. 1.1 support", -+ "type": "compile", -+ "test": "openssl11", -+ "sources": [ -+ { -+ "comment": "placeholder for OPENSSL_PATH", -+ "libs": "" -+ } -+ ] - } - }, - -@@ -182,7 +193,7 @@ - "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", - "disable": "input.openssl == 'no' || input.ssl == 'no'", - "autoDetect": "!config.winrt", -- "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)", -+ "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers || feature.opensslv11)", - "output": [ - "privateFeature", - { "type": "publicQtConfig", "condition": "!features.openssl-linked" }, -@@ -193,7 +204,7 @@ - "label": " Qt directly linked to OpenSSL", - "enable": "input.openssl == 'linked'", - "disable": "input.openssl != 'linked'", -- "condition": "!features.securetransport && libs.openssl", -+ "condition": "!features.securetransport && (libs.openssl || feature.opensslv11)", - "output": [ - "privateFeature", - { "type": "define", "name": "QT_LINKED_OPENSSL" } -@@ -213,6 +224,11 @@ - "condition": "config.winrt || features.securetransport || features.openssl", - "output": [ "publicFeature", "feature" ] - }, -+ "opensslv11": { -+ "label": "OpenSSL v. 1.1", -+ "condition": "libs.openssl11", -+ "output": ["publicFeature", "feature"] -+ }, - "sctp": { - "label": "SCTP", - "autoDetect": false, -diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp -index 28b7eda54a..71e514a025 100644 ---- a/src/network/ssl/qsslcertificate_openssl.cpp -+++ b/src/network/ssl/qsslcertificate_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -64,12 +65,14 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const - uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW - { - if (X509 * const x509 = key.d->x509) { -- (void)q_X509_cmp(x509, x509); // populate x509->sha1_hash -- // (if someone knows a better way...) -- return qHashBits(x509->sha1_hash, SHA_DIGEST_LENGTH, seed); -- } else { -- return seed; -+ const EVP_MD *sha1 = q_EVP_sha1(); -+ unsigned int len = 0; -+ unsigned char md[EVP_MAX_MD_SIZE]; -+ q_X509_digest(x509, sha1, md, &len); -+ return qHashBits(md, len, seed); - } -+ -+ return seed; - } - - bool QSslCertificate::isNull() const -@@ -89,8 +92,7 @@ QByteArray QSslCertificate::version() const - { - QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); - if (d->versionString.isEmpty() && d->x509) -- d->versionString = -- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1); -+ d->versionString = QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1); - - return d->versionString; - } -@@ -99,7 +101,7 @@ QByteArray QSslCertificate::serialNumber() const - { - QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); - if (d->serialNumberString.isEmpty() && d->x509) { -- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber; -+ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509); - QByteArray hexString; - hexString.reserve(serialNumber->length * 3); - for (int a = 0; a < serialNumber->length; ++a) { -@@ -199,14 +201,15 @@ QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlter - continue; - } - -- const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5)); -+ const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(genName->d.ia5)); - const QString altName = QString::fromLatin1(altNameStr, len); - if (genName->type == GEN_DNS) - result.insert(QSsl::DnsEntry, altName); - else if (genName->type == GEN_EMAIL) - result.insert(QSsl::EmailEntry, altName); - } -- q_sk_pop_free((STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_sk_free)); -+ -+ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_OPENSSL_sk_free)); - } - - return result; -@@ -235,25 +238,26 @@ QSslKey QSslCertificate::publicKey() const - QSslKey key; - - key.d->type = QSsl::PublicKey; -- X509_PUBKEY *xkey = d->x509->cert_info->key; -- EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey); -+ -+ EVP_PKEY *pkey = q_X509_get_pubkey(d->x509); - Q_ASSERT(pkey); -+ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); - -- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) { -+ if (keyType == EVP_PKEY_RSA) { - key.d->rsa = q_EVP_PKEY_get1_RSA(pkey); - key.d->algorithm = QSsl::Rsa; - key.d->isNull = false; -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { -+ } else if (keyType == EVP_PKEY_DSA) { - key.d->dsa = q_EVP_PKEY_get1_DSA(pkey); - key.d->algorithm = QSsl::Dsa; - key.d->isNull = false; - #ifndef OPENSSL_NO_EC -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_EC) { -+ } else if (keyType == EVP_PKEY_EC) { - key.d->ec = q_EVP_PKEY_get1_EC_KEY(pkey); - key.d->algorithm = QSsl::Ec; - key.d->isNull = false; - #endif -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) { -+ } else if (keyType == EVP_PKEY_DH) { - // DH unsupported - } else { - // error? -@@ -275,7 +279,7 @@ static QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext) - X509V3_EXT_METHOD *meth = const_cast<X509V3_EXT_METHOD *>(q_X509V3_EXT_get(ext)); - if (!meth) { - ASN1_OCTET_STRING *value = q_X509_EXTENSION_get_data(ext); -- QByteArray result( reinterpret_cast<const char *>(q_ASN1_STRING_data(value)), -+ QByteArray result( reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(value)), - q_ASN1_STRING_length(value)); - return result; - } -@@ -371,7 +375,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) - continue; - } - -- const char *uriStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(name->d.uniformResourceIdentifier)); -+ const char *uriStr = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(name->d.uniformResourceIdentifier)); - const QString uri = QString::fromUtf8(uriStr, len); - - result[QString::fromUtf8(QSslCertificatePrivate::asn1ObjectName(ad->method))] = uri; -@@ -380,11 +384,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- q_sk_pop_free((_STACK*)info, reinterpret_cast<void(*)(void*)>(q_sk_free)); --#else -- q_sk_pop_free((STACK*)info, reinterpret_cast<void(*)(void*)>(q_sk_free)); --#endif -+ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)info, reinterpret_cast<void(*)(void *)>(q_OPENSSL_sk_free)); - return result; - } - break; -@@ -607,7 +607,11 @@ static QMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) - unsigned char *data = 0; - int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info.insertMulti(name, QString::fromUtf8((char*)data, size)); -+#if QT_CONFIG(opensslv11) -+ q_CRYPTO_free(data, 0, 0); -+#else - q_CRYPTO_free(data); -+#endif - } - - return info; -@@ -619,8 +623,9 @@ QSslCertificate QSslCertificatePrivate::QSslCertificate_from_X509(X509 *x509) - if (!x509 || !QSslSocket::supportsSsl()) - return certificate; - -- ASN1_TIME *nbef = q_X509_get_notBefore(x509); -- ASN1_TIME *naft = q_X509_get_notAfter(x509); -+ ASN1_TIME *nbef = q_X509_getm_notBefore(x509); -+ ASN1_TIME *naft = q_X509_getm_notAfter(x509); -+ - certificate.d->notValidBefore = q_getTimeFromASN1(nbef); - certificate.d->notValidAfter = q_getTimeFromASN1(naft); - certificate.d->null = false; -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index c92d8fc3f8..cef503710c 100644 ---- a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. - ** Copyright (C) 2014 Governikus GmbH & Co. KG. - ** Contact: https://www.qt.io/licensing/ -@@ -41,22 +41,14 @@ - - - #include <QtNetwork/qsslsocket.h> --#include <QtNetwork/qssldiffiehellmanparameters.h> --#include <QtCore/qmutex.h> - - #include "private/qssl_p.h" - #include "private/qsslcontext_openssl_p.h" --#include "private/qsslsocket_p.h" - #include "private/qsslsocket_openssl_p.h" - #include "private/qsslsocket_openssl_symbols_p.h" --#include "private/qssldiffiehellmanparameters_p.h" - - QT_BEGIN_NAMESPACE - --// defined in qsslsocket_openssl.cpp: --extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); --extern QString getErrorsFromOpenSsl(); -- - QSslContext::QSslContext() - : ctx(0), - pkey(0), -@@ -78,301 +70,6 @@ QSslContext::~QSslContext() - q_SSL_SESSION_free(session); - } - --static inline QString msgErrorSettingEllipticCurves(const QString &why) --{ -- return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); --} -- --// static --void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) --{ -- sslContext->sslConfiguration = configuration; -- sslContext->errorCode = QSslError::NoError; -- -- bool client = (mode == QSslSocket::SslClientMode); -- -- bool reinitialized = false; -- bool unsupportedProtocol = false; --init_context: -- switch (sslContext->sslConfiguration.protocol()) { -- case QSsl::SslV2: --#ifndef OPENSSL_NO_SSL2 -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); --#else -- // SSL 2 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::SslV3: --#ifndef OPENSSL_NO_SSL3_METHOD -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); --#else -- // SSL 3 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::SecureProtocols: -- // SSLv2 and SSLv3 will be disabled by SSL options -- // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. -- case QSsl::TlsV1SslV3: -- // SSLv2 will will be disabled by SSL options -- case QSsl::AnyProtocol: -- default: -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -- break; -- case QSsl::TlsV1_0: -- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); -- break; -- case QSsl::TlsV1_1: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); --#else -- // TLS 1.1 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::TlsV1_2: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); --#else -- // TLS 1.2 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::TlsV1_0OrLater: -- // Specific protocols will be specified via SSL options. -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -- break; -- case QSsl::TlsV1_1OrLater: -- case QSsl::TlsV1_2OrLater: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- // Specific protocols will be specified via SSL options. -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); --#else -- // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- } -- -- if (!sslContext->ctx) { -- // After stopping Flash 10 the SSL library looses its ciphers. Try re-adding them -- // by re-initializing the library. -- if (!reinitialized) { -- reinitialized = true; -- if (q_SSL_library_init() == 1) -- goto init_context; -- } -- -- sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( -- unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() -- ); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- // Enable bug workarounds. -- long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); -- q_SSL_CTX_set_options(sslContext->ctx, options); -- --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- // Tell OpenSSL to release memory early -- // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html -- if (q_SSLeay() >= 0x10000000L) -- q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); --#endif -- -- // Initialize ciphers -- QByteArray cipherString; -- bool first = true; -- QList<QSslCipher> ciphers = sslContext->sslConfiguration.ciphers(); -- if (ciphers.isEmpty()) -- ciphers = QSslSocketPrivate::defaultCiphers(); -- for (const QSslCipher &cipher : qAsConst(ciphers)) { -- if (first) -- first = false; -- else -- cipherString.append(':'); -- cipherString.append(cipher.name().toLatin1()); -- } -- -- if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { -- sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- const QDateTime now = QDateTime::currentDateTimeUtc(); -- -- // Add all our CAs to this store. -- const auto caCertificates = sslContext->sslConfiguration.caCertificates(); -- for (const QSslCertificate &caCertificate : caCertificates) { -- // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: -- // -- // If several CA certificates matching the name, key identifier, and -- // serial number condition are available, only the first one will be -- // examined. This may lead to unexpected results if the same CA -- // certificate is available with different expiration dates. If a -- // ``certificate expired'' verification error occurs, no other -- // certificate will be searched. Make sure to not have expired -- // certificates mixed with valid ones. -- // -- // See also: QSslSocketBackendPrivate::verify() -- if (caCertificate.expiryDate() >= now) { -- q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); -- } -- } -- -- if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { -- // tell OpenSSL the directories where to look up the root certs on demand -- const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); -- for (const QByteArray &unixDir : unixDirs) -- q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData()); -- } -- -- if (!sslContext->sslConfiguration.localCertificate().isNull()) { -- // Require a private key as well. -- if (sslContext->sslConfiguration.privateKey().isNull()) { -- sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- // Load certificate -- if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { -- sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { -- sslContext->pkey = reinterpret_cast<EVP_PKEY *>(configuration.d->privateKey.handle()); -- } else { -- // Load private key -- sslContext->pkey = q_EVP_PKEY_new(); -- // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. -- // this lead to a memory leak. Now we use the *_set1_* functions which do not -- // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. -- if (configuration.d->privateKey.algorithm() == QSsl::Rsa) -- q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast<RSA *>(configuration.d->privateKey.handle())); -- else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) -- q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast<DSA *>(configuration.d->privateKey.handle())); --#ifndef OPENSSL_NO_EC -- else if (configuration.d->privateKey.algorithm() == QSsl::Ec) -- q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast<EC_KEY *>(configuration.d->privateKey.handle())); --#endif -- } -- -- if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { -- sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) -- sslContext->pkey = 0; // Don't free the private key, it belongs to QSslKey -- -- // Check if the certificate matches the private key. -- if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { -- sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- // If we have any intermediate certificates then we need to add them to our chain -- bool first = true; -- for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { -- if (first) { -- first = false; -- continue; -- } -- q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, -- q_X509_dup(reinterpret_cast<X509 *>(cert.handle()))); -- } -- } -- -- // Initialize peer verification. -- if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { -- q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, 0); -- } else { -- q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); -- } -- -- // Set verification depth. -- if (sslContext->sslConfiguration.peerVerifyDepth() != 0) -- q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); -- -- // set persisted session if the user set it -- if (!configuration.sessionTicket().isEmpty()) -- sslContext->setSessionASN1(configuration.sessionTicket()); -- -- // Set temp DH params -- QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); -- -- if (!dhparams.isValid()) { -- sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- if (!dhparams.isEmpty()) { -- const QByteArray ¶ms = dhparams.d->derData; -- const char *ptr = params.constData(); -- DH *dh = q_d2i_DHparams(NULL, reinterpret_cast<const unsigned char **>(&ptr), params.length()); -- if (dh == NULL) -- qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); -- q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); -- q_DH_free(dh); -- } -- --#ifndef OPENSSL_NO_EC --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) { -- q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); -- } else --#endif -- { -- // Set temp ECDH params -- EC_KEY *ecdh = 0; -- ecdh = q_EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); -- q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh); -- q_EC_KEY_free(ecdh); -- } --#endif // OPENSSL_NO_EC -- --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -- if (!client) -- q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); --#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -- -- const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); -- if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -- // Set the curves to be used -- if (q_SSLeay() >= 0x10002000L) { -- // SSL_CTX_ctrl wants a non-const pointer as last argument, -- // but let's avoid a copy into a temporary array -- if (!q_SSL_CTX_ctrl(sslContext->ctx, -- SSL_CTRL_SET_CURVES, -- qcurves.size(), -- const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())))) { -- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- } -- } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -- { -- // specific curves requested, but not possible to set -> error -- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -- sslContext->errorCode = QSslError::UnspecifiedError; -- } -- } --} -- - QSslContext* QSslContext::fromConfiguration(QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) - { - QSslContext *sslContext = new QSslContext(); -@@ -463,7 +160,7 @@ SSL* QSslContext::createSsl() - m_npnContext.len = m_supportedNPNVersions.count(); - m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone; - #if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) { -+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - // Callback's type has a parameter 'const unsigned char ** out' - // since it was introduced in 1.0.2. Internally, OpenSSL's own code - // (tests/examples) cast it to unsigned char * (since it's 'out'). -@@ -508,7 +205,7 @@ bool QSslContext::cacheSession(SSL* ssl) - unsigned char *data = reinterpret_cast<unsigned char *>(m_sessionASN1.data()); - if (!q_i2d_SSL_SESSION(session, &data)) - qCWarning(lcSsl, "could not store persistent version of SSL session"); -- m_sessionTicketLifeTimeHint = session->tlsext_tick_lifetime_hint; -+ m_sessionTicketLifeTimeHint = q_SSL_SESSION_get_ticket_lifetime_hint(session); - } - } - -diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp -new file mode 100644 -index 0000000000..787b6ae3f5 ---- /dev/null -+++ b/src/network/ssl/qsslcontext_openssl11.cpp -@@ -0,0 +1,277 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2014 Governikus GmbH & Co. KG. -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+ -+#include <QtNetwork/qsslsocket.h> -+#include <QtNetwork/qssldiffiehellmanparameters.h> -+ -+#include "private/qssl_p.h" -+#include "private/qsslcontext_openssl_p.h" -+#include "private/qsslsocket_p.h" -+#include "private/qsslsocket_openssl_p.h" -+#include "private/qsslsocket_openssl_symbols_p.h" -+#include "private/qssldiffiehellmanparameters_p.h" -+ -+#include <vector> -+ -+QT_BEGIN_NAMESPACE -+ -+// defined in qsslsocket_openssl.cpp: -+extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); -+extern QString getErrorsFromOpenSsl(); -+ -+static inline QString msgErrorSettingEllipticCurves(const QString &why) -+{ -+ return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); -+} -+ -+// static -+void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) -+{ -+ sslContext->sslConfiguration = configuration; -+ sslContext->errorCode = QSslError::NoError; -+ -+ bool client = (mode == QSslSocket::SslClientMode); -+ -+ bool reinitialized = false; -+ bool unsupportedProtocol = false; -+init_context: -+ if (sslContext->sslConfiguration.protocol() == QSsl::SslV2) { -+ // SSL 2 is no longer supported, but chosen deliberately -> error -+ sslContext->ctx = nullptr; -+ unsupportedProtocol = true; -+ } else { -+ // The ssl options will actually control the supported methods -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLS_client_method() : q_TLS_server_method()); -+ } -+ -+ if (!sslContext->ctx) { -+ // After stopping Flash 10 the SSL library loses its ciphers. Try re-adding them -+ // by re-initializing the library. -+ if (!reinitialized) { -+ reinitialized = true; -+ if (q_OPENSSL_init_ssl(0, nullptr) == 1) -+ goto init_context; -+ } -+ -+ sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( -+ unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() -+ ); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Enable bug workarounds. -+ long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); -+ q_SSL_CTX_set_options(sslContext->ctx, options); -+ -+ // Tell OpenSSL to release memory early -+ // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html -+ q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); -+ -+ // Initialize ciphers -+ QByteArray cipherString; -+ bool first = true; -+ QList<QSslCipher> ciphers = sslContext->sslConfiguration.ciphers(); -+ if (ciphers.isEmpty()) -+ ciphers = QSslSocketPrivate::defaultCiphers(); -+ for (const QSslCipher &cipher : qAsConst(ciphers)) { -+ if (first) -+ first = false; -+ else -+ cipherString.append(':'); -+ cipherString.append(cipher.name().toLatin1()); -+ } -+ -+ if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { -+ sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ const QDateTime now = QDateTime::currentDateTimeUtc(); -+ -+ // Add all our CAs to this store. -+ const auto caCertificates = sslContext->sslConfiguration.caCertificates(); -+ for (const QSslCertificate &caCertificate : caCertificates) { -+ // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: -+ // -+ // If several CA certificates matching the name, key identifier, and -+ // serial number condition are available, only the first one will be -+ // examined. This may lead to unexpected results if the same CA -+ // certificate is available with different expiration dates. If a -+ // ``certificate expired'' verification error occurs, no other -+ // certificate will be searched. Make sure to not have expired -+ // certificates mixed with valid ones. -+ // -+ // See also: QSslSocketBackendPrivate::verify() -+ if (caCertificate.expiryDate() >= now) { -+ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); -+ } -+ } -+ -+ if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { -+ // tell OpenSSL the directories where to look up the root certs on demand -+ const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); -+ for (const QByteArray &unixDir : unixDirs) -+ q_SSL_CTX_load_verify_locations(sslContext->ctx, nullptr, unixDir.constData()); -+ } -+ -+ if (!sslContext->sslConfiguration.localCertificate().isNull()) { -+ // Require a private key as well. -+ if (sslContext->sslConfiguration.privateKey().isNull()) { -+ sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Load certificate -+ if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { -+ sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { -+ sslContext->pkey = reinterpret_cast<EVP_PKEY *>(configuration.d->privateKey.handle()); -+ } else { -+ // Load private key -+ sslContext->pkey = q_EVP_PKEY_new(); -+ // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. -+ // this lead to a memory leak. Now we use the *_set1_* functions which do not -+ // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. -+ if (configuration.d->privateKey.algorithm() == QSsl::Rsa) -+ q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast<RSA *>(configuration.d->privateKey.handle())); -+ else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) -+ q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast<DSA *>(configuration.d->privateKey.handle())); -+#ifndef OPENSSL_NO_EC -+ else if (configuration.d->privateKey.algorithm() == QSsl::Ec) -+ q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast<EC_KEY *>(configuration.d->privateKey.handle())); -+#endif -+ } -+ -+ if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { -+ sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) -+ sslContext->pkey = nullptr; // Don't free the private key, it belongs to QSslKey -+ -+ // Check if the certificate matches the private key. -+ if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { -+ sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // If we have any intermediate certificates then we need to add them to our chain -+ bool first = true; -+ for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { -+ if (first) { -+ first = false; -+ continue; -+ } -+ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, -+ q_X509_dup(reinterpret_cast<X509 *>(cert.handle()))); -+ } -+ } -+ -+ // Initialize peer verification. -+ if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, nullptr); -+ } else { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); -+ } -+ -+ // Set verification depth. -+ if (sslContext->sslConfiguration.peerVerifyDepth() != 0) -+ q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); -+ -+ // set persisted session if the user set it -+ if (!configuration.sessionTicket().isEmpty()) -+ sslContext->setSessionASN1(configuration.sessionTicket()); -+ -+ // Set temp DH params -+ QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); -+ -+ if (!dhparams.isValid()) { -+ sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (!dhparams.isEmpty()) { -+ const QByteArray ¶ms = dhparams.d->derData; -+ const char *ptr = params.constData(); -+ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast<const unsigned char **>(&ptr), params.length()); -+ if (dh == NULL) -+ qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); -+ q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); -+ q_DH_free(dh); -+ } -+ -+#ifndef OPENSSL_NO_PSK -+ if (!client) -+ q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); -+#endif // !OPENSSL_NO_PSK -+ -+ const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); -+ if (!qcurves.isEmpty()) { -+#ifdef OPENSSL_NO_EC -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version with disabled elliptic curves")); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+#else -+ // Set the curves to be used. -+ std::vector<int> curves; -+ curves.reserve(qcurves.size()); -+ for (const auto &sslCurve : qcurves) -+ curves.push_back(sslCurve.id); -+ if (!q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_CURVES, long(curves.size()), &curves[0])) { -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ } -+#endif -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/src/network/ssl/qsslcontext_opensslpre11.cpp b/src/network/ssl/qsslcontext_opensslpre11.cpp -new file mode 100644 -index 0000000000..9c01c2f2dc ---- /dev/null -+++ b/src/network/ssl/qsslcontext_opensslpre11.cpp -@@ -0,0 +1,354 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2014 Governikus GmbH & Co. KG. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+ -+#include <QtNetwork/qsslsocket.h> -+#include <QtNetwork/qssldiffiehellmanparameters.h> -+ -+#include "private/qssl_p.h" -+#include "private/qsslcontext_openssl_p.h" -+#include "private/qsslsocket_p.h" -+#include "private/qsslsocket_openssl_p.h" -+#include "private/qsslsocket_openssl_symbols_p.h" -+#include "private/qssldiffiehellmanparameters_p.h" -+ -+QT_BEGIN_NAMESPACE -+ -+// defined in qsslsocket_openssl.cpp: -+extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); -+extern QString getErrorsFromOpenSsl(); -+ -+static inline QString msgErrorSettingEllipticCurves(const QString &why) -+{ -+ return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); -+} -+ -+// static -+void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) -+{ -+ sslContext->sslConfiguration = configuration; -+ sslContext->errorCode = QSslError::NoError; -+ -+ bool client = (mode == QSslSocket::SslClientMode); -+ -+ bool reinitialized = false; -+ bool unsupportedProtocol = false; -+init_context: -+ switch (sslContext->sslConfiguration.protocol()) { -+ case QSsl::SslV2: -+#ifndef OPENSSL_NO_SSL2 -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); -+#else -+ // SSL 2 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::SslV3: -+#ifndef OPENSSL_NO_SSL3_METHOD -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); -+#else -+ // SSL 3 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::SecureProtocols: -+ // SSLv2 and SSLv3 will be disabled by SSL options -+ // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. -+ case QSsl::TlsV1SslV3: -+ // SSLv2 will will be disabled by SSL options -+ case QSsl::AnyProtocol: -+ default: -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -+ break; -+ case QSsl::TlsV1_0: -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); -+ break; -+ case QSsl::TlsV1_1: -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); -+#else -+ // TLS 1.1 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::TlsV1_2: -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); -+#else -+ // TLS 1.2 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::TlsV1_0OrLater: -+ // Specific protocols will be specified via SSL options. -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -+ break; -+ case QSsl::TlsV1_1OrLater: -+ case QSsl::TlsV1_2OrLater: -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ // Specific protocols will be specified via SSL options. -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -+#else -+ // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ } -+ -+ if (!sslContext->ctx) { -+ // After stopping Flash 10 the SSL library loses its ciphers. Try re-adding them -+ // by re-initializing the library. -+ if (!reinitialized) { -+ reinitialized = true; -+ if (q_SSL_library_init() == 1) -+ goto init_context; -+ } -+ -+ sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( -+ unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() -+ ); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Enable bug workarounds. -+ long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); -+ q_SSL_CTX_set_options(sslContext->ctx, options); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ // Tell OpenSSL to release memory early -+ // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html -+ if (q_SSLeay() >= 0x10000000L) -+ q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); -+#endif -+ -+ // Initialize ciphers -+ QByteArray cipherString; -+ bool first = true; -+ QList<QSslCipher> ciphers = sslContext->sslConfiguration.ciphers(); -+ if (ciphers.isEmpty()) -+ ciphers = QSslSocketPrivate::defaultCiphers(); -+ for (const QSslCipher &cipher : qAsConst(ciphers)) { -+ if (first) -+ first = false; -+ else -+ cipherString.append(':'); -+ cipherString.append(cipher.name().toLatin1()); -+ } -+ -+ if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { -+ sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ const QDateTime now = QDateTime::currentDateTimeUtc(); -+ -+ // Add all our CAs to this store. -+ const auto caCertificates = sslContext->sslConfiguration.caCertificates(); -+ for (const QSslCertificate &caCertificate : caCertificates) { -+ // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: -+ // -+ // If several CA certificates matching the name, key identifier, and -+ // serial number condition are available, only the first one will be -+ // examined. This may lead to unexpected results if the same CA -+ // certificate is available with different expiration dates. If a -+ // ``certificate expired'' verification error occurs, no other -+ // certificate will be searched. Make sure to not have expired -+ // certificates mixed with valid ones. -+ // -+ // See also: QSslSocketBackendPrivate::verify() -+ if (caCertificate.expiryDate() >= now) { -+ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); -+ } -+ } -+ -+ if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { -+ // tell OpenSSL the directories where to look up the root certs on demand -+ const QList<QByteArray> unixDirs = QSslSocketPrivate::unixRootCertDirectories(); -+ for (const QByteArray &unixDir : unixDirs) -+ q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData()); -+ } -+ -+ if (!sslContext->sslConfiguration.localCertificate().isNull()) { -+ // Require a private key as well. -+ if (sslContext->sslConfiguration.privateKey().isNull()) { -+ sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Load certificate -+ if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { -+ sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { -+ sslContext->pkey = reinterpret_cast<EVP_PKEY *>(configuration.d->privateKey.handle()); -+ } else { -+ // Load private key -+ sslContext->pkey = q_EVP_PKEY_new(); -+ // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. -+ // this lead to a memory leak. Now we use the *_set1_* functions which do not -+ // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. -+ if (configuration.d->privateKey.algorithm() == QSsl::Rsa) -+ q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast<RSA *>(configuration.d->privateKey.handle())); -+ else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) -+ q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast<DSA *>(configuration.d->privateKey.handle())); -+#ifndef OPENSSL_NO_EC -+ else if (configuration.d->privateKey.algorithm() == QSsl::Ec) -+ q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast<EC_KEY *>(configuration.d->privateKey.handle())); -+#endif -+ } -+ -+ if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { -+ sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) -+ sslContext->pkey = 0; // Don't free the private key, it belongs to QSslKey -+ -+ // Check if the certificate matches the private key. -+ if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { -+ sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // If we have any intermediate certificates then we need to add them to our chain -+ bool first = true; -+ for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { -+ if (first) { -+ first = false; -+ continue; -+ } -+ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, -+ q_X509_dup(reinterpret_cast<X509 *>(cert.handle()))); -+ } -+ } -+ -+ // Initialize peer verification. -+ if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, 0); -+ } else { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); -+ } -+ -+ // Set verification depth. -+ if (sslContext->sslConfiguration.peerVerifyDepth() != 0) -+ q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); -+ -+ // set persisted session if the user set it -+ if (!configuration.sessionTicket().isEmpty()) -+ sslContext->setSessionASN1(configuration.sessionTicket()); -+ -+ // Set temp DH params -+ QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); -+ -+ if (!dhparams.isValid()) { -+ sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (!dhparams.isEmpty()) { -+ const QByteArray ¶ms = dhparams.d->derData; -+ const char *ptr = params.constData(); -+ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast<const unsigned char **>(&ptr), params.length()); -+ if (dh == NULL) -+ qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); -+ q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); -+ q_DH_free(dh); -+ } -+ -+#ifndef OPENSSL_NO_EC -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L) { -+ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); -+ } else -+#endif -+ { -+ // Set temp ECDH params -+ EC_KEY *ecdh = 0; -+ ecdh = q_EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); -+ q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh); -+ q_EC_KEY_free(ecdh); -+ } -+#endif // OPENSSL_NO_EC -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+ if (!client) -+ q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); -+#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+ -+ const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); -+ if (!qcurves.isEmpty()) { -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+ // Set the curves to be used -+ if (q_SSLeay() >= 0x10002000L) { -+ // SSL_CTX_ctrl wants a non-const pointer as last argument, -+ // but let's avoid a copy into a temporary array -+ if (!q_SSL_CTX_ctrl(sslContext->ctx, -+ SSL_CTRL_SET_CURVES, -+ qcurves.size(), -+ const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())))) { -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ } -+ } else -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+ { -+ // specific curves requested, but not possible to set -> error -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ } -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp -index 90687b05c5..5ebad822f1 100644 ---- a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp -+++ b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2015 Mikkel Krautz <mikkel@krautz.dk> -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -50,8 +51,8 @@ - #include <QtCore/qdebug.h> - #endif - --// For q_BN_is_word. - #include <openssl/bn.h> -+#include <openssl/dh.h> - - QT_BEGIN_NAMESPACE - -@@ -62,13 +63,6 @@ static bool isSafeDH(DH *dh) - - QSslSocketPrivate::ensureInitialized(); - -- // Mark p < 1024 bits as unsafe. -- if (q_BN_num_bits(dh->p) < 1024) { -- return false; -- } -- -- if (q_DH_check(dh, &status) != 1) -- return false; - - // From https://wiki.openssl.org/index.php/Diffie-Hellman_parameters: - // -@@ -81,11 +75,39 @@ static bool isSafeDH(DH *dh) - // Without the test, the IETF parameters would - // fail validation. For details, see Diffie-Hellman - // Parameter Check (when g = 2, must p mod 24 == 11?). -+#if QT_CONFIG(opensslv11) -+ // Mark p < 1024 bits as unsafe. -+ if (q_DH_bits(dh) < 1024) -+ return false; -+ -+ if (q_DH_check(dh, &status) != 1) -+ return false; -+ -+ const BIGNUM *p = nullptr; -+ const BIGNUM *q = nullptr; -+ const BIGNUM *g = nullptr; -+ q_DH_get0_pqg(dh, &p, &q, &g); -+ -+ if (q_BN_is_word(const_cast<BIGNUM *>(g), DH_GENERATOR_2)) { -+ long residue = q_BN_mod_word(p, 24); -+ if (residue == 11 || residue == 23) -+ status &= ~DH_NOT_SUITABLE_GENERATOR; -+ } -+ -+#else -+ // Mark p < 1024 bits as unsafe. -+ if (q_BN_num_bits(dh->p) < 1024) -+ return false; -+ -+ if (q_DH_check(dh, &status) != 1) -+ return false; -+ - if (q_BN_is_word(dh->g, DH_GENERATOR_2)) { - long residue = q_BN_mod_word(dh->p, 24); - if (residue == 11 || residue == 23) - status &= ~DH_NOT_SUITABLE_GENERATOR; - } -+#endif - - bad |= DH_CHECK_P_NOT_PRIME; - bad |= DH_CHECK_P_NOT_SAFE_PRIME; -diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h -index 231566063e..57dda19bad 100644 ---- a/src/network/ssl/qsslellipticcurve.h -+++ b/src/network/ssl/qsslellipticcurve.h -@@ -80,6 +80,7 @@ private: - friend Q_DECL_CONSTEXPR bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed) Q_DECL_NOTHROW; - -+ friend class QSslContext; - friend class QSslSocketPrivate; - friend class QSslSocketBackendPrivate; - }; -diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp -index e18197b703..8cd14837f0 100644 ---- a/src/network/ssl/qsslellipticcurve_openssl.cpp -+++ b/src/network/ssl/qsslellipticcurve_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2014 Governikus GmbH & Co. KG. -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -78,17 +79,18 @@ QSslEllipticCurve QSslEllipticCurve::fromShortName(const QString &name) - QSslEllipticCurve result; - - #ifndef OPENSSL_NO_EC -- const QByteArray curveNameLatin1 = name.toLatin1(); - -+ const QByteArray curveNameLatin1 = name.toLatin1(); - int nid = q_OBJ_sn2nid(curveNameLatin1.data()); - - #if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (nid == 0 && q_SSLeay() >= 0x10002000L) -+ if (nid == 0 && QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) - nid = q_EC_curve_nist2nid(curveNameLatin1.data()); - #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - - result.id = nid; --#endif -+ -+#endif // !OPENSSL_NO_EC - - return result; - } -diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp -index 26119023d1..2b03af9441 100644 ---- a/src/network/ssl/qsslkey_openssl.cpp -+++ b/src/network/ssl/qsslkey_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -87,33 +88,32 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey) - if (pkey == nullptr) - return false; - -- if (pkey->type == EVP_PKEY_RSA) { -+#if QT_CONFIG(opensslv11) -+ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); -+#else -+ const int keyType = pkey->type; -+#endif -+ if (keyType == EVP_PKEY_RSA) { - isNull = false; - algorithm = QSsl::Rsa; - type = QSsl::PrivateKey; - -- rsa = q_RSA_new(); -- memcpy(rsa, q_EVP_PKEY_get1_RSA(pkey), sizeof(RSA)); -- -+ rsa = q_EVP_PKEY_get1_RSA(pkey); - return true; -- } -- else if (pkey->type == EVP_PKEY_DSA) { -+ } else if (keyType == EVP_PKEY_DSA) { - isNull = false; - algorithm = QSsl::Dsa; - type = QSsl::PrivateKey; - -- dsa = q_DSA_new(); -- memcpy(dsa, q_EVP_PKEY_get1_DSA(pkey), sizeof(DSA)); -- -+ dsa = q_EVP_PKEY_get1_DSA(pkey); - return true; - } - #ifndef OPENSSL_NO_EC -- else if (pkey->type == EVP_PKEY_EC) { -+ else if (keyType == EVP_PKEY_EC) { - isNull = false; - algorithm = QSsl::Ec; - type = QSsl::PrivateKey; -- ec = q_EC_KEY_dup(q_EVP_PKEY_get1_EC_KEY(pkey)); -- -+ ec = q_EVP_PKEY_get1_EC_KEY(pkey); - return true; - } - #endif -@@ -181,8 +181,8 @@ int QSslKeyPrivate::length() const - return -1; - - switch (algorithm) { -- case QSsl::Rsa: return q_BN_num_bits(rsa->n); -- case QSsl::Dsa: return q_BN_num_bits(dsa->p); -+ case QSsl::Rsa: return q_RSA_bits(rsa); -+ case QSsl::Dsa: return q_DSA_bits(dsa); - #ifndef OPENSSL_NO_EC - case QSsl::Ec: return q_EC_GROUP_get_degree(q_EC_KEY_get0_group(ec)); - #endif -@@ -276,7 +276,13 @@ Qt::HANDLE QSslKeyPrivate::handle() const - - static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv, int enc) - { -- EVP_CIPHER_CTX ctx; -+#if QT_CONFIG(opensslv11) -+ EVP_CIPHER_CTX *ctx = q_EVP_CIPHER_CTX_new(); -+#else -+ EVP_CIPHER_CTX evpCipherContext; -+ EVP_CIPHER_CTX *ctx = &evpCipherContext; -+#endif -+ - const EVP_CIPHER* type = 0; - int i = 0, len = 0; - -@@ -294,21 +300,44 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, - - QByteArray output; - output.resize(data.size() + EVP_MAX_BLOCK_LENGTH); -- q_EVP_CIPHER_CTX_init(&ctx); -- q_EVP_CipherInit(&ctx, type, NULL, NULL, enc); -- q_EVP_CIPHER_CTX_set_key_length(&ctx, key.size()); -+ -+#if QT_CONFIG(opensslv11) -+ q_EVP_CIPHER_CTX_reset(ctx); -+#else -+ q_EVP_CIPHER_CTX_init(ctx); -+#endif -+ -+ q_EVP_CipherInit(ctx, type, NULL, NULL, enc); -+ q_EVP_CIPHER_CTX_set_key_length(ctx, key.size()); - if (cipher == QSslKeyPrivate::Rc2Cbc) -- q_EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), NULL); -- q_EVP_CipherInit(&ctx, NULL, -+ q_EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), NULL); -+ -+#if QT_CONFIG(opensslv11) -+ // EVP_CipherInit in 1.1 resets the context thus making the calls above useless. -+ // We call EVP_CipherInit_ex instead. -+ q_EVP_CipherInit_ex(ctx, nullptr, nullptr, -+ reinterpret_cast<const unsigned char *>(key.constData()), -+ reinterpret_cast<const unsigned char *>(iv.constData()), -+ enc); -+#else -+ q_EVP_CipherInit(ctx, NULL, - reinterpret_cast<const unsigned char *>(key.constData()), - reinterpret_cast<const unsigned char *>(iv.constData()), enc); -- q_EVP_CipherUpdate(&ctx, -+#endif // opensslv11 -+ -+ q_EVP_CipherUpdate(ctx, - reinterpret_cast<unsigned char *>(output.data()), &len, - reinterpret_cast<const unsigned char *>(data.constData()), data.size()); -- q_EVP_CipherFinal(&ctx, -+ q_EVP_CipherFinal(ctx, - reinterpret_cast<unsigned char *>(output.data()) + len, &i); - len += i; -- q_EVP_CIPHER_CTX_cleanup(&ctx); -+ -+#if QT_CONFIG(opensslv11) -+ q_EVP_CIPHER_CTX_reset(ctx); -+ q_EVP_CIPHER_CTX_free(ctx); -+#else -+ q_EVP_CIPHER_CTX_cleanup(ctx); -+#endif - - return output.left(len); - } -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index f5b493897e..45cea490fc 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 Governikus GmbH & Co. KG - ** Contact: https://www.qt.io/licensing/ - ** -@@ -97,70 +97,6 @@ bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; - int QSslSocketBackendPrivate::s_indexForSSLExtraData = -1; - #endif - --/* \internal -- -- From OpenSSL's thread(3) manual page: -- -- OpenSSL can safely be used in multi-threaded applications provided that at -- least two callback functions are set. -- -- locking_function(int mode, int n, const char *file, int line) is needed to -- perform locking on shared data structures. (Note that OpenSSL uses a -- number of global data structures that will be implicitly shared -- whenever multiple threads use OpenSSL.) Multi-threaded -- applications will crash at random if it is not set. ... -- ... -- id_function(void) is a function that returns a thread ID. It is not -- needed on Windows nor on platforms where getpid() returns a different -- ID for each thread (most notably Linux) --*/ --class QOpenSslLocks --{ --public: -- inline QOpenSslLocks() -- : initLocker(QMutex::Recursive), -- locksLocker(QMutex::Recursive) -- { -- QMutexLocker locker(&locksLocker); -- int numLocks = q_CRYPTO_num_locks(); -- locks = new QMutex *[numLocks]; -- memset(locks, 0, numLocks * sizeof(QMutex *)); -- } -- inline ~QOpenSslLocks() -- { -- QMutexLocker locker(&locksLocker); -- for (int i = 0; i < q_CRYPTO_num_locks(); ++i) -- delete locks[i]; -- delete [] locks; -- -- QSslSocketPrivate::deinitialize(); -- } -- inline QMutex *lock(int num) -- { -- QMutexLocker locker(&locksLocker); -- QMutex *tmp = locks[num]; -- if (!tmp) -- tmp = locks[num] = new QMutex(QMutex::Recursive); -- return tmp; -- } -- -- QMutex *globalLock() -- { -- return &locksLocker; -- } -- -- QMutex *initLock() -- { -- return &initLocker; -- } -- --private: -- QMutex initLocker; -- QMutex locksLocker; -- QMutex **locks; --}; --Q_GLOBAL_STATIC(QOpenSslLocks, openssl_locks) -- - QString QSslSocketBackendPrivate::getErrorsFromOpenSsl() - { - QString errorString; -@@ -175,20 +111,6 @@ QString QSslSocketBackendPrivate::getErrorsFromOpenSsl() - } - - extern "C" { --static void locking_function(int mode, int lockNumber, const char *, int) --{ -- QMutex *mutex = openssl_locks()->lock(lockNumber); -- -- // Lock or unlock it -- if (mode & CRYPTO_LOCK) -- mutex->lock(); -- else -- mutex->unlock(); --} --static unsigned long id_function() --{ -- return (quintptr)QThread::currentThreadId(); --} - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) - static unsigned int q_ssl_psk_client_callback(SSL *ssl, -@@ -227,7 +149,7 @@ QSslSocketBackendPrivate::~QSslSocketBackendPrivate() - destroySslContext(); - } - --QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher) -+QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher) - { - QSslCipher ciph; - -@@ -283,6 +205,7 @@ struct QSslErrorList - QMutex mutex; - QVector<QSslErrorEntry> errors; - }; -+ - Q_GLOBAL_STATIC(QSslErrorList, _q_sslErrorList) - - int q_X509Callback(int ok, X509_STORE_CTX *ctx) -@@ -312,7 +235,7 @@ int q_X509Callback(int ok, X509_STORE_CTX *ctx) - } - #endif - } -- // Always return OK to allow verification to continue. We're handle the -+ // Always return OK to allow verification to continue. We handle the - // errors gracefully after collecting all errors, after verification has - // completed. - return 1; -@@ -397,7 +320,7 @@ bool QSslSocketBackendPrivate::initSslContext() - if (configuration.protocol != QSsl::SslV2 && - configuration.protocol != QSsl::SslV3 && - configuration.protocol != QSsl::UnknownProtocol && -- mode == QSslSocket::SslClientMode && q_SSLeay() >= 0x00090806fL) { -+ mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryVersionNumber() >= 0x00090806fL) { - // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format. - QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName; - if (tlsHostName.isEmpty()) -@@ -438,13 +361,13 @@ bool QSslSocketBackendPrivate::initSslContext() - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L - // Save a pointer to this object into the SSL structure. -- if (q_SSLeay() >= 0x10001000L) -+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) - q_SSL_set_ex_data(ssl, s_indexForSSLExtraData, this); - #endif - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) - // Set the client callback for PSK -- if (q_SSLeay() >= 0x10001000L) { -+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) { - if (mode == QSslSocket::SslClientMode) - q_SSL_set_psk_client_callback(ssl, &q_ssl_psk_client_callback); - else if (mode == QSslSocket::SslServerMode) -@@ -464,16 +387,6 @@ void QSslSocketBackendPrivate::destroySslContext() - sslContextPointer.clear(); - } - --/*! -- \internal --*/ --void QSslSocketPrivate::deinitialize() --{ -- q_CRYPTO_set_id_callback(0); -- q_CRYPTO_set_locking_callback(0); -- q_ERR_free_strings(); --} -- - /*! - \internal - -@@ -486,91 +399,6 @@ bool QSslSocketPrivate::supportsSsl() - return ensureLibraryLoaded(); - } - --bool QSslSocketPrivate::ensureLibraryLoaded() --{ -- if (!q_resolveOpenSslSymbols()) -- return false; -- -- // Check if the library itself needs to be initialized. -- QMutexLocker locker(openssl_locks()->initLock()); -- -- if (!s_libraryLoaded) { -- s_libraryLoaded = true; -- -- // Initialize OpenSSL. -- q_CRYPTO_set_id_callback(id_function); -- q_CRYPTO_set_locking_callback(locking_function); -- if (q_SSL_library_init() != 1) -- return false; -- q_SSL_load_error_strings(); -- q_OpenSSL_add_all_algorithms(); -- --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- if (q_SSLeay() >= 0x10001000L) -- QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); --#endif -- -- // Initialize OpenSSL's random seed. -- if (!q_RAND_status()) { -- qWarning("Random number generator not seeded, disabling SSL support"); -- return false; -- } -- } -- return true; --} -- --void QSslSocketPrivate::ensureCiphersAndCertsLoaded() --{ -- QMutexLocker locker(openssl_locks()->initLock()); -- if (s_loadedCiphersAndCerts) -- return; -- s_loadedCiphersAndCerts = true; -- -- resetDefaultCiphers(); -- resetDefaultEllipticCurves(); -- --#if QT_CONFIG(library) -- //load symbols needed to receive certificates from system store --#if defined(Q_OS_WIN) -- HINSTANCE hLib = LoadLibraryW(L"Crypt32"); -- if (hLib) { -- ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); -- ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); -- ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); -- if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) -- qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen -- } else { -- qCWarning(lcSsl, "could not load crypt32 library"); // should never happen -- } --#elif defined(Q_OS_QNX) -- s_loadRootCertsOnDemand = true; --#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -- // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) -- QList<QByteArray> dirs = unixRootCertDirectories(); -- QStringList symLinkFilter; -- symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); -- for (int a = 0; a < dirs.count(); ++a) { -- QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); -- if (iterator.hasNext()) { -- s_loadRootCertsOnDemand = true; -- break; -- } -- } --#endif --#endif // QT_CONFIG(library) -- // if on-demand loading was not enabled, load the certs now -- if (!s_loadRootCertsOnDemand) -- setDefaultCaCertificates(systemCaCertificates()); --#ifdef Q_OS_WIN -- //Enabled for fetching additional root certs from windows update on windows 6+ -- //This flag is set false by setDefaultCaCertificates() indicating the app uses -- //its own cert bundle rather than the system one. -- //Same logic that disables the unix on demand cert loading. -- //Unlike unix, we do preload the certificates from the cert store. -- if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) -- s_loadRootCertsOnDemand = true; --#endif --} - - /*! - \internal -@@ -587,26 +415,6 @@ void QSslSocketPrivate::ensureInitialized() - ensureCiphersAndCertsLoaded(); - } - --long QSslSocketPrivate::sslLibraryVersionNumber() --{ -- if (!supportsSsl()) -- return 0; -- -- return q_SSLeay(); --} -- --QString QSslSocketPrivate::sslLibraryVersionString() --{ -- if (!supportsSsl()) -- return QString(); -- -- const char *versionString = q_SSLeay_version(SSLEAY_VERSION); -- if (!versionString) -- return QString(); -- -- return QString::fromLatin1(versionString); --} -- - long QSslSocketPrivate::sslLibraryBuildVersionNumber() - { - return OPENSSL_VERSION_NUMBER; -@@ -628,7 +436,11 @@ QString QSslSocketPrivate::sslLibraryBuildVersionString() - */ - void QSslSocketPrivate::resetDefaultCiphers() - { -+#if QT_CONFIG(opensslv11) -+ SSL_CTX *myCtx = q_SSL_CTX_new(q_TLS_client_method()); -+#else - SSL_CTX *myCtx = q_SSL_CTX_new(q_SSLv23_client_method()); -+#endif - SSL *mySsl = q_SSL_new(myCtx); - - QList<QSslCipher> ciphers; -@@ -664,7 +476,7 @@ void QSslSocketPrivate::resetDefaultEllipticCurves() - QVector<QSslEllipticCurve> curves; - - #ifndef OPENSSL_NO_EC -- const size_t curveCount = q_EC_get_builtin_curves(NULL, 0); -+ const size_t curveCount = q_EC_get_builtin_curves(nullptr, 0); - - QVarLengthArray<EC_builtin_curve> builtinCurves(static_cast<int>(curveCount)); - -@@ -698,13 +510,14 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() - if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) { - HCERTSTORE hSystemStore; - hSystemStore = ptrCertOpenSystemStoreW(0, L"ROOT"); -- if(hSystemStore) { -- PCCERT_CONTEXT pc = NULL; -- while(1) { -- pc = ptrCertFindCertificateInStore( hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, pc); -- if(!pc) -+ if (hSystemStore) { -+ PCCERT_CONTEXT pc = nullptr; -+ while (1) { -+ pc = ptrCertFindCertificateInStore(hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc); -+ if (!pc) - break; -- QByteArray der((const char *)(pc->pbCertEncoded), static_cast<int>(pc->cbCertEncoded)); -+ QByteArray der(reinterpret_cast<const char *>(pc->pbCertEncoded), -+ static_cast<int>(pc->cbCertEncoded)); - QSslCertificate cert(der, QSsl::Der); - systemCerts.append(cert); - } -@@ -1504,14 +1317,8 @@ QSslCipher QSslSocketBackendPrivate::sessionCipher() const - { - if (!ssl) - return QSslCipher(); --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- // FIXME This is fairly evil, but needed to keep source level compatibility -- // with the OpenSSL 0.9.x implementation at maximum -- some other functions -- // don't take a const SSL_CIPHER* when they should -- SSL_CIPHER *sessionCipher = const_cast<SSL_CIPHER *>(q_SSL_get_current_cipher(ssl)); --#else -- SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); --#endif -+ -+ const SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); - return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher(); - } - -@@ -1537,112 +1344,6 @@ QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const - return QSsl::UnknownProtocol; - } - --void QSslSocketBackendPrivate::continueHandshake() --{ -- Q_Q(QSslSocket); -- // if we have a max read buffer size, reset the plain socket's to match -- if (readBufferMaxSize) -- plainSocket->setReadBufferSize(readBufferMaxSize); -- -- if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) -- configuration.peerSessionShared = true; -- --#ifdef QT_DECRYPT_SSL_TRAFFIC -- if (ssl->session && ssl->s3) { -- const char *mk = reinterpret_cast<const char *>(ssl->session->master_key); -- QByteArray masterKey(mk, ssl->session->master_key_length); -- const char *random = reinterpret_cast<const char *>(ssl->s3->client_random); -- QByteArray clientRandom(random, SSL3_RANDOM_SIZE); -- -- // different format, needed for e.g. older Wireshark versions: --// const char *sid = reinterpret_cast<const char *>(ssl->session->session_id); --// QByteArray sessionID(sid, ssl->session->session_id_length); --// QByteArray debugLineRSA("RSA Session-ID:"); --// debugLineRSA.append(sessionID.toHex().toUpper()); --// debugLineRSA.append(" Master-Key:"); --// debugLineRSA.append(masterKey.toHex().toUpper()); --// debugLineRSA.append("\n"); -- -- QByteArray debugLineClientRandom("CLIENT_RANDOM "); -- debugLineClientRandom.append(clientRandom.toHex().toUpper()); -- debugLineClientRandom.append(" "); -- debugLineClientRandom.append(masterKey.toHex().toUpper()); -- debugLineClientRandom.append("\n"); -- -- QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); -- QFile file(sslKeyFile); -- if (!file.open(QIODevice::Append)) -- qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; -- if (!file.write(debugLineClientRandom)) -- qCWarning(lcSsl) << "could not write to file" << sslKeyFile; -- file.close(); -- } else { -- qCWarning(lcSsl, "could not decrypt SSL traffic"); -- } --#endif -- -- // Cache this SSL session inside the QSslContext -- if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { -- if (!sslContextPointer->cacheSession(ssl)) { -- sslContextPointer.clear(); // we could not cache the session -- } else { -- // Cache the session for permanent usage as well -- if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { -- if (!sslContextPointer->sessionASN1().isEmpty()) -- configuration.sslSession = sslContextPointer->sessionASN1(); -- configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); -- } -- } -- } -- --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -- -- configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; -- if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -- // we could not agree -> be conservative and use HTTP/1.1 -- configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); -- } else { -- const unsigned char *proto = 0; -- unsigned int proto_len = 0; --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) { -- q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); -- if (proto_len && mode == QSslSocket::SslClientMode) { -- // Client does not have a callback that sets it ... -- configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; -- } -- } -- -- if (!proto_len) { // Test if NPN was more lucky ... --#else -- { --#endif -- q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); -- } -- -- if (proto_len) -- configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast<const char *>(proto), proto_len); -- else -- configuration.nextNegotiatedProtocol.clear(); -- } --#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... -- --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { -- EVP_PKEY *key; -- if (q_SSL_get_server_tmp_key(ssl, &key)) -- configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); -- } --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... -- -- connectionEncrypted = true; -- emit q->encrypted(); -- if (autoStartHandshake && pendingClose) { -- pendingClose = false; -- q->disconnectFromHost(); -- } --} -- - QList<QSslCertificate> QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509) - { - ensureInitialized(); -@@ -1696,12 +1397,12 @@ QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> & - QMutexLocker sslErrorListMutexLocker(&_q_sslErrorList()->mutex); - - // Register a custom callback to get all verification errors. -- X509_STORE_set_verify_cb_func(certStore, q_X509Callback); -+ q_X509_STORE_set_verify_cb(certStore, q_X509Callback); - - // Build the chain of intermediate certificates - STACK_OF(X509) *intermediates = 0; - if (certificateChain.length() > 1) { -- intermediates = (STACK_OF(X509) *) q_sk_new_null(); -+ intermediates = (STACK_OF(X509) *) q_OPENSSL_sk_new_null(); - - if (!intermediates) { - q_X509_STORE_free(certStore); -@@ -1715,11 +1416,8 @@ QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> & - first = false; - continue; - } --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- q_sk_push( (_STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle())); --#else -- q_sk_push( (STACK *)intermediates, reinterpret_cast<char *>(cert.handle())); --#endif -+ -+ q_OPENSSL_sk_push((OPENSSL_STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle())); - } - } - -@@ -1743,11 +1441,7 @@ QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> & - (void) q_X509_verify_cert(storeContext); - - q_X509_STORE_CTX_free(storeContext); --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- q_sk_free( (_STACK *) intermediates); --#else -- q_sk_free( (STACK *) intermediates); --#endif -+ q_OPENSSL_sk_free((OPENSSL_STACK *)intermediates); - - // Now process the errors - const auto errorList = std::move(_q_sslErrorList()->errors); -@@ -1821,7 +1515,8 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, - // Convert to Qt types - if (!key->d->fromEVP_PKEY(pkey)) { - qCWarning(lcSsl, "Unable to convert private key"); -- q_sk_pop_free(reinterpret_cast<STACK *>(ca), reinterpret_cast<void(*)(void*)>(q_sk_free)); -+ q_OPENSSL_sk_pop_free(reinterpret_cast<OPENSSL_STACK *>(ca), -+ reinterpret_cast<void (*)(void *)>(q_OPENSSL_sk_free)); - q_X509_free(x509); - q_EVP_PKEY_free(pkey); - q_PKCS12_free(p12); -@@ -1836,7 +1531,11 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, - *caCertificates = QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(ca); - - // Clean up -- q_sk_pop_free(reinterpret_cast<STACK *>(ca), reinterpret_cast<void(*)(void*)>(q_sk_free)); -+ // TODO: verify ASAP, in the past we had sk_pop_free with q_OPENSSL_sk_free -+ // which seems to be blatantly wrong and even crashes with 1.1. -+ q_OPENSSL_sk_pop_free(reinterpret_cast<OPENSSL_STACK *>(ca), -+ reinterpret_cast<void (*)(void *)>(q_X509_free)); -+ - q_X509_free(x509); - q_EVP_PKEY_free(pkey); - q_PKCS12_free(p12); -diff --git a/src/network/ssl/qsslsocket_openssl11.cpp b/src/network/ssl/qsslsocket_openssl11.cpp -new file mode 100644 -index 0000000000..b6d18943a5 ---- /dev/null -+++ b/src/network/ssl/qsslsocket_openssl11.cpp -@@ -0,0 +1,285 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 Governikus GmbH & Co. KG -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/**************************************************************************** -+** -+** In addition, as a special exception, the copyright holders listed above give -+** permission to link the code of its release of Qt with the OpenSSL project's -+** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the -+** same license as the original version), and distribute the linked executables. -+** -+** You must comply with the GNU General Public License version 2 in all -+** respects for all of the code used other than the "OpenSSL" code. If you -+** modify this file, you may extend this exception to your version of the file, -+** but you are not obligated to do so. If you do not wish to do so, delete -+** this exception statement from your version of this file. -+** -+****************************************************************************/ -+ -+//#define QT_DECRYPT_SSL_TRAFFIC -+ -+#include "qssl_p.h" -+#include "qsslsocket_openssl_p.h" -+#include "qsslsocket_openssl_symbols_p.h" -+#include "qsslsocket.h" -+#include "qsslkey.h" -+ -+#include <QtCore/qdebug.h> -+#include <QtCore/qdir.h> -+#include <QtCore/qdiriterator.h> -+#include <QtCore/qfile.h> -+#include <QtCore/qmutex.h> -+#include <QtCore/qlibrary.h> -+ -+QT_BEGIN_NAMESPACE -+ -+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_opensslInitMutex, (QMutex::Recursive)) -+ -+/*! -+ \internal -+*/ -+void QSslSocketPrivate::deinitialize() -+{ -+ // This function exists only for compatibility with the pre-11 code, -+ // where deinitialize() actually does some cleanup. To be discarded -+ // once we retire < 1.1. -+} -+ -+bool QSslSocketPrivate::ensureLibraryLoaded() -+{ -+ if (!q_resolveOpenSslSymbols()) -+ return false; -+ -+ const QMutexLocker locker(qt_opensslInitMutex); -+ -+ if (!s_libraryLoaded) { -+ s_libraryLoaded = true; -+ -+ // Initialize OpenSSL. -+ if (q_OPENSSL_init_ssl(0, nullptr) != 1) -+ return false; -+ q_SSL_load_error_strings(); -+ q_OpenSSL_add_all_algorithms(); -+ -+ QSslSocketBackendPrivate::s_indexForSSLExtraData -+ = q_CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, 0L, nullptr, nullptr, -+ nullptr, nullptr); -+ -+ // Initialize OpenSSL's random seed. -+ if (!q_RAND_status()) { -+ qWarning("Random number generator not seeded, disabling SSL support"); -+ return false; -+ } -+ } -+ return true; -+} -+ -+void QSslSocketPrivate::ensureCiphersAndCertsLoaded() -+{ -+ const QMutexLocker locker(qt_opensslInitMutex); -+ -+ if (s_loadedCiphersAndCerts) -+ return; -+ s_loadedCiphersAndCerts = true; -+ -+ resetDefaultCiphers(); -+ resetDefaultEllipticCurves(); -+ -+#if QT_CONFIG(library) -+ //load symbols needed to receive certificates from system store -+#if defined(Q_OS_WIN) -+ HINSTANCE hLib = LoadLibraryW(L"Crypt32"); -+ if (hLib) { -+ ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); -+ ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); -+ ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); -+ if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) -+ qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen -+ } else { -+ qCWarning(lcSsl, "could not load crypt32 library"); // should never happen -+ } -+#elif defined(Q_OS_QNX) -+ s_loadRootCertsOnDemand = true; -+#elif defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) -+ // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) -+ QList<QByteArray> dirs = unixRootCertDirectories(); -+ QStringList symLinkFilter; -+ symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); -+ for (int a = 0; a < dirs.count(); ++a) { -+ QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); -+ if (iterator.hasNext()) { -+ s_loadRootCertsOnDemand = true; -+ break; -+ } -+ } -+#endif -+#endif // QT_CONFIG(library) -+ // if on-demand loading was not enabled, load the certs now -+ if (!s_loadRootCertsOnDemand) -+ setDefaultCaCertificates(systemCaCertificates()); -+#ifdef Q_OS_WIN -+ //Enabled for fetching additional root certs from windows update on windows 6+ -+ //This flag is set false by setDefaultCaCertificates() indicating the app uses -+ //its own cert bundle rather than the system one. -+ //Same logic that disables the unix on demand cert loading. -+ //Unlike unix, we do preload the certificates from the cert store. -+ if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) -+ s_loadRootCertsOnDemand = true; -+#endif -+} -+ -+long QSslSocketPrivate::sslLibraryVersionNumber() -+{ -+ if (!supportsSsl()) -+ return 0; -+ -+ return q_OpenSSL_version_num(); -+} -+ -+QString QSslSocketPrivate::sslLibraryVersionString() -+{ -+ if (!supportsSsl()) -+ return QString(); -+ -+ const char *versionString = q_OpenSSL_version(OPENSSL_VERSION); -+ if (!versionString) -+ return QString(); -+ -+ return QString::fromLatin1(versionString); -+} -+ -+void QSslSocketBackendPrivate::continueHandshake() -+{ -+ Q_Q(QSslSocket); -+ // if we have a max read buffer size, reset the plain socket's to match -+ if (readBufferMaxSize) -+ plainSocket->setReadBufferSize(readBufferMaxSize); -+ -+ if (q_SSL_session_reused(ssl)) -+ configuration.peerSessionShared = true; -+ -+#ifdef QT_DECRYPT_SSL_TRAFFIC -+ if (q_SSL_get_session(ssl)) { -+ size_t master_key_len = q_SSL_SESSION_get_master_key(q_SSL_get_session(ssl), 0, 0); -+ size_t client_random_len = q_SSL_get_client_random(ssl, 0, 0); -+ QByteArray masterKey(int(master_key_len), 0); // Will not overflow -+ QByteArray clientRandom(int(client_random_len), 0); // Will not overflow -+ -+ q_SSL_SESSION_get_master_key(q_SSL_get_session(ssl), -+ reinterpret_cast<unsigned char*>(masterKey.data()), -+ masterKey.size()); -+ q_SSL_get_client_random(ssl, reinterpret_cast<unsigned char *>(clientRandom.data()), -+ clientRandom.size()); -+ -+ QByteArray debugLineClientRandom("CLIENT_RANDOM "); -+ debugLineClientRandom.append(clientRandom.toHex().toUpper()); -+ debugLineClientRandom.append(" "); -+ debugLineClientRandom.append(masterKey.toHex().toUpper()); -+ debugLineClientRandom.append("\n"); -+ -+ QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); -+ QFile file(sslKeyFile); -+ if (!file.open(QIODevice::Append)) -+ qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; -+ if (!file.write(debugLineClientRandom)) -+ qCWarning(lcSsl) << "could not write to file" << sslKeyFile; -+ file.close(); -+ } else { -+ qCWarning(lcSsl, "could not decrypt SSL traffic"); -+ } -+#endif -+ -+ // Cache this SSL session inside the QSslContext -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { -+ if (!sslContextPointer->cacheSession(ssl)) { -+ sslContextPointer.clear(); // we could not cache the session -+ } else { -+ // Cache the session for permanent usage as well -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { -+ if (!sslContextPointer->sessionASN1().isEmpty()) -+ configuration.sslSession = sslContextPointer->sessionASN1(); -+ configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); -+ } -+ } -+ } -+ -+#if !defined(OPENSSL_NO_NEXTPROTONEG) -+ -+ configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; -+ if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -+ // we could not agree -> be conservative and use HTTP/1.1 -+ configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); -+ } else { -+ const unsigned char *proto = 0; -+ unsigned int proto_len = 0; -+ -+ q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); -+ if (proto_len && mode == QSslSocket::SslClientMode) { -+ // Client does not have a callback that sets it ... -+ configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; -+ } -+ -+ if (!proto_len) { // Test if NPN was more lucky ... -+ q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); -+ } -+ -+ if (proto_len) -+ configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast<const char *>(proto), proto_len); -+ else -+ configuration.nextNegotiatedProtocol.clear(); -+ } -+#endif // !defined(OPENSSL_NO_NEXTPROTONEG) -+ -+ if (mode == QSslSocket::SslClientMode) { -+ EVP_PKEY *key; -+ if (q_SSL_get_server_tmp_key(ssl, &key)) -+ configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); -+ } -+ -+ connectionEncrypted = true; -+ emit q->encrypted(); -+ if (autoStartHandshake && pendingClose) { -+ pendingClose = false; -+ q->disconnectFromHost(); -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h -new file mode 100644 -index 0000000000..2980b3d23e ---- /dev/null -+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h -@@ -0,0 +1,132 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/**************************************************************************** -+** -+** In addition, as a special exception, the copyright holders listed above give -+** permission to link the code of its release of Qt with the OpenSSL project's -+** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the -+** same license as the original version), and distribute the linked executables. -+** -+** You must comply with the GNU General Public License version 2 in all -+** respects for all of the code used other than the "OpenSSL" code. If you -+** modify this file, you may extend this exception to your version of the file, -+** but you are not obligated to do so. If you do not wish to do so, delete -+** this exception statement from your version of this file. -+** -+****************************************************************************/ -+ -+#ifndef QSSLSOCKET_OPENSSL11_SYMBOLS_P_H -+#define QSSLSOCKET_OPENSSL11_SYMBOLS_P_H -+ -+// -+// W A R N I N G -+// ------------- -+// -+// This file is not part of the Qt API. It exists purely as an -+// implementation detail. This header file may change from version to -+// version without notice, or even be removed. -+// -+// We mean it. -+// -+ -+// Note: this file does not have QT_BEGIN_NAMESPACE/QT_END_NAMESPACE, it's done -+// in qsslsocket_openssl_symbols_p.h. -+ -+#ifndef QSSLSOCKET_OPENSSL_SYMBOLS_P_H -+#error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead" -+#endif -+ -+const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); -+ -+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); -+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); -+ -+int q_DSA_bits(DSA *a); -+int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); -+int q_EVP_PKEY_base_id(EVP_PKEY *a); -+int q_RSA_bits(RSA *a); -+int q_OPENSSL_sk_num(OPENSSL_STACK *a); -+void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); -+OPENSSL_STACK *q_OPENSSL_sk_new_null(); -+void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); -+void q_OPENSSL_sk_free(OPENSSL_STACK *a); -+void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); -+int q_SSL_session_reused(SSL *a); -+unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); -+int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -+size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen); -+size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen); -+int q_CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); -+const SSL_METHOD *q_TLS_method(); -+const SSL_METHOD *q_TLS_client_method(); -+const SSL_METHOD *q_TLS_server_method(); -+ASN1_TIME *q_X509_getm_notBefore(X509 *a); -+ASN1_TIME *q_X509_getm_notAfter(X509 *a); -+ -+long q_X509_get_version(X509 *a); -+EVP_PKEY *q_X509_get_pubkey(X509 *a); -+void q_X509_STORE_set_verify_cb(X509_STORE *ctx, X509_STORE_CTX_verify_cb verify_cb); -+STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx); -+void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); -+int q_DH_bits(DH *dh); -+ -+# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ -+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) -+ -+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) -+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) -+ -+#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ -+ | OPENSSL_INIT_ADD_ALL_DIGESTS \ -+ | OPENSSL_INIT_LOAD_CONFIG, NULL) -+#define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ -+ | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) -+ -+int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -+void q_CRYPTO_free(void *str, const char *file, int line); -+ -+long q_OpenSSL_version_num(); -+const char *q_OpenSSL_version(int type); -+ -+unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *session); -+ -+#endif -diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h -index b2adb3e547..7f9e884045 100644 ---- a/src/network/ssl/qsslsocket_openssl_p.h -+++ b/src/network/ssl/qsslsocket_openssl_p.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -98,8 +98,8 @@ - #include <openssl/crypto.h> - #include <openssl/tls1.h> - --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --typedef _STACK STACK; -+#if QT_CONFIG(opensslv11) -+#include <openssl/dh.h> - #endif - - QT_BEGIN_NAMESPACE -@@ -151,7 +151,7 @@ public: - #endif - - Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); -- static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); -+ static QSslCipher QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher); - static QList<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); - static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName); - static QString getErrorsFromOpenSsl(); -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp -index c344a94427..0ef8bf6b5e 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -1,7 +1,8 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2016 Richard J. Moore <rich@kde.org> - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -136,49 +137,195 @@ void qsslSocketCannotResolveSymbolWarning(const char *functionName) - - #endif // QT_LINKED_OPENSSL - -+#if QT_CONFIG(opensslv11) -+ -+// Below are the functions first introduced in version 1.1: -+ -+DEFINEFUNC(const unsigned char *, ASN1_STRING_get0_data, const ASN1_STRING *a, a, return 0, return) -+DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) -+DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) -+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) -+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) -+DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) -+DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) -+DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) -+DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) -+DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) -+DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -+DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) -+DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return) -+DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) -+DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) -+DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) -+DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) -+DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) -+ -+DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *a, a, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *a, a, return 0, return) -+DEFINEFUNC(long, X509_get_version, X509 *a, a, return -1, return) -+DEFINEFUNC(EVP_PKEY *, X509_get_pubkey, X509 *a, a, return 0, return) -+DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_verify_cb verify_cb, verify_cb, return, DUMMYARG) -+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return) -+DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) -+DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) -+DEFINEFUNC(const char *, OpenSSL_version, int a, a, return 0, return) -+DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -+DEFINEFUNC4(void, DH_get0_pqg, const DH *dh, dh, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, DUMMYARG) -+DEFINEFUNC(int, DH_bits, DH *dh, dh, return 0, return) -+ -+#else // QT_CONFIG(opensslv11) -+ -+// Functions below are either deprecated or removed in OpenSSL >= 1.1: -+ -+DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return 0, return) -+ - #ifdef SSLEAY_MACROS - DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return 0, return) - #endif -+DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, return) -+DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) -+DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) -+DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) -+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) -+DEFINEFUNC(unsigned long, ERR_peek_last_error, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(void, ERR_free_strings, void, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(void, EVP_CIPHER_CTX_cleanup, EVP_CIPHER_CTX *a, a, return, DUMMYARG) -+DEFINEFUNC(void, EVP_CIPHER_CTX_init, EVP_CIPHER_CTX *a, a, return, DUMMYARG) -+ -+#ifdef SSLEAY_MACROS -+DEFINEFUNC6(void *, PEM_ASN1_read_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) -+DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) -+#endif // SSLEAY_MACROS -+ -+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) -+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) -+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) -+#else -+DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) -+DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10000000L -+ -+DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) -+DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#else -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+ -+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) -+ -+#ifdef SSLEAY_MACROS -+DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) -+DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) -+#ifndef OPENSSL_NO_EC -+DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) -+#endif -+DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) -+DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) -+#ifndef OPENSSL_NO_EC -+DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) -+#endif -+#endif -+DEFINEFUNC(char *, CONF_get1_default_config_file, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) -+DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) -+ -+#endif // QT_CONFIG(opensslv11) -+ - DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, return 0, return) --DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return 0, return) - DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) --DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); -+DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) - DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) - DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) --DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) - DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) - DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) --DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+ - DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) - DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10100000L --DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) --#endif - DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return static_cast<BN_ULONG>(-1), return) - #ifndef OPENSSL_NO_EC - DEFINEFUNC(const EC_GROUP*, EC_KEY_get0_group, const EC_KEY* k, k, return 0, return) - DEFINEFUNC(int, EC_GROUP_get_degree, const EC_GROUP* g, g, return 0, return) - #endif --DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) --DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) --DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) - DEFINEFUNC(DSA *, DSA_new, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) - DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, const unsigned char **b, b, long c, c, return 0, return) - DEFINEFUNC2(char *, ERR_error_string, unsigned long a, a, char *b, b, return 0, return) - DEFINEFUNC(unsigned long, ERR_get_error, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(void, ERR_free_strings, void, DUMMYARG, return, DUMMYARG) --DEFINEFUNC(void, EVP_CIPHER_CTX_cleanup, EVP_CIPHER_CTX *a, a, return, DUMMYARG) --DEFINEFUNC(void, EVP_CIPHER_CTX_init, EVP_CIPHER_CTX *a, a, return, DUMMYARG) --DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type, int arg, arg, void *ptr, ptr, return 0, return); -+DEFINEFUNC(EVP_CIPHER_CTX *, EVP_CIPHER_CTX_new, void, DUMMYARG, return 0, return) -+DEFINEFUNC(void, EVP_CIPHER_CTX_free, EVP_CIPHER_CTX *a, a, return, DUMMYARG) -+DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type, int arg, arg, void *ptr, ptr, return 0, return) - DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int keylen, keylen, return 0, return) --DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return); --DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return); --DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return); -+DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) -+DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) -+DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) -+DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) - DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const EVP_CIPHER *, EVP_rc2_cbc, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const EVP_MD *, EVP_sha1, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC3(int, EVP_PKEY_assign, EVP_PKEY *a, a, int b, b, char *c, c, return -1, return) - DEFINEFUNC2(int, EVP_PKEY_set1_RSA, EVP_PKEY *a, a, RSA *b, b, return -1, return) - DEFINEFUNC2(int, EVP_PKEY_set1_DSA, EVP_PKEY *a, a, DSA *b, b, return -1, return) -@@ -202,10 +349,8 @@ DEFINEFUNC3(int, i2t_ASN1_OBJECT, char *a, a, int b, b, ASN1_OBJECT *c, c, retur - DEFINEFUNC4(int, OBJ_obj2txt, char *a, a, int b, b, ASN1_OBJECT *c, c, int d, d, return -1, return) - - DEFINEFUNC(int, OBJ_obj2nid, const ASN1_OBJECT *a, a, return NID_undef, return) --#ifdef SSLEAY_MACROS --DEFINEFUNC6(void *, PEM_ASN1_read_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) --DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) --#else -+ -+#ifndef SSLEAY_MACROS - DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PrivateKey, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(DSA *, PEM_read_bio_DSAPrivateKey, BIO *a, a, DSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(RSA *, PEM_read_bio_RSAPrivateKey, BIO *a, a, RSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) -@@ -218,7 +363,7 @@ DEFINEFUNC7(int, PEM_write_bio_RSAPrivateKey, BIO *a, a, RSA *b, b, const EVP_CI - #ifndef OPENSSL_NO_EC - DEFINEFUNC7(int, PEM_write_bio_ECPrivateKey, BIO *a, a, EC_KEY *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) - #endif --#endif -+#endif // !SSLEAY_MACROS - DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PUBKEY, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(DSA *, PEM_read_bio_DSA_PUBKEY, BIO *a, a, DSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(RSA *, PEM_read_bio_RSA_PUBKEY, BIO *a, a, RSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) -@@ -234,23 +379,10 @@ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG) - DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) - DEFINEFUNC(RSA *, RSA_new, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) --DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) --DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) --DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) --DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) --#else --DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) --DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) --DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) --#endif - DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) - DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return) --DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) --DEFINEFUNC2(int, SSL_CIPHER_get_bits, SSL_CIPHER *a, a, int *b, b, return 0, return) -+DEFINEFUNC3(char *, SSL_CIPHER_description, const SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) -+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *a, a, int *b, b, return 0, return) - DEFINEFUNC(int, SSL_connect, SSL *a, a, return -1, return) - DEFINEFUNC(int, SSL_CTX_check_private_key, const SSL_CTX *a, a, return -1, return) - DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) -@@ -287,8 +419,6 @@ DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return) - #else - DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return) - #endif --DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) --DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) - DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) - DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) - DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) -@@ -301,7 +431,6 @@ DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) - DEFINEFUNC(SSL_SESSION*, SSL_get1_session, SSL *ssl, ssl, return 0, return) - DEFINEFUNC(SSL_SESSION*, SSL_get_session, const SSL *ssl, ssl, return 0, return) - #if OPENSSL_VERSION_NUMBER >= 0x10001000L --DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) - DEFINEFUNC3(int, SSL_set_ex_data, SSL *ssl, ssl, int idx, idx, void *arg, arg, return 0, return) - DEFINEFUNC2(void *, SSL_get_ex_data, const SSL *ssl, ssl, int idx, idx, return NULL, return) - #endif -@@ -310,51 +439,9 @@ DEFINEFUNC2(void, SSL_set_psk_client_callback, SSL* ssl, ssl, q_psk_client_callb - DEFINEFUNC2(void, SSL_set_psk_server_callback, SSL* ssl, ssl, q_psk_server_callback_t callback, callback, return, DUMMYARG) - DEFINEFUNC2(int, SSL_CTX_use_psk_identity_hint, SSL_CTX* ctx, ctx, const char *hint, hint, return 0, return) - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L --DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L --DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#else --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif - DEFINEFUNC3(int, SSL_write, SSL *a, a, const void *b, b, int c, c, return -1, return) - DEFINEFUNC2(int, X509_cmp, X509 *a, a, X509 *b, b, return -1, return) -+DEFINEFUNC4(int, X509_digest, const X509 *x509, x509, const EVP_MD *type, type, unsigned char *md, md, unsigned int *len, len, return -1, return) - #ifndef SSLEAY_MACROS - DEFINEFUNC(X509 *, X509_dup, X509 *a, a, return 0, return) - #endif -@@ -378,6 +465,7 @@ DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, ASN1_STRING *b, b, return 0, retu - DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return) - DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return 0, return) - DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return 0, return) -+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *a, a, return 0, return) - DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return) - DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return) - DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return 0, return) -@@ -393,25 +481,8 @@ DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, ret - DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) - DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) - DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) --DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) - DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) --#ifdef SSLEAY_MACROS --DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) --DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) --#ifndef OPENSSL_NO_EC --DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) --#endif --DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) --DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) --#ifndef OPENSSL_NO_EC --DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) --#endif --#endif --DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) --DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) - DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) --DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) --DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) - DEFINEFUNC2(int, i2d_SSL_SESSION, SSL_SESSION *in, in, unsigned char **pp, pp, return 0, return) - DEFINEFUNC3(SSL_SESSION *, d2i_SSL_SESSION, SSL_SESSION **a, a, const unsigned char **pp, pp, long length, length, return 0, return) - #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -@@ -694,8 +765,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() - #ifndef Q_OS_DARWIN - // second attempt: find the development files libssl.so and libcrypto.so - // -- // disabled on OS X/iOS: -- // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third -+ // disabled on macOS/iOS: -+ // macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ <bundle>/Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. - libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -@@ -754,7 +825,11 @@ bool q_resolveOpenSslSymbols() - static bool symbolsResolved = false; - static bool triedToResolveSymbols = false; - #ifndef QT_NO_THREAD -+#if QT_CONFIG(opensslv11) -+ QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl)); -+#else - QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init)); -+#endif - #endif - if (symbolsResolved) - return true; -@@ -771,11 +846,145 @@ bool q_resolveOpenSslSymbols() - // failed to load them - return false; - -+#if QT_CONFIG(opensslv11) -+ -+ RESOLVEFUNC(OPENSSL_init_ssl) -+ RESOLVEFUNC(OPENSSL_init_crypto) -+ RESOLVEFUNC(ASN1_STRING_get0_data) -+ RESOLVEFUNC(EVP_CIPHER_CTX_reset) -+ RESOLVEFUNC(EVP_PKEY_base_id) -+ RESOLVEFUNC(RSA_bits) -+ RESOLVEFUNC(OPENSSL_sk_new_null) -+ RESOLVEFUNC(OPENSSL_sk_push) -+ RESOLVEFUNC(OPENSSL_sk_free) -+ RESOLVEFUNC(OPENSSL_sk_num) -+ RESOLVEFUNC(OPENSSL_sk_pop_free) -+ RESOLVEFUNC(OPENSSL_sk_value) -+ RESOLVEFUNC(DH_get0_pqg) -+ RESOLVEFUNC(SSL_CTX_set_options) -+ RESOLVEFUNC(SSL_get_client_random) -+ RESOLVEFUNC(SSL_SESSION_get_master_key) -+ RESOLVEFUNC(SSL_session_reused) -+ RESOLVEFUNC(SSL_get_session) -+ RESOLVEFUNC(CRYPTO_get_ex_new_index) -+ RESOLVEFUNC(TLS_method) -+ RESOLVEFUNC(TLS_client_method) -+ RESOLVEFUNC(TLS_server_method) -+ RESOLVEFUNC(X509_STORE_CTX_get0_chain) -+ RESOLVEFUNC(X509_getm_notBefore) -+ RESOLVEFUNC(X509_getm_notAfter) -+ RESOLVEFUNC(X509_get_version) -+ RESOLVEFUNC(X509_get_pubkey) -+ RESOLVEFUNC(X509_STORE_set_verify_cb) -+ RESOLVEFUNC(CRYPTO_free) -+ RESOLVEFUNC(OpenSSL_version_num) -+ RESOLVEFUNC(OpenSSL_version) -+ if (!_q_OpenSSL_version) { -+ // Apparently, we were built with OpenSSL 1.1 enabled but are now using -+ // a wrong library. -+ delete libs.first; -+ delete libs.second; -+ qCWarning(lcSsl, "Incompatible version of OpenSSL"); -+ return false; -+ } -+ -+ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) -+ RESOLVEFUNC(DH_bits) -+ RESOLVEFUNC(DSA_bits) -+ -+#else // !opensslv11 -+ -+ RESOLVEFUNC(ASN1_STRING_data) -+ - #ifdef SSLEAY_MACROS - RESOLVEFUNC(ASN1_dup) -+#endif // SSLEAY_MACROS -+ RESOLVEFUNC(BIO_new_file) -+ RESOLVEFUNC(ERR_clear_error) -+ RESOLVEFUNC(CRYPTO_free) -+ RESOLVEFUNC(CRYPTO_num_locks) -+ RESOLVEFUNC(CRYPTO_set_id_callback) -+ RESOLVEFUNC(CRYPTO_set_locking_callback) -+ RESOLVEFUNC(ERR_peek_last_error) -+ RESOLVEFUNC(ERR_free_strings) -+ RESOLVEFUNC(EVP_CIPHER_CTX_cleanup) -+ RESOLVEFUNC(EVP_CIPHER_CTX_init) -+ -+#ifdef SSLEAY_MACROS // ### verify -+ RESOLVEFUNC(PEM_ASN1_read_bio) -+#endif // SSLEAY_MACROS -+ -+ RESOLVEFUNC(sk_new_null) -+ RESOLVEFUNC(sk_push) -+ RESOLVEFUNC(sk_free) -+ RESOLVEFUNC(sk_num) -+ RESOLVEFUNC(sk_pop_free) -+ RESOLVEFUNC(sk_value) -+ RESOLVEFUNC(SSL_library_init) -+ RESOLVEFUNC(SSL_load_error_strings) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ RESOLVEFUNC(SSL_get_ex_new_index) -+#endif -+#ifndef OPENSSL_NO_SSL2 -+ RESOLVEFUNC(SSLv2_client_method) - #endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+ RESOLVEFUNC(SSLv3_client_method) -+#endif -+ RESOLVEFUNC(SSLv23_client_method) -+ RESOLVEFUNC(TLSv1_client_method) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ RESOLVEFUNC(TLSv1_1_client_method) -+ RESOLVEFUNC(TLSv1_2_client_method) -+#endif -+#ifndef OPENSSL_NO_SSL2 -+ RESOLVEFUNC(SSLv2_server_method) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+ RESOLVEFUNC(SSLv3_server_method) -+#endif -+ RESOLVEFUNC(SSLv23_server_method) -+ RESOLVEFUNC(TLSv1_server_method) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ RESOLVEFUNC(TLSv1_1_server_method) -+ RESOLVEFUNC(TLSv1_2_server_method) -+#endif -+ RESOLVEFUNC(X509_STORE_CTX_get_chain) -+#ifdef SSLEAY_MACROS -+ RESOLVEFUNC(i2d_DSAPrivateKey) -+ RESOLVEFUNC(i2d_RSAPrivateKey) -+ RESOLVEFUNC(d2i_DSAPrivateKey) -+ RESOLVEFUNC(d2i_RSAPrivateKey) -+#endif -+ RESOLVEFUNC(CONF_get1_default_config_file) -+ RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) -+ RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) -+ RESOLVEFUNC(SSLeay) -+ -+ if (!_q_SSLeay || q_SSLeay() >= 0x10100000L) { -+ // OpenSSL 1.1 has deprecated and removed SSLeay. We consider a failure to -+ // resolve this symbol as a failure to resolve symbols. -+ // The right operand of '||' above is ... a bit of paranoia. -+ delete libs.first; -+ delete libs.second; -+ qCWarning(lcSsl, "Incompatible version of OpenSSL"); -+ return false; -+ } -+ -+ -+ RESOLVEFUNC(SSLeay_version) -+ -+#ifndef OPENSSL_NO_EC -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L) -+ RESOLVEFUNC(EC_curve_nist2nid) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L -+#endif // OPENSSL_NO_EC -+ -+ -+#endif // !opensslv11 -+ - RESOLVEFUNC(ASN1_INTEGER_get) -- RESOLVEFUNC(ASN1_STRING_data) - RESOLVEFUNC(ASN1_STRING_length) - RESOLVEFUNC(ASN1_STRING_to_UTF8) - RESOLVEFUNC(BIO_ctrl) -@@ -794,25 +1003,22 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(BN_is_word) - #endif - RESOLVEFUNC(BN_mod_word) -- RESOLVEFUNC(CRYPTO_free) -- RESOLVEFUNC(CRYPTO_num_locks) -- RESOLVEFUNC(CRYPTO_set_id_callback) -- RESOLVEFUNC(CRYPTO_set_locking_callback) - RESOLVEFUNC(DSA_new) - RESOLVEFUNC(DSA_free) - RESOLVEFUNC(ERR_error_string) - RESOLVEFUNC(ERR_get_error) -- RESOLVEFUNC(ERR_free_strings) -- RESOLVEFUNC(EVP_CIPHER_CTX_cleanup) -- RESOLVEFUNC(EVP_CIPHER_CTX_init) -+ RESOLVEFUNC(EVP_CIPHER_CTX_new) -+ RESOLVEFUNC(EVP_CIPHER_CTX_free) - RESOLVEFUNC(EVP_CIPHER_CTX_ctrl) - RESOLVEFUNC(EVP_CIPHER_CTX_set_key_length) - RESOLVEFUNC(EVP_CipherInit) -+ RESOLVEFUNC(EVP_CipherInit_ex) - RESOLVEFUNC(EVP_CipherUpdate) - RESOLVEFUNC(EVP_CipherFinal) - RESOLVEFUNC(EVP_des_cbc) - RESOLVEFUNC(EVP_des_ede3_cbc) - RESOLVEFUNC(EVP_rc2_cbc) -+ RESOLVEFUNC(EVP_sha1) - RESOLVEFUNC(EVP_PKEY_assign) - RESOLVEFUNC(EVP_PKEY_set1_RSA) - RESOLVEFUNC(EVP_PKEY_set1_DSA) -@@ -834,9 +1040,8 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(i2t_ASN1_OBJECT) - RESOLVEFUNC(OBJ_obj2txt) - RESOLVEFUNC(OBJ_obj2nid) --#ifdef SSLEAY_MACROS // ### verify -- RESOLVEFUNC(PEM_ASN1_read_bio) --#else -+ -+#ifndef SSLEAY_MACROS - RESOLVEFUNC(PEM_read_bio_PrivateKey) - RESOLVEFUNC(PEM_read_bio_DSAPrivateKey) - RESOLVEFUNC(PEM_read_bio_RSAPrivateKey) -@@ -849,7 +1054,8 @@ bool q_resolveOpenSslSymbols() - #ifndef OPENSSL_NO_EC - RESOLVEFUNC(PEM_write_bio_ECPrivateKey) - #endif --#endif -+#endif // !SSLEAY_MACROS -+ - RESOLVEFUNC(PEM_read_bio_PUBKEY) - RESOLVEFUNC(PEM_read_bio_DSA_PUBKEY) - RESOLVEFUNC(PEM_read_bio_RSA_PUBKEY) -@@ -865,12 +1071,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(RAND_status) - RESOLVEFUNC(RSA_new) - RESOLVEFUNC(RSA_free) -- RESOLVEFUNC(sk_new_null) -- RESOLVEFUNC(sk_push) -- RESOLVEFUNC(sk_free) -- RESOLVEFUNC(sk_num) -- RESOLVEFUNC(sk_pop_free) -- RESOLVEFUNC(sk_value) - RESOLVEFUNC(SSL_CIPHER_description) - RESOLVEFUNC(SSL_CIPHER_get_bits) - RESOLVEFUNC(SSL_CTX_check_private_key) -@@ -898,8 +1098,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_get_peer_cert_chain) - RESOLVEFUNC(SSL_get_peer_certificate) - RESOLVEFUNC(SSL_get_verify_result) -- RESOLVEFUNC(SSL_library_init) -- RESOLVEFUNC(SSL_load_error_strings) - RESOLVEFUNC(SSL_new) - RESOLVEFUNC(SSL_ctrl) - RESOLVEFUNC(SSL_read) -@@ -912,7 +1110,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_get1_session) - RESOLVEFUNC(SSL_get_session) - #if OPENSSL_VERSION_NUMBER >= 0x10001000L -- RESOLVEFUNC(SSL_get_ex_new_index) - RESOLVEFUNC(SSL_set_ex_data) - RESOLVEFUNC(SSL_get_ex_data) - #endif -@@ -922,30 +1119,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_CTX_use_psk_identity_hint) - #endif - RESOLVEFUNC(SSL_write) --#ifndef OPENSSL_NO_SSL2 -- RESOLVEFUNC(SSLv2_client_method) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD -- RESOLVEFUNC(SSLv3_client_method) --#endif -- RESOLVEFUNC(SSLv23_client_method) -- RESOLVEFUNC(TLSv1_client_method) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- RESOLVEFUNC(TLSv1_1_client_method) -- RESOLVEFUNC(TLSv1_2_client_method) --#endif --#ifndef OPENSSL_NO_SSL2 -- RESOLVEFUNC(SSLv2_server_method) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD -- RESOLVEFUNC(SSLv3_server_method) --#endif -- RESOLVEFUNC(SSLv23_server_method) -- RESOLVEFUNC(TLSv1_server_method) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- RESOLVEFUNC(TLSv1_1_server_method) -- RESOLVEFUNC(TLSv1_2_server_method) --#endif - RESOLVEFUNC(X509_NAME_entry_count) - RESOLVEFUNC(X509_NAME_get_entry) - RESOLVEFUNC(X509_NAME_ENTRY_get_data) -@@ -961,12 +1134,12 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(X509_STORE_CTX_get_error) - RESOLVEFUNC(X509_STORE_CTX_get_error_depth) - RESOLVEFUNC(X509_STORE_CTX_get_current_cert) -- RESOLVEFUNC(X509_STORE_CTX_get_chain) - RESOLVEFUNC(X509_cmp) - #ifndef SSLEAY_MACROS - RESOLVEFUNC(X509_dup) - #endif - RESOLVEFUNC(X509_print) -+ RESOLVEFUNC(X509_digest) - RESOLVEFUNC(X509_EXTENSION_get_object) - RESOLVEFUNC(X509_free) - RESOLVEFUNC(X509_get_ext) -@@ -982,20 +1155,11 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(X509_check_issued) - RESOLVEFUNC(X509_get_issuer_name) - RESOLVEFUNC(X509_get_subject_name) -+ RESOLVEFUNC(X509_get_serialNumber) - RESOLVEFUNC(X509_verify_cert) - RESOLVEFUNC(d2i_X509) - RESOLVEFUNC(i2d_X509) --#ifdef SSLEAY_MACROS -- RESOLVEFUNC(i2d_DSAPrivateKey) -- RESOLVEFUNC(i2d_RSAPrivateKey) -- RESOLVEFUNC(d2i_DSAPrivateKey) -- RESOLVEFUNC(d2i_RSAPrivateKey) --#endif -- RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) -- RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) - RESOLVEFUNC(SSL_CTX_load_verify_locations) -- RESOLVEFUNC(SSLeay) -- RESOLVEFUNC(SSLeay_version) - RESOLVEFUNC(i2d_SSL_SESSION) - RESOLVEFUNC(d2i_SSL_SESSION) - #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -@@ -1019,27 +1183,14 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(EC_KEY_new_by_curve_name) - RESOLVEFUNC(EC_KEY_free) - RESOLVEFUNC(EC_get_builtin_curves) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) -- RESOLVEFUNC(EC_curve_nist2nid) --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - #endif // OPENSSL_NO_EC - RESOLVEFUNC(PKCS12_parse) - RESOLVEFUNC(d2i_PKCS12_bio) - RESOLVEFUNC(PKCS12_free) - -+ symbolsResolved = true; - delete libs.first; - delete libs.second; -- if (!_q_SSLeay || q_SSLeay() >= 0x10100000L) { -- // OpenSSL 1.1 deprecated and removed SSLeay. We consider a failure to -- // resolve this symbol as a failure to resolve symbols. -- // The right operand of '||' above ... a bit of paranoia. -- qCWarning(lcSsl, "Incompatible version of OpenSSL"); -- return false; -- } -- -- symbolsResolved = true; -- - return true; - } - #endif // QT_CONFIG(library) -diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h -index b35a895d38..796bf2d4f5 100644 ---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. - ** Contact: https://www.qt.io/licensing/ - ** -@@ -56,6 +56,7 @@ - #ifndef QSSLSOCKET_OPENSSL_SYMBOLS_P_H - #define QSSLSOCKET_OPENSSL_SYMBOLS_P_H - -+ - // - // W A R N I N G - // ------------- -@@ -215,17 +216,20 @@ QT_BEGIN_NAMESPACE - - #endif // !defined QT_LINKED_OPENSSL - -+#if QT_CONFIG(opensslv11) -+#include "qsslsocket_openssl11_symbols_p.h" -+#else -+#include "qsslsocket_opensslpre11_symbols_p.h" -+#endif // QT_CONFIG -+ - bool q_resolveOpenSslSymbols(); - long q_ASN1_INTEGER_get(ASN1_INTEGER *a); --unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); - int q_ASN1_STRING_length(ASN1_STRING *a); - int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); - long q_BIO_ctrl(BIO *a, int b, long c, void *d); - Q_AUTOTEST_EXPORT int q_BIO_free(BIO *a); --Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); - BIO *q_BIO_new_mem_buf(void *a, int b); - int q_BIO_read(BIO *a, void *b, int c); --Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); - Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L -@@ -247,26 +251,23 @@ BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); - const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); - int q_EC_GROUP_get_degree(const EC_GROUP* g); - #endif --int q_CRYPTO_num_locks(); --void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); --void q_CRYPTO_set_id_callback(unsigned long (*a)()); --void q_CRYPTO_free(void *a); - DSA *q_DSA_new(); - void q_DSA_free(DSA *a); - X509 *q_d2i_X509(X509 **a, const unsigned char **b, long c); - char *q_ERR_error_string(unsigned long a, char *b); - unsigned long q_ERR_get_error(); --void q_ERR_free_strings(); --void q_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a); --void q_EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); -+EVP_CIPHER_CTX *q_EVP_CIPHER_CTX_new(); -+void q_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a); - int q_EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); - int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen); - int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc); -+int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); - int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); - int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); - const EVP_CIPHER *q_EVP_des_cbc(); - const EVP_CIPHER *q_EVP_des_ede3_cbc(); - const EVP_CIPHER *q_EVP_rc2_cbc(); -+const EVP_MD *q_EVP_sha1(); - int q_EVP_PKEY_assign(EVP_PKEY *a, int b, char *c); - Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_RSA(EVP_PKEY *a, RSA *b); - int q_EVP_PKEY_set1_DSA(EVP_PKEY *a, DSA *b); -@@ -310,7 +311,7 @@ int q_PEM_write_bio_RSAPrivateKey(BIO *a, RSA *b, const EVP_CIPHER *c, unsigned - int q_PEM_write_bio_ECPrivateKey(BIO *a, EC_KEY *b, const EVP_CIPHER *c, unsigned char *d, - int e, pem_password_cb *f, void *g); - #endif --#endif -+#endif // SSLEAY_MACROS - Q_AUTOTEST_EXPORT EVP_PKEY *q_PEM_read_bio_PUBKEY(BIO *a, EVP_PKEY **b, pem_password_cb *c, void *d); - DSA *q_PEM_read_bio_DSA_PUBKEY(BIO *a, DSA **b, pem_password_cb *c, void *d); - RSA *q_PEM_read_bio_RSA_PUBKEY(BIO *a, RSA **b, pem_password_cb *c, void *d); -@@ -326,23 +327,10 @@ void q_RAND_seed(const void *a, int b); - int q_RAND_status(); - RSA *q_RSA_new(); - void q_RSA_free(RSA *a); --int q_sk_num(STACK *a); --void q_sk_pop_free(STACK *a, void (*b)(void *)); --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --_STACK *q_sk_new_null(); --void q_sk_push(_STACK *st, void *data); --void q_sk_free(_STACK *a); --void * q_sk_value(STACK *a, int b); --#else --STACK *q_sk_new_null(); --void q_sk_push(STACK *st, char *data); --void q_sk_free(STACK *a); --char * q_sk_value(STACK *a, int b); --#endif - int q_SSL_accept(SSL *a); - int q_SSL_clear(SSL *a); --char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c); --int q_SSL_CIPHER_get_bits(SSL_CIPHER *a, int *b); -+char *q_SSL_CIPHER_description(const SSL_CIPHER *a, char *b, int c); -+int q_SSL_CIPHER_get_bits(const SSL_CIPHER *a, int *b); - int q_SSL_connect(SSL *a); - int q_SSL_CTX_check_private_key(const SSL_CTX *a); - long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d); -@@ -374,8 +362,6 @@ int q_SSL_get_error(SSL *a, int b); - STACK_OF(X509) *q_SSL_get_peer_cert_chain(SSL *a); - X509 *q_SSL_get_peer_certificate(SSL *a); - long q_SSL_get_verify_result(const SSL *a); --int q_SSL_library_init(); --void q_SSL_load_error_strings(); - SSL *q_SSL_new(SSL_CTX *a); - long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); - int q_SSL_read(SSL *a, void *b, int c); -@@ -388,7 +374,6 @@ void q_SSL_SESSION_free(SSL_SESSION *ses); - SSL_SESSION *q_SSL_get1_session(SSL *ssl); - SSL_SESSION *q_SSL_get_session(const SSL *ssl); - #if OPENSSL_VERSION_NUMBER >= 0x10001000L --int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); - int q_SSL_set_ex_data(SSL *ssl, int idx, void *arg); - void *q_SSL_get_ex_data(const SSL *ssl, int idx); - #endif -@@ -399,49 +384,6 @@ typedef unsigned int (*q_psk_server_callback_t)(SSL *ssl, const char *identity, - void q_SSL_set_psk_server_callback(SSL *ssl, q_psk_server_callback_t callback); - int q_SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *hint); - #endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --#ifndef OPENSSL_NO_SSL2 --const SSL_METHOD *q_SSLv2_client_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --const SSL_METHOD *q_SSLv3_client_method(); --#endif --const SSL_METHOD *q_SSLv23_client_method(); --const SSL_METHOD *q_TLSv1_client_method(); --const SSL_METHOD *q_TLSv1_1_client_method(); --const SSL_METHOD *q_TLSv1_2_client_method(); --#ifndef OPENSSL_NO_SSL2 --const SSL_METHOD *q_SSLv2_server_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --const SSL_METHOD *q_SSLv3_server_method(); --#endif --const SSL_METHOD *q_SSLv23_server_method(); --const SSL_METHOD *q_TLSv1_server_method(); --const SSL_METHOD *q_TLSv1_1_server_method(); --const SSL_METHOD *q_TLSv1_2_server_method(); --#else --#ifndef OPENSSL_NO_SSL2 --SSL_METHOD *q_SSLv2_client_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --SSL_METHOD *q_SSLv3_client_method(); --#endif --SSL_METHOD *q_SSLv23_client_method(); --SSL_METHOD *q_TLSv1_client_method(); --SSL_METHOD *q_TLSv1_1_client_method(); --SSL_METHOD *q_TLSv1_2_client_method(); --#ifndef OPENSSL_NO_SSL2 --SSL_METHOD *q_SSLv2_server_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --SSL_METHOD *q_SSLv3_server_method(); --#endif --SSL_METHOD *q_SSLv23_server_method(); --SSL_METHOD *q_TLSv1_server_method(); --SSL_METHOD *q_TLSv1_1_server_method(); --SSL_METHOD *q_TLSv1_2_server_method(); --#endif - int q_SSL_write(SSL *a, const void *b, int c); - int q_X509_cmp(X509 *a, X509 *b); - #ifdef SSLEAY_MACROS -@@ -452,6 +394,7 @@ void *q_ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x); - X509 *q_X509_dup(X509 *a); - #endif - void q_X509_print(BIO *a, X509*b); -+int q_X509_digest(const X509 *x509, const EVP_MD *type, unsigned char *md, unsigned int *len); - ASN1_OBJECT *q_X509_EXTENSION_get_object(X509_EXTENSION *a); - void q_X509_free(X509 *a); - X509_EXTENSION *q_X509_get_ext(X509 *a, int b); -@@ -471,6 +414,7 @@ int q_ASN1_STRING_print(BIO *a, ASN1_STRING *b); - int q_X509_check_issued(X509 *a, X509 *b); - X509_NAME *q_X509_get_issuer_name(X509 *a); - X509_NAME *q_X509_get_subject_name(X509 *a); -+ASN1_INTEGER *q_X509_get_serialNumber(X509 *a); - int q_X509_verify_cert(X509_STORE_CTX *ctx); - int q_X509_NAME_entry_count(X509_NAME *a); - X509_NAME_ENTRY *q_X509_NAME_get_entry(X509_NAME *a,int b); -@@ -488,7 +432,6 @@ int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); - int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); - int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); - X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); --STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); - - // Diffie-Hellman support - DH *q_DH_new(); -@@ -522,34 +465,9 @@ int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, - PKCS12 *q_d2i_PKCS12_bio(BIO *bio, PKCS12 **pkcs12); - void q_PKCS12_free(PKCS12 *pkcs12); - -- - #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) - #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) --#ifdef SSLEAY_MACROS --int q_i2d_DSAPrivateKey(const DSA *a, unsigned char **pp); --int q_i2d_RSAPrivateKey(const RSA *a, unsigned char **pp); --RSA *q_d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length); --DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); --#define q_PEM_read_bio_RSAPrivateKey(bp, x, cb, u) \ -- (RSA *)q_PEM_ASN1_read_bio( \ -- (void *(*)(void**, const unsigned char**, long int))q_d2i_RSAPrivateKey, PEM_STRING_RSA, bp, (void **)x, cb, u) --#define q_PEM_read_bio_DSAPrivateKey(bp, x, cb, u) \ -- (DSA *)q_PEM_ASN1_read_bio( \ -- (void *(*)(void**, const unsigned char**, long int))q_d2i_DSAPrivateKey, PEM_STRING_DSA, bp, (void **)x, cb, u) --#define q_PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ -- PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_RSAPrivateKey,PEM_STRING_RSA,\ -- bp,(char *)x,enc,kstr,klen,cb,u) --#define q_PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ -- PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ -- bp,(char *)x,enc,kstr,klen,cb,u) --#define q_PEM_read_bio_DHparams(bp, dh, cb, u) \ -- (DH *)q_PEM_ASN1_read_bio( \ -- (void *(*)(void**, const unsigned char**, long int))q_d2i_DHparams, PEM_STRING_DHPARAMS, bp, (void **)x, cb, u) --#endif --#define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) - #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) --#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) --#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) - #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) - #define q_sk_GENERAL_NAME_value(st, i) q_SKM_sk_value(GENERAL_NAME, (st), (i)) - #define q_sk_X509_num(st) q_SKM_sk_num(X509, (st)) -@@ -558,18 +476,12 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); - #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) - #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ - q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) --#define q_X509_get_notAfter(x) X509_get_notAfter(x) --#define q_X509_get_notBefore(x) X509_get_notBefore(x) - #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ - (char *)(rsa)) - #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ - (char *)(dsa)) - #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_conf() --void q_OPENSSL_add_all_algorithms_noconf(); --void q_OPENSSL_add_all_algorithms_conf(); - int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); --long q_SSLeay(); --const char *q_SSLeay_version(int type); - int q_i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); - SSL_SESSION *q_d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length); - -diff --git a/src/network/ssl/qsslsocket_opensslpre11.cpp b/src/network/ssl/qsslsocket_opensslpre11.cpp -new file mode 100644 -index 0000000000..e51888c5f2 ---- /dev/null -+++ b/src/network/ssl/qsslsocket_opensslpre11.cpp -@@ -0,0 +1,424 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 Governikus GmbH & Co. KG -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/**************************************************************************** -+** -+** In addition, as a special exception, the copyright holders listed above give -+** permission to link the code of its release of Qt with the OpenSSL project's -+** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the -+** same license as the original version), and distribute the linked executables. -+** -+** You must comply with the GNU General Public License version 2 in all -+** respects for all of the code used other than the "OpenSSL" code. If you -+** modify this file, you may extend this exception to your version of the file, -+** but you are not obligated to do so. If you do not wish to do so, delete -+** this exception statement from your version of this file. -+** -+****************************************************************************/ -+ -+//#define QT_DECRYPT_SSL_TRAFFIC -+ -+#include "qssl_p.h" -+#include "qsslsocket_openssl_p.h" -+#include "qsslsocket_openssl_symbols_p.h" -+#include "qsslsocket.h" -+#include "qsslkey.h" -+ -+#include <QtCore/qdebug.h> -+#include <QtCore/qdir.h> -+#include <QtCore/qdiriterator.h> -+#include <QtCore/qthread.h> -+#include <QtCore/qfile.h> -+#include <QtCore/qmutex.h> -+#include <QtCore/qlibrary.h> -+ -+QT_BEGIN_NAMESPACE -+ -+/* \internal -+ -+ From OpenSSL's thread(3) manual page: -+ -+ OpenSSL can safely be used in multi-threaded applications provided that at -+ least two callback functions are set. -+ -+ locking_function(int mode, int n, const char *file, int line) is needed to -+ perform locking on shared data structures. (Note that OpenSSL uses a -+ number of global data structures that will be implicitly shared -+ whenever multiple threads use OpenSSL.) Multi-threaded -+ applications will crash at random if it is not set. ... -+ ... -+ id_function(void) is a function that returns a thread ID. It is not -+ needed on Windows nor on platforms where getpid() returns a different -+ ID for each thread (most notably Linux) -+*/ -+ -+class QOpenSslLocks -+{ -+public: -+ QOpenSslLocks() -+ : initLocker(QMutex::Recursive), -+ locksLocker(QMutex::Recursive) -+ { -+ QMutexLocker locker(&locksLocker); -+ int numLocks = q_CRYPTO_num_locks(); -+ locks = new QMutex *[numLocks]; -+ memset(locks, 0, numLocks * sizeof(QMutex *)); -+ } -+ ~QOpenSslLocks() -+ { -+ QMutexLocker locker(&locksLocker); -+ for (int i = 0; i < q_CRYPTO_num_locks(); ++i) -+ delete locks[i]; -+ delete [] locks; -+ -+ QSslSocketPrivate::deinitialize(); -+ } -+ QMutex *lock(int num) -+ { -+ QMutexLocker locker(&locksLocker); -+ QMutex *tmp = locks[num]; -+ if (!tmp) -+ tmp = locks[num] = new QMutex(QMutex::Recursive); -+ return tmp; -+ } -+ -+ QMutex *globalLock() -+ { -+ return &locksLocker; -+ } -+ -+ QMutex *initLock() -+ { -+ return &initLocker; -+ } -+ -+private: -+ QMutex initLocker; -+ QMutex locksLocker; -+ QMutex **locks; -+}; -+ -+Q_GLOBAL_STATIC(QOpenSslLocks, openssl_locks) -+ -+extern "C" { -+static void locking_function(int mode, int lockNumber, const char *, int) -+{ -+ QMutex *mutex = openssl_locks()->lock(lockNumber); -+ -+ // Lock or unlock it -+ if (mode & CRYPTO_LOCK) -+ mutex->lock(); -+ else -+ mutex->unlock(); -+} -+static unsigned long id_function() -+{ -+ return (quintptr)QThread::currentThreadId(); -+} -+ -+} // extern "C" -+ -+static void q_OpenSSL_add_all_algorithms_safe() -+{ -+#ifdef Q_OS_WIN -+ // Prior to version 1.0.1m an attempt to call OpenSSL_add_all_algorithms on -+ // Windows could result in 'exit' call from OPENSSL_config (QTBUG-43843). -+ // We can predict this and avoid OPENSSL_add_all_algorithms call. -+ // From OpenSSL docs: -+ // "An application does not need to add algorithms to use them explicitly, -+ // for example by EVP_sha1(). It just needs to add them if it (or any of -+ // the functions it calls) needs to lookup algorithms. -+ // The cipher and digest lookup functions are used in many parts of the -+ // library. If the table is not initialized several functions will -+ // misbehave and complain they cannot find algorithms. This includes the -+ // PEM, PKCS#12, SSL and S/MIME libraries. This is a common query in -+ // the OpenSSL mailing lists." -+ // -+ // Anyway, as a result, we chose not to call this function if it would exit. -+ -+ if (q_SSLeay() < 0x100010DFL) -+ { -+ // Now, before we try to call it, check if an attempt to open config file -+ // will result in exit: -+ if (char *confFileName = q_CONF_get1_default_config_file()) { -+ BIO *confFile = q_BIO_new_file(confFileName, "r"); -+ const auto lastError = q_ERR_peek_last_error(); -+ q_CRYPTO_free(confFileName); -+ if (confFile) { -+ q_BIO_free(confFile); -+ } else { -+ q_ERR_clear_error(); -+ if (ERR_GET_REASON(lastError) == ERR_R_SYS_LIB) { -+ qCWarning(lcSsl, "failed to open openssl.conf file"); -+ return; -+ } -+ } -+ } -+ } -+#endif // Q_OS_WIN -+ -+ q_OpenSSL_add_all_algorithms(); -+} -+ -+ -+/*! -+ \internal -+*/ -+void QSslSocketPrivate::deinitialize() -+{ -+ q_CRYPTO_set_id_callback(0); -+ q_CRYPTO_set_locking_callback(0); -+ q_ERR_free_strings(); -+} -+ -+ -+bool QSslSocketPrivate::ensureLibraryLoaded() -+{ -+ if (!q_resolveOpenSslSymbols()) -+ return false; -+ -+ // Check if the library itself needs to be initialized. -+ QMutexLocker locker(openssl_locks()->initLock()); -+ -+ if (!s_libraryLoaded) { -+ s_libraryLoaded = true; -+ -+ // Initialize OpenSSL. -+ q_CRYPTO_set_id_callback(id_function); -+ q_CRYPTO_set_locking_callback(locking_function); -+ if (q_SSL_library_init() != 1) -+ return false; -+ q_SSL_load_error_strings(); -+ q_OpenSSL_add_all_algorithms_safe(); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ if (q_SSLeay() >= 0x10001000L) -+ QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); -+#endif -+ -+ // Initialize OpenSSL's random seed. -+ if (!q_RAND_status()) { -+ qWarning("Random number generator not seeded, disabling SSL support"); -+ return false; -+ } -+ } -+ return true; -+} -+ -+void QSslSocketPrivate::ensureCiphersAndCertsLoaded() -+{ -+ QMutexLocker locker(openssl_locks()->initLock()); -+ if (s_loadedCiphersAndCerts) -+ return; -+ s_loadedCiphersAndCerts = true; -+ -+ resetDefaultCiphers(); -+ resetDefaultEllipticCurves(); -+ -+#if QT_CONFIG(library) -+ //load symbols needed to receive certificates from system store -+#if defined(Q_OS_WIN) -+ HINSTANCE hLib = LoadLibraryW(L"Crypt32"); -+ if (hLib) { -+ ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); -+ ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); -+ ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); -+ if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) -+ qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen -+ } else { -+ qCWarning(lcSsl, "could not load crypt32 library"); // should never happen -+ } -+#elif defined(Q_OS_QNX) -+ s_loadRootCertsOnDemand = true; -+#elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) -+ // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) -+ QList<QByteArray> dirs = unixRootCertDirectories(); -+ QStringList symLinkFilter; -+ symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); -+ for (int a = 0; a < dirs.count(); ++a) { -+ QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); -+ if (iterator.hasNext()) { -+ s_loadRootCertsOnDemand = true; -+ break; -+ } -+ } -+#endif -+#endif // QT_CONFIG(library) -+ // if on-demand loading was not enabled, load the certs now -+ if (!s_loadRootCertsOnDemand) -+ setDefaultCaCertificates(systemCaCertificates()); -+#ifdef Q_OS_WIN -+ //Enabled for fetching additional root certs from windows update on windows 6+ -+ //This flag is set false by setDefaultCaCertificates() indicating the app uses -+ //its own cert bundle rather than the system one. -+ //Same logic that disables the unix on demand cert loading. -+ //Unlike unix, we do preload the certificates from the cert store. -+ if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) -+ s_loadRootCertsOnDemand = true; -+#endif -+} -+ -+long QSslSocketPrivate::sslLibraryVersionNumber() -+{ -+ if (!supportsSsl()) -+ return 0; -+ -+ return q_SSLeay(); -+} -+ -+QString QSslSocketPrivate::sslLibraryVersionString() -+{ -+ if (!supportsSsl()) -+ return QString(); -+ -+ const char *versionString = q_SSLeay_version(SSLEAY_VERSION); -+ if (!versionString) -+ return QString(); -+ -+ return QString::fromLatin1(versionString); -+} -+ -+void QSslSocketBackendPrivate::continueHandshake() -+{ -+ Q_Q(QSslSocket); -+ // if we have a max read buffer size, reset the plain socket's to match -+ if (readBufferMaxSize) -+ plainSocket->setReadBufferSize(readBufferMaxSize); -+ -+ if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) -+ configuration.peerSessionShared = true; -+ -+#ifdef QT_DECRYPT_SSL_TRAFFIC -+ if (ssl->session && ssl->s3) { -+ const char *mk = reinterpret_cast<const char *>(ssl->session->master_key); -+ QByteArray masterKey(mk, ssl->session->master_key_length); -+ const char *random = reinterpret_cast<const char *>(ssl->s3->client_random); -+ QByteArray clientRandom(random, SSL3_RANDOM_SIZE); -+ -+ // different format, needed for e.g. older Wireshark versions: -+// const char *sid = reinterpret_cast<const char *>(ssl->session->session_id); -+// QByteArray sessionID(sid, ssl->session->session_id_length); -+// QByteArray debugLineRSA("RSA Session-ID:"); -+// debugLineRSA.append(sessionID.toHex().toUpper()); -+// debugLineRSA.append(" Master-Key:"); -+// debugLineRSA.append(masterKey.toHex().toUpper()); -+// debugLineRSA.append("\n"); -+ -+ QByteArray debugLineClientRandom("CLIENT_RANDOM "); -+ debugLineClientRandom.append(clientRandom.toHex().toUpper()); -+ debugLineClientRandom.append(" "); -+ debugLineClientRandom.append(masterKey.toHex().toUpper()); -+ debugLineClientRandom.append("\n"); -+ -+ QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); -+ QFile file(sslKeyFile); -+ if (!file.open(QIODevice::Append)) -+ qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; -+ if (!file.write(debugLineClientRandom)) -+ qCWarning(lcSsl) << "could not write to file" << sslKeyFile; -+ file.close(); -+ } else { -+ qCWarning(lcSsl, "could not decrypt SSL traffic"); -+ } -+#endif -+ -+ // Cache this SSL session inside the QSslContext -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { -+ if (!sslContextPointer->cacheSession(ssl)) { -+ sslContextPointer.clear(); // we could not cache the session -+ } else { -+ // Cache the session for permanent usage as well -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { -+ if (!sslContextPointer->sessionASN1().isEmpty()) -+ configuration.sslSession = sslContextPointer->sessionASN1(); -+ configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); -+ } -+ } -+ } -+ -+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+ -+ configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; -+ if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -+ // we could not agree -> be conservative and use HTTP/1.1 -+ configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); -+ } else { -+ const unsigned char *proto = 0; -+ unsigned int proto_len = 0; -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L) { -+ q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); -+ if (proto_len && mode == QSslSocket::SslClientMode) { -+ // Client does not have a callback that sets it ... -+ configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; -+ } -+ } -+ -+ if (!proto_len) { // Test if NPN was more lucky ... -+#else -+ { -+#endif -+ q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); -+ } -+ -+ if (proto_len) -+ configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast<const char *>(proto), proto_len); -+ else -+ configuration.nextNegotiatedProtocol.clear(); -+ } -+#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { -+ EVP_PKEY *key; -+ if (q_SSL_get_server_tmp_key(ssl, &key)) -+ configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); -+ } -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... -+ -+ connectionEncrypted = true; -+ emit q->encrypted(); -+ if (autoStartHandshake && pendingClose) { -+ pendingClose = false; -+ q->disconnectFromHost(); -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri -index d2b0c2d60d..2783effaf1 100644 ---- a/src/network/ssl/ssl.pri -+++ b/src/network/ssl/ssl.pri -@@ -60,13 +60,25 @@ qtConfig(ssl) { - HEADERS += ssl/qsslcontext_openssl_p.h \ - ssl/qsslsocket_openssl_p.h \ - ssl/qsslsocket_openssl_symbols_p.h -- SOURCES += ssl/qsslcertificate_openssl.cpp \ -- ssl/qsslcontext_openssl.cpp \ -+ SOURCES += ssl/qsslsocket_openssl_symbols.cpp \ - ssl/qssldiffiehellmanparameters_openssl.cpp \ -+ ssl/qsslcertificate_openssl.cpp \ - ssl/qsslellipticcurve_openssl.cpp \ - ssl/qsslkey_openssl.cpp \ - ssl/qsslsocket_openssl.cpp \ -- ssl/qsslsocket_openssl_symbols.cpp -+ ssl/qsslcontext_openssl.cpp -+ -+ qtConfig(opensslv11) { -+ HEADERS += ssl/qsslsocket_openssl11_symbols_p.h -+ SOURCES += ssl/qsslsocket_openssl11.cpp \ -+ ssl/qsslcontext_openssl11.cpp -+ -+ QMAKE_CXXFLAGS += -DOPENSSL_API_COMPAT=0x10100000L -+ } else { -+ HEADERS += ssl/qsslsocket_opensslpre11_symbols_p.h -+ SOURCES += ssl/qsslsocket_opensslpre11.cpp \ -+ ssl/qsslcontext_opensslpre11.cpp -+ } - - darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp - diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch deleted file mode 100644 index f87c508a38006..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch +++ /dev/null @@ -1,1119 +0,0 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 5208379f9a..92fe29a0ac 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 - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index bb5083c925..77034f9bb6 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. --CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) -+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR - - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -47,47 +47,22 @@ split_incpath { - $$cmake_extra_source_includes.output - } - --CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { -- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ -- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True --} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - - !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true - --CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_LIB_DIR,"^\\.\\./.*") { -- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ -- CMAKE_LIB_DIR_IS_ABSOLUTE = True --} else { -- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) -- # We need to go up another two levels because the CMake files are -- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" --} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - --CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_BIN_DIR, "^\\.\\./.*") { -- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ -- CMAKE_BIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True - --CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { -- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ -- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ -+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True - --win32:!static:!staticlib { -- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ -- CMAKE_DLL_DIR_IS_ABSOLUTE = True -- } --} else { -- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR -- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE --} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_DLL_DIR_IS_ABSOLUTE = True - - static|staticlib:CMAKE_STATIC_TYPE = true - -@@ -167,7 +142,7 @@ contains(CONFIG, plugin) { - cmake_target_file - - cmake_qt5_plugin_file.files = $$cmake_target_file.output -- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - INSTALLS += cmake_qt5_plugin_file - - return() -@@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) { - cmake_qt5_module_files.files += $$cmake_macros_file.output - } - --cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - - # We are generating cmake files. Most developers of Qt are not aware of cmake, - # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 55c74aad66..0bbc8718eb 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!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)") -@@ -58,11 +34,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}) - --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ENDIF - _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}\" -@@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - ) - - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -95,24 +63,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 -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" - ) - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE --!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -128,7 +85,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -280,25 +236,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) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -317,25 +261,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) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -354,11 +286,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}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index e645ba5803..a0e5c68b7e 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -24,166 +24,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 -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macx-xcode { -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator: \ -- version_identifier = $$simulator.deployment_identifier -- else: \ -- version_identifier = $$device.deployment_identifier -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag -- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3f6dc076ca..e69de29bb2 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- info = --show-sdk-path -- equals(info, "PlatformPath"): \ -- info = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- info = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\'") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --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 --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 4db0040dc5..65d6da1f4d 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL - - load(qt_build_paths) - --qml1_target { -- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH -- instbase = $$[QT_INSTALL_IMPORTS] --} else { -- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -- instbase = $$[QT_INSTALL_QML] --} -+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -+instbase = $$NIX_OUTPUT_QML - - !qml1_target:static: CONFIG += builtin_resources - -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index d49f4c49c1..097dcd7d39 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE - - load(qt_build_paths) - --qml1_target { -- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH -- instbase = $$[QT_INSTALL_IMPORTS] --} else { -- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -- instbase = $$[QT_INSTALL_QML] --} -+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH -+instbase = $$NIX_OUTPUT_QML - - target.path = $$instbase/$$TARGETPATH - INSTALLS += target -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 883f8ca215..81db8eb2d4 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -33,7 +33,7 @@ host_build:force_bootstrap { - target.path = $$[QT_HOST_BINS] - } else { - !build_pass:qtConfig(debug_and_release): CONFIG += release -- target.path = $$[QT_INSTALL_BINS] -+ target.path = $$NIX_OUTPUT_BIN/bin - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable - } - INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 1848f00e90..2af93675c5 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -23,6 +23,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. -- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] -- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] -+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT -+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT - } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index fb96d1b6a0..508ed17d30 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { - qqt_libdir = \$\$\$\$[QT_HOST_LIBS] - qt_libdir = $$[QT_HOST_LIBS] - } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -+ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - } - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { - lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 72dde61a40..f891a2baed 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: \ -- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) - PREP_DOC_INDEXES = - DOC_INDEXES = - !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) - } else { - prepare_docs: \ -- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) -+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) - } - - qtattributionsscanner.target = qtattributionsscanner -@@ -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 -- inst_html_docs.path = $$[QT_INSTALL_DOCS] -+ inst_html_docs.path = $$NIX_OUTPUT_DOC - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch -- inst_qch_docs.path = $$[QT_INSTALL_DOCS] -+ inst_qch_docs.path = $$NIX_OUTPUT_DOC - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..eb4840a0aa 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -82,7 +82,7 @@ sourcefiles += \ - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) --sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -+ cmd = $$system("command -v $$2") - exists($${cmd}.pl) { - $${1}_EXE = $${cmd}.pl - cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 0d3dfb6b93..5f935b4424 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf -@@ -12,16 +12,10 @@ - #library - !qt_no_install_library { - win32 { -- host_build: \ -- dlltarget.path = $$[QT_HOST_BINS] -- else: \ -- dlltarget.path = $$[QT_INSTALL_BINS] -+ dlltarget.path = $$NIX_OUTPUT_BIN/bin - INSTALLS += dlltarget - } -- host_build: \ -- target.path = $$[QT_HOST_LIBS] -- else: \ -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - !static: target.CONFIG = no_dll - INSTALLS += target - } -@@ -29,33 +23,33 @@ - #headers - qt_install_headers { - class_headers.files = $$SYNCQT.HEADER_CLASSES -- class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += class_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES -- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += targ_headers - - 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 - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES -- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa -+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers - } - - #module - qt_install_module { - !isEmpty(MODULE_PRI) { -- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { -- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 62e1b69fde..abd63123f9 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { - } - } - --target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE - INSTALLS += target - - TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 545b9a3d1e..6ac0cdefe4 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index cba279c184..5ae3fd62e5 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2533,6 +2533,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 4fdc2e36ac..d3ec222543 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() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -645,12 +649,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - -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) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() - if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 1da00813ce..0bf877afcb 100644 ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); - if (!lib.load()) - return false; - } -diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index 9a24938284..74962b4ae2 100644 ---- a/src/network/kernel/qhostinfo_unix.cpp -+++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -102,7 +102,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); - if (!lib.load()) - return false; - } -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"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); -+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); - } - - QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index e2e573f0e1..1c8289f81e 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) - #if QT_CONFIG(library) - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -+ // Check system library paths first - QLibrary lib(QLatin1String("GL")); -+#ifdef NIXPKGS_MESA_GL -+ if (!lib.load()) { -+ // Fallback to Mesa driver -+ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL)); -+ } -+#endif // NIXPKGS_MESA_GL - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - #endif - } -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index 7c62c2e2b3..fefa40e0f6 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index c4cd66c33b..b6f2691587 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp -@@ -39,6 +39,7 @@ - - #include <qpa/qplatformthemeplugin.h> - #include "qgtk3theme.h" -+#include <QFile> - - QT_BEGIN_NAMESPACE - -@@ -54,8 +55,22 @@ public: - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) - { - Q_UNUSED(params); -- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) -+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { -+ -+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS -+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); -+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); -+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); -+#endif -+ -+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES -+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); -+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); -+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); -+#endif -+ - return new QGtk3Theme; -+ } - - return 0; - } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h -@@ -44,10 +44,13 @@ - - QT_BEGIN_NAMESPACE - -- -+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -+#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) -+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) -+#else - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -- - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) -+#endif - - QT_END_NAMESPACE - -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch deleted file mode 100644 index bb1bbbeb05e06..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtdeclarative.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index ee5b38717..bbccef8c4 100644 ---- a/src/qml/qml/qqmlimport.cpp -+++ b/src/qml/qml/qqmlimport.cpp -@@ -1678,6 +1678,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add import paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); -+ } -+ } -+ - // env import paths - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { - const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); -diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf -index 330da358b..cdf570205 100644 ---- a/tools/qmlcachegen/qmlcache.prf -+++ b/tools/qmlcachegen/qmlcache.prf -@@ -44,7 +44,7 @@ defineReplace(qmlCacheOutputFileName) { - } - - qmlcacheinst.base = $$QMLCACHE_DESTDIR --qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH - qmlcacheinst.CONFIG = no_check_exist - - qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.9/qtscript.patch b/pkgs/development/libraries/qt-5/5.9/qtscript.patch deleted file mode 100644 index 5508dec1280e3..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtscript.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include <pthread.h> - #elif PLATFORM(GTK) - #include <wtf/gtk/GOwnPtr.h> --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.9/qtserialport.patch b/pkgs/development/libraries/qt-5/5.9/qtserialport.patch deleted file mode 100644 index f25524e80bcfe..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtserialport.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index af2dab2..8e17f64 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+#endif - if (!udevLibrary->load()) { -+#ifdef NIXPKGS_LIBUDEV -+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); -+#else - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+#endif - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; diff --git a/pkgs/development/libraries/qt-5/5.9/qttools.patch b/pkgs/development/libraries/qt-5/5.9/qttools.patch deleted file mode 100644 index fbba439ef7a5d..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qttools.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in -index 3b97923a..63336bd5 100644 ---- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in -@@ -2,11 +2,10 @@ - if (NOT TARGET Qt5::qcollectiongenerator) - add_executable(Qt5::qcollectiongenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qcollectiongenerator PROPERTIES -@@ -17,11 +16,7 @@ endif() - if (NOT TARGET Qt5::qhelpgenerator) - add_executable(Qt5::qhelpgenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qhelpgenerator PROPERTIES -diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16f..d60db4ff 100644 ---- a/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -44,11 +44,7 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +55,7 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +66,7 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch deleted file mode 100644 index cf082cddd11a3..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix a following build error: - -In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: -In file included from ../../3rdparty/chromium/base/bind.h:8: -../../3rdparty/chromium/base/bind_internal.h:214:31: error: cannot initialize a parameter of type 'NSError *' with an lvalue of type 'const long' - return (receiver.*method)(std::forward<RunArgs>(args)...); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~ -../../3rdparty/chromium/base/bind_internal.h:285:20: note: in instantiation of function template specialization 'base::internal::FunctorTraits<void (device::BluetoothRemoteGat -tCharacteristicMac::*)(NSError *), void>::Invoke<device::BluetoothRemoteGattCharacteristicMac *, const long &>' requested here - return Traits::Invoke(std::forward<Functor>(functor), - ^ -../../3rdparty/chromium/base/bind_internal.h:361:43: note: in instantiation of function template specialization 'base::internal::InvokeHelper<false, void>::MakeItSo<void (devi -ce::BluetoothRemoteGattCharacteristicMac::*const &)(NSError *), device::BluetoothRemoteGattCharacteristicMac *, const long &>' requested here - return InvokeHelper<is_weak_call, R>::MakeItSo( - ^ -../../3rdparty/chromium/base/bind_internal.h:339:12: note: in instantiation of function template specialization 'base::internal::Invoker<base::internal::BindState<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>, void ()>::RunImpl<void (device::BluetoothRemoteGattCharacteristicMac::*const &)(NSError *), const std::__1::tuple<base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long> &, 0, 1>' requested here - return RunImpl(storage->functor_, - ^ -../../3rdparty/chromium/base/bind.h:62:45: note: in instantiation of member function 'base::internal::Invoker<base::internal::BindState<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>, void ()>::Run' requested here - PolymorphicInvoke invoke_func = &Invoker::Run; - ^ -../../3rdparty/chromium/base/bind.h:77:10: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here - return BindRepeating(std::forward<Functor>(functor), - ^ -../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:241:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here - base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, - ---- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm -+++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm -@@ -239,7 +239,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, -- base::Unretained(this), nil)); -+ base::Unretained(this), nullptr)); - } - } - diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch deleted file mode 100644 index 7156c41c5ec19..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -194,9 +194,6 @@ defineTest(runConfigure) { - } else { - log("Native Spellchecker .............. Not enabled (Default, enable with WEBENGINE_CONFIG+=use_native_spellchecker)$${EOL}") - } -- !isMinOSXSDKVersion(10, 10, 3) { -- log(" Force Touch API usage .............. Not enabled (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}") -- } - } - } - -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf ---- a/mkspecs/features/functions.prf -+++ b/mkspecs/features/functions.prf -@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { - return(false) - } - } else:osx { -- !isMinXcodeVersion(5, 1) { -- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") -- return(false) -- } - !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") - return(false) -@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { - skipBuild("Qt WebEngine requires OS X version 10.10 or newer.") - return(false) - } -- !isMinOSXSDKVersion(10, 10): { -- skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) -- } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") - return(false) -diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri ---- a/src/core/config/mac_osx.pri -+++ b/src/core/config/mac_osx.pri -@@ -5,8 +5,6 @@ load(functions) - # otherwise query for it. - QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) - isEmpty(QMAKE_MAC_SDK_VERSION) { -- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") - } - - QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch deleted file mode 100644 index f332d5e1bb2b0..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/qtwebengine.pro b/qtwebengine.pro ---- a/qtwebengine.pro -+++ b/qtwebengine.pro -@@ -5,7 +5,7 @@ runConfigure() - - !isEmpty(skipBuildReason) { - SUBDIRS = -- log($${skipBuildReason}$${EOL}) -+ error($${skipBuildReason}$${EOL}) - log(QtWebEngine will not be built.$${EOL}) - } - diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch deleted file mode 100644 index 718bda361943e..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtwebkit.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49aa..46772a4bb 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -+#ifdef NIXPKGS_LIBGTK2 -+ QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0); -+#else - QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+#endif - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2fea..86fe39ef1 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,11 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -+#ifdef NIXPKGS_LIBGDK2 -+ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); -+#else - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+#endif - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de65216b..38f5c05e5 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -+#ifdef NIXPKGS_LIBGTK2 -+ QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0); -+#else - QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+#endif - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff684..0f6ff63d1 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,11 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -+#ifdef NIXPKGS_LIBGDK2 -+ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); -+#else - QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+#endif - if (!library.load()) - return 0; - diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix deleted file mode 100644 index 09b6293daebc1..0000000000000 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ /dev/null @@ -1,333 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qt3d-opensource-src-5.9.7.tar.xz"; - sha256 = "0skdp72jlfy97cw9lpa3l2ivs6f5x9w53978sf2xbkl9k1ai268l"; - name = "qt3d-opensource-src-5.9.7.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtactiveqt-opensource-src-5.9.7.tar.xz"; - sha256 = "01yp0railyc80ldvpiy36lpsdk26rs8vfp78xca9jy1glm4cmaik"; - name = "qtactiveqt-opensource-src-5.9.7.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtandroidextras-opensource-src-5.9.7.tar.xz"; - sha256 = "1bl05hr0zm23z7qig3kxhzyvm440wfrjfgsxvpmlvk9pbb8h2q63"; - name = "qtandroidextras-opensource-src-5.9.7.tar.xz"; - }; - }; - qtbase = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtbase-opensource-src-5.9.7.tar.xz"; - sha256 = "004gs95ig51jv2wz64kwzl4rvqqzs4rln3kqmzjs3sh6y1s9bp9n"; - name = "qtbase-opensource-src-5.9.7.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcanvas3d-opensource-src-5.9.7.tar.xz"; - sha256 = "131zwqddjns7cpkdbr33jahqgvnw6f8gdcr1b2hmadi0p2shrcwq"; - name = "qtcanvas3d-opensource-src-5.9.7.tar.xz"; - }; - }; - qtcharts = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcharts-opensource-src-5.9.7.tar.xz"; - sha256 = "1rkj4lkpgdqk4ygxivkj7gc8mlccb5sgi9mfr0xwvq5j85r3dk8n"; - name = "qtcharts-opensource-src-5.9.7.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtconnectivity-opensource-src-5.9.7.tar.xz"; - sha256 = "0f7g2lfnfgsjka7y5hdf0lbzpfxlxh8bfhdxix44cwlmwzjizy3l"; - name = "qtconnectivity-opensource-src-5.9.7.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdatavis3d-opensource-src-5.9.7.tar.xz"; - sha256 = "08anm8byxcym7h1n49j3cbxkh3kh3xjlxd3b8vi8fxyqqhvll4lv"; - name = "qtdatavis3d-opensource-src-5.9.7.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdeclarative-opensource-src-5.9.7.tar.xz"; - sha256 = "0p26c96fb33khbf7ws91ha73n72lwmn714v8spg0bla9m1jkfhk8"; - name = "qtdeclarative-opensource-src-5.9.7.tar.xz"; - }; - }; - qtdoc = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdoc-opensource-src-5.9.7.tar.xz"; - sha256 = "1vs6dy0mdcn65fhpl8nib0pjw9bliqkjnaahqm833ayvxr15vzyj"; - name = "qtdoc-opensource-src-5.9.7.tar.xz"; - }; - }; - qtgamepad = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgamepad-opensource-src-5.9.7.tar.xz"; - sha256 = "0242683h9jz6b0n11s4m4ii2691dbws0gkj45n6sx6z513blfx9f"; - name = "qtgamepad-opensource-src-5.9.7.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgraphicaleffects-opensource-src-5.9.7.tar.xz"; - sha256 = "1yhxa3i3jvfnc9l6a3q3pyk7y702a3pp87ypshb63607xvrxrv2d"; - name = "qtgraphicaleffects-opensource-src-5.9.7.tar.xz"; - }; - }; - qtimageformats = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtimageformats-opensource-src-5.9.7.tar.xz"; - sha256 = "1an0k3rzxjc4x4rscnibdk36zff6g1n41lh5dasys4jc05k3w1b2"; - name = "qtimageformats-opensource-src-5.9.7.tar.xz"; - }; - }; - qtlocation = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtlocation-opensource-src-5.9.7.tar.xz"; - sha256 = "0lp6zn630px1lj7623shq47dlv02nr0aj7iqscrk0yzhygbv7dc2"; - name = "qtlocation-opensource-src-5.9.7.tar.xz"; - }; - }; - qtmacextras = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmacextras-opensource-src-5.9.7.tar.xz"; - sha256 = "0b0znccbach41la226cmps9aaigpz8mj940xj890arjf8hn4jd97"; - name = "qtmacextras-opensource-src-5.9.7.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmultimedia-opensource-src-5.9.7.tar.xz"; - sha256 = "060gic3gl27r7k4vw4n550384b4wadqfn3biajbq6lbyj3zhgxxx"; - name = "qtmultimedia-opensource-src-5.9.7.tar.xz"; - }; - }; - qtnetworkauth = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtnetworkauth-opensource-src-5.9.7.tar.xz"; - sha256 = "14n8wzsyq7bw67r1k442widfvszawgi5sh0b10h2jcrp5aikqr0p"; - name = "qtnetworkauth-opensource-src-5.9.7.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtpurchasing-opensource-src-5.9.7.tar.xz"; - sha256 = "1qvxsi0ar04qy0zajbhvwj5blldhfq2mn3laq15g0xxy1xh4m46i"; - name = "qtpurchasing-opensource-src-5.9.7.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols-opensource-src-5.9.7.tar.xz"; - sha256 = "1jkz2b2wzxzmskvwwb4afqxz0yp0siaf3yhj2i01y865sp6q1wz0"; - name = "qtquickcontrols-opensource-src-5.9.7.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols2-opensource-src-5.9.7.tar.xz"; - sha256 = "0w9rq77a8vc9avhbwbx7swg7zw7jn21wd7si59822rw9ln1p6zb0"; - name = "qtquickcontrols2-opensource-src-5.9.7.tar.xz"; - }; - }; - qtremoteobjects = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtremoteobjects-opensource-src-5.9.7.tar.xz"; - sha256 = "1ninscf4jkframv585zzi76fml1lyz0mhb091r2r54lrf66wl3lw"; - name = "qtremoteobjects-opensource-src-5.9.7.tar.xz"; - }; - }; - qtscript = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscript-opensource-src-5.9.7.tar.xz"; - sha256 = "0mv33a1mjaahq7ixfasvjasc881bprfbkjhx8pn3z5f0l8213m67"; - name = "qtscript-opensource-src-5.9.7.tar.xz"; - }; - }; - qtscxml = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscxml-opensource-src-5.9.7.tar.xz"; - sha256 = "0xz2q2bl1n43gxx00nrzyc0bsnq4wch0k2rkj3prc9gsgmpq0bih"; - name = "qtscxml-opensource-src-5.9.7.tar.xz"; - }; - }; - qtsensors = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsensors-opensource-src-5.9.7.tar.xz"; - sha256 = "0pfh4lr9zxsh9winzx1lmcgl2hgp9lr45smcvslr4an93z6mbf8r"; - name = "qtsensors-opensource-src-5.9.7.tar.xz"; - }; - }; - qtserialbus = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialbus-opensource-src-5.9.7.tar.xz"; - sha256 = "0n6z56axm0gbrxmnwbz8fv40ar9mw1rlfvmpqvpg5xb9031qil1b"; - name = "qtserialbus-opensource-src-5.9.7.tar.xz"; - }; - }; - qtserialport = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialport-opensource-src-5.9.7.tar.xz"; - sha256 = "05qy4m1p5j5bh6af7d97iblsmgy9kppm5wif3bl63p6yghn319sh"; - name = "qtserialport-opensource-src-5.9.7.tar.xz"; - }; - }; - qtspeech = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtspeech-opensource-src-5.9.7.tar.xz"; - sha256 = "0nnbqnh18vw26vphancs38vjr816xha8m6wl389kjqi01kjrcz70"; - name = "qtspeech-opensource-src-5.9.7.tar.xz"; - }; - }; - qtsvg = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsvg-opensource-src-5.9.7.tar.xz"; - sha256 = "0r2mqy6lb2ypmilf83zyp73v5d9ars314jfm6f0fv5if8yw253v2"; - name = "qtsvg-opensource-src-5.9.7.tar.xz"; - }; - }; - qttools = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttools-opensource-src-5.9.7.tar.xz"; - sha256 = "18b7jg25434p80yr929nfihk0i124bxpd2dv9mqdcicnv5q0ybnn"; - name = "qttools-opensource-src-5.9.7.tar.xz"; - }; - }; - qttranslations = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttranslations-opensource-src-5.9.7.tar.xz"; - sha256 = "051a3igp1qnd7d7bg2dvjaqwh6f67fvkn19jdfjzrdis7kcsfvdk"; - name = "qttranslations-opensource-src-5.9.7.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtvirtualkeyboard-opensource-src-5.9.7.tar.xz"; - sha256 = "1qcj6ncg53rv4pg4ijdq7vbkzgzfr9bn40aif7g4dndykj0zwla7"; - name = "qtvirtualkeyboard-opensource-src-5.9.7.tar.xz"; - }; - }; - qtwayland = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwayland-opensource-src-5.9.7.tar.xz"; - sha256 = "0y6ky1ipg42gq390ibgr4nns9i4j648yb7bkmx6b7lhsi7mvnp2n"; - name = "qtwayland-opensource-src-5.9.7.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebchannel-opensource-src-5.9.7.tar.xz"; - sha256 = "189qkfxixddfblwkaf46yrqjp91vhmw90gpafjryqfmd2141r8qj"; - name = "qtwebchannel-opensource-src-5.9.7.tar.xz"; - }; - }; - qtwebengine = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebengine-opensource-src-5.9.7.tar.xz"; - sha256 = "0kzpgks5h19rm7gbhr688lr5f5d9ykf062kj91q7wf6fk7qd72v2"; - name = "qtwebengine-opensource-src-5.9.7.tar.xz"; - }; - }; - qtwebkit = { - version = "5.9.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz"; - sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998"; - name = "qtwebkit-opensource-src-5.9.1.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.9.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz"; - sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4"; - name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebsockets-opensource-src-5.9.7.tar.xz"; - sha256 = "1qqvd6qf7m2xq71mdaidwabj5c03cbbi1hwc7p95fvbnz9crz79x"; - name = "qtwebsockets-opensource-src-5.9.7.tar.xz"; - }; - }; - qtwebview = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebview-opensource-src-5.9.7.tar.xz"; - sha256 = "1zwqkmzik4f83hdffmw0hz90mzga34hkyz7d0skfbdp25y278r12"; - name = "qtwebview-opensource-src-5.9.7.tar.xz"; - }; - }; - qtwinextras = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwinextras-opensource-src-5.9.7.tar.xz"; - sha256 = "1a57v7krglfdi4gizm402jn9pg7fqpcma7xk6sm68zg1siv11a6x"; - name = "qtwinextras-opensource-src-5.9.7.tar.xz"; - }; - }; - qtx11extras = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtx11extras-opensource-src-5.9.7.tar.xz"; - sha256 = "02jdiw94dasnkszi5w1pysfgz8xrr71pzah37nbnqg0knn4dzich"; - name = "qtx11extras-opensource-src-5.9.7.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.9.7"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtxmlpatterns-opensource-src-5.9.7.tar.xz"; - sha256 = "0j0rxkpyww5cgcjhy0332jsyka1d811wf6zmr16d5fdkbryp7d65"; - name = "qtxmlpatterns-opensource-src-5.9.7.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 2e47a21356573..fe24d0fcddfd9 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU_combined, glew, freetype, fontconfig, fribidi, libX11 }: +{ stdenv, fetchurl, libGLU, libGL, glew, freetype, fontconfig, fribidi, libX11 }: stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; - buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; + buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. meta = with stdenv.lib; { description = "A free implementation of the OpenGL Character Renderer"; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 471bcb2223475..bdd8dd9d99980 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi -, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut +, libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ plib freeglut xorgproto libX11 libXext libXi - libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut + libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut openscenegraph openal expat apr curl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 2afd7650618bc..cbb6a4b64f17b 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "0nmsq0qx4jmrrhrc6bfm11wwvyszvfgl45xizw69yra3cv9pgmm6"; + sha256 = "0dvf2407z9n6lczm0l5vzcvpw6r6z1wzrs2gk3dqjrgynq6952qr"; }; nativeBuildInputs = [ cmake git swig ]; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 4876c39ce83ce..b3214cc01dfc7 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.33"; + version = "3.1.34"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "12kll8nv4b90nlx3y0213lsncqw2ydshjx4g6dv7jah6j1pv29ix"; + sha256 = "0a44p71aqyifm7qkp892aczb0bn6a9fv4657dsscxszvdm25a92x"; }; installPhase = '' diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index e286678830208..a7ffc146f414c 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU_combined, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL gtk2 libGLU_combined ]; + buildInputs = [ SDL gtk2 libGLU libGL ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 11ba48c59716b..4afb310d49ace 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }: +{ fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: stdenv.mkDerivation { pname = "soxt"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ coin3d motif xlibsWrapper libGLU_combined libXmu ]; + buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; meta = with stdenv.lib; { homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index e3fd7ad57e02e..94f96b867d550 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU_combined, libva, pkgconfig }: +{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU, libGL, libva, pkgconfig }: stdenv.mkDerivation rec { pname = "libva-vdpau-driver"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libvdpau libGLU_combined libva ]; + buildInputs = [ libvdpau libGLU libGL libva ]; postPatch = '' sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 0ae5ba147cb73..688dc8d451ee6 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, libGLU_combined }: +{ stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }: stdenv.mkDerivation rec { name = "${pname}-${date}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; - buildInputs = [ unzip cmake libGLU_combined ]; + buildInputs = [ unzip cmake libGLU libGL ]; doCheck = false; # FIXME: test failure checkTarget = "test"; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index dfec2197385cc..971ab485221da 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -37,5 +37,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k"; + xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp"; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index fd772a1ff9d22..adcb2e74b0bbd 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU_combined, aalib +{ stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib libGLU_combined aalib libvorbis libtheora speex perl ffmpeg flac + alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg flac libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 4169b9e4d35d5..c3bf3217b6a73 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, libGLU_combined, xorg, +{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg, version? "2.8", # What version samples? false # Should samples be installed }: @@ -47,7 +47,7 @@ in stdenv.mkDerivation { patches = stdenv.lib.attrByPath [version "patches"] [] src_info; patchFlags = "-p0"; - buildInputs = [ makeWrapper perl libGLU_combined xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; + buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; doCheck = false; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix new file mode 100644 index 0000000000000..7c1ec79f7da3c --- /dev/null +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, ctypes }: + +buildDunePackage rec { + pname = "eigen"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "owlbarn"; + repo = pname; + rev = version; + sha256 = "0pbqd87i9h7qpx84hr8k4iw0rhmjgma4s3wihxh992jjvsrgdyfi"; + }; + + minimumOCamlVersion = "4.04"; + + propagatedBuildInputs = [ ctypes ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl"; + platforms = platforms.x86_64; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix new file mode 100644 index 0000000000000..4eeb8d975fd82 --- /dev/null +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, + rdkafka, zlib }: + +buildDunePackage rec { + pname = "kafka"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "didier-wenzek"; + repo = "ocaml-kafka"; + rev = version; + sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy"; + }; + + buildInputs = [ base cmdliner ocaml_lwt zlib ]; + + propagatedBuildInputs = [ rdkafka zlib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/didier-wenzek/ocaml-kafka; + description = "OCaml bindings for Kafka"; + license = licenses.mit; + maintainers = [ maintainers.rixed ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 427d0d5a0e148..ae85847b58b48 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU_combined, freeglut, camlp4 } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU, libGL, freeglut, camlp4 } : let pname = "lablgl"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ocaml findlib lablgtk freeglut camlp4]; - propagatedBuildInputs = [ libGLU_combined ]; + propagatedBuildInputs = [ libGLU libGL ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix new file mode 100644 index 0000000000000..b2546f3e93ce5 --- /dev/null +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, integers, stdlib-shims }: + +buildDunePackage rec { + pname = "owl-base"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "owlbarn"; + repo = "owl"; + rev = version; + sha256 = "1v4jfn3w18zq188f9gskx9ffja3xx59j2mgrw6azp8lsbqixg5xk"; + }; + + propagatedBuildInputs = [ stdlib-shims ]; + + minimumOCamlVersion = "4.06"; + + meta = with stdenv.lib; { + description = "Numerical computing library for Ocaml"; + homepage = "https://ocaml.xyz"; + platforms = platforms.x86_64; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix new file mode 100644 index 0000000000000..95d4f6da704c0 --- /dev/null +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -0,0 +1,15 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, alcotest +, eigen, stdio, stdlib-shims, openblasCompat, owl-base +}: + +buildDunePackage rec { + pname = "owl"; + + inherit (owl-base) version src meta; + + buildInputs = [ eigen ]; + checkInputs = [ alcotest ]; + propagatedBuildInputs = [ stdio stdlib-shims openblasCompat owl-base ]; + + # tests not enabled for now due to owlbarn/owl/issues/460 +} diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index bd84dd06e7f4a..e76b1802c23f9 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU_combined freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 47773c2095457..5fc747cbc8c29 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -5,7 +5,7 @@ , glibc , openssl , libgit2 -, libGLU_combined +, libGLU, libGL , freetype , xorg , alsaLib @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { libs = [ cairo libgit2 - libGLU_combined + libGLU libGL freetype openssl libuuid @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { glibc openssl gcc48 - libGLU_combined + libGLU libGL freetype xorg.libX11 xorg.libICE diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 91cf01847090d..080da830af698 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -7,7 +7,7 @@ , openssl , gcc , libgit2 -, libGLU_combined +, libGLU, libGL , freetype , xorg , alsaLib diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 51c57bb5c5195..b67a972b00b15 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU_combined, xlibsWrapper }: +{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure freeglut libGLU_combined xlibsWrapper ]; + propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 4032b527e88b5..1f2a89c5e0c68 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.6.1"; + version = "3.6.3"; src = fetchPypi { inherit pname version; - sha256 = "1c56066rx09xk1zbd156whsynlakxazqq64i509id17015wzp6jj"; + sha256 = "3bb5229eed6fbbdafc13ce962712ae66e175aa214c69bed35a06bffcf0c5e244"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index b88c3c69b5d93..249b185a402c5 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.13"; + version = "0.29.14"; src = fetchPypi { inherit pname version; - sha256 = "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e"; + sha256 = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index d92100cc1419b..be2526ffcd433 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: buildPythonPackage rec { - version = "3.0.4"; + version = "3.0.5"; pname = "GitPython"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "3237caca1139d0a7aa072f6735f5fd2520de52195e0fa1d8b83a9b212a2498b2"; + sha256 = "9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42"; }; patches = [ diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 52cf7598da8d0..d36a47c331cd1 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.0.2"; + version = "8.0.3"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1a5y1qriy76hl4yxvbf365b1ggsxybm06mi1pwb5jkgbkwk2gkrf"; + sha256 = "a53470be082fce1843fb73002be2504828f9abc49a84eab5d1effc06ae2a5ddc"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 94ec1557a2630..85ce02be1c3d6 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.2"; + version = "0.2.3"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "00981908c7cf54be58c0bfe902d7743225554ecf3432b30723e9300d9f3a0b0e"; + sha256 = "ca663059d61fbd2899aed4e3cedbc3f983aa67afd3ae1617db3c59b724206fb3"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 051ae50e3a573..d64bd672ca06e 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.2.1"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "b12a7be3d89b270f266f8643aaa126404e5cdc0929bd6f09548b8eaed85e2aa1"; + sha256 = "a4334cabf47c167d44ab5a6198837b80deec5d5bad1b5cf70c966c3a330260e8"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index ff88d86fa29b1..5be6f9d86fda8 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.4.0"; + version = "2.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bef494dd39a12e2e76cf4ea772a2746f1669ee243f03ad3579085ca9605beccb"; + sha256 = "e43e0fd628506f95752e90ab1579e5495183cc3c46915d0b0a062975cb5d181b"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index fee714ed218c7..62f95c3cefcef 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.4.2"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "9db56a69ad5d43fe7656ad8efb4083cb1800ea400f7828af6b20f44c0882404f"; + sha256 = "e6ccb7ccf9bab9c49a391db37e0d399ba0e73f969801ae35ff74020bfd4fc346"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index efc4c824a395c..1c0efb4da3b50 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.10.0"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "1hdysr9z28sgwv47mivf4iyr1sg19hgfz349dghgdlk3rkl6v0s5"; + sha256 = "ec88b5ccefe2d47d8f14916a006431d0afb756751ee5c46f28654a7d8a69be53"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index bf3dcb869f989..af3e4547628ae 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.15.2"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f"; + sha256 = "e1a318a4c0b787833ae46302c02488b6eeef413c6a13324b3261ad320f21ec1e"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 1899559b2a919..5d24a05aa54d5 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.3.2"; + version = "2.3.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "09a3fba616519311f1af8a461f804b68f0370e100c9264a035aa7846d7852e33"; + sha256 = "71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a"; }; # From astroid/__pkginfo__.py diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index b5a7f014eec3c..fac97d2d36820 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "astropy-helpers"; - version = "3.2.1"; + version = "3.2.2"; disabled = !isPy3k; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1klxyfvl9hbhy37n1z3mb0vm5pmd7hbsnzhjkvigz3647hmfzva6"; + sha256 = "cf32cb008b19597a1fe1a4d97f59734f30cd513aa3369a321e7b5b86cdb623fb"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index dea22cccb0653..fce2ecd392ab0 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.2.2"; + version = "3.2.3"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "8553f4a95e9938a0c7ae520633f7172356824b8eb324dd967fca6baf00ac19bf"; + sha256 = "47f00816c2978fdd10f448c8f0337d6dca7b8cbeaab4bf272b5fd37cb4b890d3"; }; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 8bcfb2d84a28c..2a47f13fe4b84 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.19.0"; + version = "0.20.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0sp3m6sgw83rhvg87y78lhk4xxx58ffzyf9rsq5f1a7b8azbnlxj"; + sha256 = "0yjszgg1zbbsfxj1gv17ymc2hcfvymkvg69dvpvwy0dqspjxq0ma"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 16ebf49615858..5757b7fb15c9d 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.14"; + version = "0.12.16"; src = fetchPypi { inherit pname version; - sha256 = "a76b0b76e4e843bfffc26771f6e1848be6f1c225e79f541c12215ae90503e489"; + sha256 = "df5380b96dc9c1b129e68057578e4a2d42d9b73a0ae97ff263a9072baf8f7a5e"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 5124077b11872..428ac49594102 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "da20c682993d87d41534ffc2be0819d924aaf230b27abbc5d1fa8ad62410bf39"; + sha256 = "20b2ad44d19aa494fa11cb2d1290359b3a7a0c6c8908179b4af0c9367d83e370"; }; # Relax version constraint diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix index 31a7d81dcab8e..c11ffae1e3dde 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-cosmosdb-table"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "4a34c2c792036afc2a3811f4440ab967351e9ceee6542cc96453b63c678c0145"; + sha256 = "5f061d2ab8dcf2f0b4e965d5976e7b7aeb1247ea896911f0e1d29092aaaa29c7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 0b7d0c9c775f5..5c45b843c7654 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-datalake-store"; - version = "0.0.47"; + version = "0.0.48"; src = fetchPypi { inherit pname version; - sha256 = "19fkkabr76r851r95kh5dpk4bdn3jkysv3aij6i2x99mkb4vxg2m"; + sha256 = "d27c335783d4add00b3a5f709341e4a8009857440209e15a739a9a96b52386f7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 33617383a1dba..aef56be79c0bb 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb"; + sha256 = "0y28z30g7y2pj7rfxyxmqpr19z24d01g9qhafvjxry748im1961h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 236eb0cd8ce38..4663b9fa03563 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "7.0.0"; + version = "8.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "32ce90691b96ecdaa974ecb4d35063377c8fd21fd05984164507b63113f3456b"; + sha256 = "1prg4b1agda9bsn6zmvffkj22rr6jy784rdfp6154yifjr6z5jiv"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index cc19e90486394..5d13acb6ec837 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "06l362xiqhk8vvb1pch6ngfyv8m00ahr6ysdznd6qvxz8awazy10"; + sha256 = "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 4c02be90a09ce..4f2481097e1ae 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "5.1.0"; + version = "6.0.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "88db03ea5b9db1dfbf3de8c7be111ed41b121a374645e3ddf3fbba47584c32b1"; + sha256 = "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 5ad1e620ede07..5a5a708a5dd2c 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "109w1kj45fvwc94bkhdkj3bdysrskfz8i6ph4qlpjk340zy81vvl"; + sha256 = "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 4a372139fdb53..ea6c1502123f0 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.43.1"; + version = "0.44.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e3ab5acc9f13746e1f4ce19ccbacc4522527dd1f75eff2826cd882b7ba54806a"; + sha256 = "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index e60d4c60aeab0..a35c2d0739458 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.74"; + version = "1.75"; src = fetchPypi { inherit pname version; - sha256 = "1h4hcpx1vqrcddpcznyxy14zzvy2yanlkz0117w5n869w8djq595"; + sha256 = "01lrm353si63anhhynf6hqbd3f753c2k8dkk953j3g6257py8q2h"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 78372598096f8..3c84366c9d136 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.1.0"; pname = "bitarray"; src = fetchPypi { inherit pname version; - sha256 = "3eb500f8b9cde19e14472fcbee0195dbf0fbac006f8406a03f0cfb495dff20a0"; + sha256 = "0nv1283qcfilhnb4q6znlijply6lfxwpvp10cr0v33l0qwa86mwz"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index d6d55accaca70..90a4b99cda33f 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, fetchpatch , fetchPypi , isPyPy }: @@ -14,6 +15,15 @@ buildPythonPackage rec { sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is"; }; + + patches = [ + # Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78 + (fetchpatch { + url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; + sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; + }) + ]; + meta = with stdenv.lib; { homepage = http://stutzbachenterprises.com/blist/; description = "A list-like type with better asymptotic performance and similar performance on small lists"; diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index b5aa9e6cf0337..8b7139f5a627f 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "boltons"; - version = "19.1.0"; + version = "19.3.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0b55wly0ksviyl3a4dmih9vzd7bj3p10gr6la4722cs9cx4128q5"; + sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 828e243af9c2c..4b17b5046aa41 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "BTrees"; - version = "4.6.0"; + version = "4.6.1"; buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0bmkpg6z5z47p21340nyrfbdv2jkfp80yv085ndgbwaas1zi7ac9"; + sha256 = "b3a0e1d073800bf7bcca6cbb97a6b3c9ec485a4ba3ee0b354da1ed076cfb9f30"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix new file mode 100644 index 0000000000000..6f3632f743bea --- /dev/null +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -0,0 +1,93 @@ +{ lib + , buildPythonPackage + , isPy3k + , pythonOlder + , fetchFromGitHub + , pyparsing + , opencascade + , stdenv + , python + , cmake + , swig + , ninja + , smesh + , freetype + , libGL + , libGLU + , libX11 + , six +}: + +let + pythonocc-core-cadquery = stdenv.mkDerivation { + pname = "pythonocc-core-cadquery"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "CadQuery"; + repo = "pythonocc-core"; + # no proper release to to use, this commit copied from the Anaconda receipe + rev = "701e924ae40701cbe6f9992bcbdc2ef22aa9b5ab"; + sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c"; + }; + + nativeBuildInputs = [ + cmake + swig + ninja + ]; + + buildInputs = [ + python + opencascade + smesh + freetype + libGL + libGLU + libX11 + ]; + + propagatedBuildInputs = [ + six + ]; + + cmakeFlags = [ + "-Wno-dev" + "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" + "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" + "-DSMESH_LIB_PATH=${smesh}/lib" + "-DPYTHONOCC_WRAP_SMESH=TRUE" + ]; + }; + +in + buildPythonPackage rec { + pname = "cadquery"; + version = "2.0RC0"; + + src = fetchFromGitHub { + owner = "CadQuery"; + repo = pname; + rev = version; + sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3"; + }; + + buildInputs = [ + opencascade + ]; + + propagatedBuildInputs = [ + pyparsing + pythonocc-core-cadquery + ]; + + # Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7). + disabled = !(isPy3k && (pythonOlder "3.8")); + + meta = with lib; { + description = "Parametric scripting language for creating and traversing CAD models"; + homepage = "https://github.com/CadQuery/cadquery"; + license = licenses.asl20; + maintainers = with maintainers; [ costrouc marcus7070 ]; + }; + } diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 3b49289c2e48a..c471240c87ad5 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.5"; + version = "1.1.6"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a88390553a9ea628fdb74b5b358ed83a657e058bcc811e5819d9db856b4fcf5b"; + sha256 = "9ecda1469e497e3fed346b23ac94fd576e1bd9962677ab88975f4f598186e851"; }; propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index 5596b3e37e596..1fb506682baf0 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cchardet"; - version = "2.1.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "1h3wajwwgqpyb1q44lzr8djbcwr4y8cphph7kyscz90d83h4b5yc"; + sha256 = "240efe3f255f916769458343840b9c6403cf3192720bc5129792cbcb88bf72fb"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 6d80516164173..15d15c23a8d29 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.13.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "558b3afef987cf4b17abd849e7bedf64ee12b28175d564d05b628a0f9355599b"; + sha256 = "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 5dc84e07eb0cc..eeccaedf5f68b 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.24.5"; + version = "0.24.8"; src = fetchPypi { inherit pname version; - sha256 = "1268c9730ba869f0f630eaf5bac34795553a97385d38eb91b9f7f5c3f73c8982"; + sha256 = "5aa1540ee9a7efc23ebe54a22f1a505766a4bb44f64a0f4fe79574a156a9b43e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 146779082e4ad..13a91837a6c74 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cleo"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "0d0sxca308ilp73jdny4frn93asr4ih87xxl1d9rxf8m12xssa3c"; + sha256 = "99cf342406f3499cec43270fcfaf93c126c5164092eca201dfef0f623360b409"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index eeee7370b7e3c..6bc092dcd4e0c 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "click-default-group"; - version = "1.2.1"; + version = "1.2.2"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "click-contrib"; repo = "click-default-group"; rev = "v${version}"; - sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4"; + sha256 = "0nk39lmkn208w8kvq6f4h3a6qzxrrvxixahpips6ik3zflbkss86"; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index d4210ade06e27..4ac38986245d5 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "4dab97fe52d7075ecc87b8cadf549ca2c2c628512741193fb81a0c0433b46715"; + sha256 = "d3d608b9ff405e7ba5e9629ef0c09b7605997e1aea0dafb2aaa66761ff7cab08"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 63366d93056cd..9c5f6145d8fd5 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; - version = "2.8.0"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"; + sha256 = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index b8c784023c23d..f23d592919255 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,13 +5,17 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.4.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1pi54wqj2p6ka13x7q8d5zgqg9bcf7m5d00l7x5bi204qmhn65c6"; + sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce"; }; + postPatch = '' + substituteInPlace src/tests/test.py --replace "DocumentationTestCase" "NoDocumentation" + ''; + meta = with lib; { homepage = https://pypi.python.org/pypi/decorator; description = "Better living through Python with decorators"; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index ee7c89d8167d3..1d4461fea1952 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.6"; + version = "1.2.7"; src = fetchPypi { inherit pname version; - sha256 = "1hcw9y7dvhwg5flk6wy8aa4kkgpvcqq3q4jd53h54586fp7w85d5"; + sha256 = "408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308"; }; postPatch = '' diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 86a124d23553b..0d49f62782129 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.4.0"; + version = "2.4.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a78babbec1c3088a6c3a5b62cddccaeac4717236ea4f5d28b6af00f2d9b2e341"; + sha256 = "12h91rvbrf9qmdmj5nfqhcd3bpwq1pvk990bag4hyxcf86qlzds4"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index aea6bcd9504bc..81575058b1571 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.2.9.post0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ecb3d0e4f71d0fa7f38db6bcc276c7c9a1c6638a516d726495934a553eb3fbe0"; + sha256 = "08fyi2r246733vharl2yckw20rilci28r91mzrnnvcr638inw5if"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 28ec9aae24f15..cea5a7976bb40 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.7.1"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "1z2dndkpypk4pvb0byh5a771vgp50vn8g1rbk5r3sml6dm4wcn7s"; + sha256 = "1v7mf48gb2qmmks3ifnhkh0vfd7hpvx5v81ypc9cqy35n3ir0q4a"; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index b10424de396b7..acf49d7416730 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "54fa3886884cbc5d9c2f523e0e4af2cc3b976bd077718b2b443a5be44eb481ec"; + sha256 = "ec305ca79b6e16fb6d699d3159258f9f680ead8ea5ef9b419e7faf13f31355df"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index a82f9d3fb9b6b..5756d0ab5e61b 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.7.2"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "01xq232h321716r08rari9payas7fsiwwr5q6zgcrlwkckwxxczk"; + sha256 = "000abaayhymh4rxmk19hwhlyibc62rs0qdfczkhf4wb3p9san8lk"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index f8598c1e819b1..d1ebc686bbd9c 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.13"; + version = "2.1.14"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7a28a4eb0167eba491ccfafd7006843b5cdd26d8c93b955a74c2ea74f94efc2c"; + sha256 = "d9159141fc354c4c28cc2b2586d55ba6d5e1531f5470218bb56a75be03d67398"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index eccf694425e8e..aaf93be8b9789 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.6"; + version = "2.2.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a8ca1033acac9f33995eb2209a6bf18a4681c3e5269a878e9a7e0b7384ed1ca3"; + sha256 = "16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86"; }; patches = stdenv.lib.optional withGdal diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix index c885466f5af22..5432bc2888e2d 100644 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ b/pkgs/development/python-modules/dotnetcore2/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dotnetcore2"; - version = "2.1.9"; + version = "2.1.11"; format = "wheel"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version format; python = "py3"; platform = "manylinux1_x86_64"; - sha256 = "0h1igixk84md68z7gwj1vd6ki4d5drxh0ih5zww8xcr3qh5r0drb"; + sha256 = "a335fb0abdaaeee7ba128b81b5350adfc5d2b2adf6a64cbc4d1a3b7cdf8560da"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 8c720dec3256b..dd3d8d3942557 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "emcee"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "01mx1w4a7j5p29a3r7ilh9la9n6gnlgwb46m439vrnfgvbvjjy9c"; + sha256 = "035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 5af13c488baf7..8ac7b597a4cb5 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -13,13 +13,13 @@ }: buildPythonPackage rec { - version = "0.8.10"; + version = "0.8.11"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc"; + sha256 = "0e4c9b9b42257deb9c38c112dbe44e1203dea686d454dc76adb72ded25ac878c"; }; # https://github.com/nicfit/eyeD3/pull/284 diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 6de5c25c7333a..f9155187ca301 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "2.0.3"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "19zdcdmc11syjbmnbq98yny3dwb5jqw8cxcbq9g2scwzc5f7b32y"; + sha256 = "6327c665c0d8721280b3036d9c9e851c60092bc1f30c8394cc433f8723e2bda5"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 08aa2fe7eb223..e6c9021bdf168 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.7.1"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "10i61g8srx1dk0wfjj11s7ka5pv0661ivwg2r0y3y2nsnf5b90s4"; + sha256 = "8b592ec0e51348f29636706fe3266423a0e41c35c9df63a259a91488450c1285"; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 0a3e17abacaa1..2cd7ad4cf4180 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.9.post2"; + version = "1.8.11"; src = fetchPypi { inherit pname version; - sha256 = "210fb038b579fab38f35ddbdd31b9725f4d5099b3edfd4b87c983e5d47b79983"; + sha256 = "1e7ca9e051f5bffa1c43c70d573da9ca223fc076b84fa73380614fc02b9eb7f6"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 3a9647348effc..e6ac743396a0f 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-debugger"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6e662f7e75a3ed729d3be7c92e72bde385ab08ec26e7808bf3dfc63445c87857"; + sha256 = "712d7c1ff69ddf3f0130e94cc88c2519e720760bce45e8c330bfdcb61ab4090d"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index a10fccfc911d1..e76b7cdf26906 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.7.8"; + version = "3.7.9"; src = fetchPypi { inherit pname version; - sha256 = "19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548"; + sha256 = "45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb"; }; checkInputs = [ pytest mock pytestrunner ]; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index b74d4cddf6daa..dad0372a8c1f7 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "future"; - version = "0.18.1"; + version = "0.18.2"; src = fetchPypi { inherit pname version; - sha256 = "858e38522e8fd0d3ce8f0c1feaf0603358e366d5403209674c7b617fa0c24093"; + sha256 = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"; }; doCheck = false; diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index e469de924f6ad..fc4fb5a46d868 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "google-pasta"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "1zmqfvy28i2509277s6sz098kddd16cx21vpxyc8xml1nclcxlbr"; + sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index b317d0cd15467..52248605c757f 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "532cee03a976eedf308c178484b61f80bc4c68991b3bd8eb8f6abd000a217ef7"; + sha256 = "fa92a77fcc79032dba756b82196a29f63a7b374379bacdb78be128e09b8abc03"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix index c262331a6e132..6b2536d37b393 100644 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ b/pkgs/development/python-modules/graph_nets/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "graph_nets"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "6f27f0358a477d4ec3ab300bf09944b4dfdd5c10b0a5f7ac06bcb32d1327ebe1"; + sha256 = "73e98a5930c6c7b609257ada2cf4523db70810343e0593bf0fa710b77e991933"; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index ecdb76173fa1e..88e3118d4561b 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -6,13 +6,13 @@ if django.version != "1.8.19" then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3" else buildPythonPackage rec { pname = "graphite-web"; - version = "1.1.5"; + version = "1.1.6"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d43945d190f2b3a6d18daa6ace9a1bd3695e93dc593f50cd72c2af420883b99d"; + sha256 = "f4c293008ad588456397cd125cdad7f47f4bab5b6dd82b5fb69f5467e7346a2a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 52171470c2719..d90ded1fb5fac 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.15.3"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "18381e13bbd1e2f206a1b88a2af4fb87affd7d06ee7955a6e5e6a79478a9adfc"; + sha256 = "3b930cbe1c76bbd30455b5e82ba723dea94159a5f988e927f443324bf7cc7ddd"; }; postPatch = '' diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index eb6cca3e6ec6c..c5c111845d15f 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "handout"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "dbe5da9b422fa937b94a1a5221ce99387ebd75fe97ab4255e49b26d846b8614b"; + sha256 = "52daaf1f9a4cb2ceb88c1dedf85d22ef449b9422b424a2534d21f941e57bc915"; }; propagatedBuildInputs = [ imageio imageio-ffmpeg ]; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index 4403071cb8fc0..c22de6d8a6695 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hiredis"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "158pymdlnv4d218w66i8kzdn4ka30l1pdwa0wyjh16bj10zraz79"; + sha256 = "aa59dd63bb3f736de4fc2d080114429d5d369dfb3265f771778e8349d67a97a4"; }; propagatedBuildInputs = [ redis ]; diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index f3b24b3d371e1..db59bb49cf239 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.8"; + version = "0.4.9"; src = fetchPypi { inherit pname version; - sha256 = "00d1zfk72xzyibh7l4ib57y0isn5gic7avgbh7afbkk99iwd5smi"; + sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 3d8f07793f9e3..33f76f0a24862 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "afd4e7beedc7417fed12cb2e15a21610c73cb08821c7f09aa926be24d4038dae"; + sha256 = "3b1c2222ec7b8159e7ad059e4493c6cc634c86184af0bf2ce5aba6edd241cf5f"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 2d5e9d780945f..10c64fa6b3f46 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inotify-simple"; - version = "1.1.8"; + version = "1.2.1"; src = fetchPypi { pname = "inotify_simple"; inherit version; - sha256 = "1pfqvnynwh318cakldhg7535kbs02asjsgv6s0ki12i7fgfi0b7w"; + sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv"; }; # The package has no tests diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 0155cf665bd8e..1fbdd510e714c 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.6.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "72f8c72873f9d3f536a696014e4ebffe431a644d7aa95db18c52e086d23b2939"; + sha256 = "a589e35f0dab89283c1a3de9d70ed6cf657932aaed8e8ce1b0e5801aaab1da67"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 184c86e926814..4cdef182ca782 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf"; + sha256 = "1wcmn01md6hykblk5zz8wd5zizyisspspakz446jg2kqfv4y3q03"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index 8d8f6b53ceb8f..bf5877c9f08cf 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.10"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "fc2fcdf95d954d9bbbdb1303a2c3c32997935655c99aff300f1759dba3cebc6d"; + sha256 = "a212a244b0a6022a61657746c8120ac9b6db83432371b345154075eb8faceb61"; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index d4bc1dd523d5e..e18f3bc9b3dab 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "488ab3b63a96c246f7ded14b3458eb13a36e3e16eb4319aa56806476517c7433"; + sha256 = "383f331e28cd8f6e3fa86f3e7052efa541b7ae8bf328a4e692aa045cfc0ecf25"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index 35244e092da38..a26a040eedd26 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "f9baac32aa51c3052d03b86ff30a9856900b8b4a4eb175f7bf2c8722520b8637"; + sha256 = "7bda99589b4566f5027c2aeae122f409d8ccf4c811b278b8cfb616903871efb2"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index eff4f41979a21..8361e37239e81 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "e74e490fefa3b8f33620fca98f7cd9a53fb765b9ed6f78360482a3f364230885"; + sha256 = "f1aaca95db795d6a9f7bba52ff83c7fd4139050d0df93ee3a5a448adcfa0c0ac"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 1b16ff9b47c4e..520f342cc1d2a 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "96d3146eb09ffa0a198f31b36706859dadd4a59ed184aa9329a9c12733e6af0b"; + sha256 = "2188a9bcaaf0b6a68ff9098a481f37ece8231634b862fd3c9adedc466aac79f2"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index c6007bc0b425a..ace5b862825db 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kconfiglib"; - version = "13.1.1"; + version = "13.2.0"; src = fetchPypi { inherit pname version; - sha256 = "b44af5a6dc0c716926c926ba4c1f301ce286b3a3f292ae359a866eb01dc5260e"; + sha256 = "045yjmn6xqbyb68l1jqlgi3c8cwlw1krsrlfwrrgjijkmbx6yqmd"; }; # doesnt work out of the box but might be possible diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index a159b6c7e0823..323ab341ec6a9 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.5"; + version = "4.6.6"; src = fetchPypi { inherit pname version; - sha256 = "c9078124ce2616b29cf6607f0ac3db894c59154252dee6392cdbbe15e5c4b566"; + sha256 = "1760b54b1d15a547c9a26d3598a1c8cdaf2436386ac1f5561934bc8a3cbbbd86"; }; postPatch = '' diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index abd3a491b20a7..38e51ac0ac68f 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1b0dvvqqasir8dfpqj4jch7wxxk43csbv0wa80fiqsdlymxxj2dj"; + sha256 = "0gd5c3scpyir3h8clhwb5jsf8dkmh1vh7rx8135lkx9fxx01q0az"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index 759c9689bc930..d8a895c8357b8 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "lazr.config"; - version = "2.2.1"; + version = "2.2.2"; propagatedBuildInputs = [ lazr_delegates ]; src = fetchPypi { inherit pname version; - sha256 = "1s7pyvlq06qjrkaw9r6nc290lb095n25ybzgavvy51ygpxkgqxwn"; + sha256 = "cdb9a70dac4a76ca1ff3528d9eafe5414c6c69c1b92e7e84d3477ae85f6bb787"; }; } diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index e0381642715a3..f174aa1066ca5 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1"; + sha256 = "f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 51c5b80a6ac2e..8d50f9846cc76 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.29"; + version = "0.1.31"; src = fetchPypi { inherit pname version; - sha256 = "14zv8bp62r1fwrrpbwyg9a3s5dl76lbhd8lv16xim0w55p9vvixn"; + sha256 = "f1fc7ab685780309a7220c6ee517d88072cc594a9615bcc18e68ed5f149fa432"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 734a51c7be616..381c3a2731a52 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1spjkw5nxhbawblj5db8izff05kjw425iyydipajb7qh73vm25r0"; + sha256 = "fcc165f2cc2db9a379c6d3a17b3beb9081bb64ba5c0bf7bbb58da864810092f0"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 177949fbd51e2..e934c51942852 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "license-expression"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; rev = "v${version}"; - sha256 = "15dk3j5sr8iypzqqa8wa12b2a84f6ssbfvam1c1vzz00y2y5v3ic"; + sha256 = "0bbd7d90z58p9sd01b00g0vfd9bmwzksjb7pc8833s2jpja9mxz1"; }; postPatch = "patchShebangs ./configure"; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 2dd997765cf39..99ff8d45e6a79 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "1zw8bijlcmqrigsqvzj7gwh3qbd33dmpi9ij6h56b41x0dpm957d"; + sha256 = "8c1bf26431a3b487940cd4a7c0eefde328f5ff7098222ee695805752dae94aa6"; }; propagatedBuildInputs = [ unittest2 six ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 0ab947ec254fb..5b07fe2444135 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.2.1"; + version = "3.2.2"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9a2f3e8ea5f530a9664e882d7d04b58650f46190178b2264c72b7d20399d28f0"; + sha256 = "1a358beb89c2b4d5555272065a9533591a3eb02f1b854f3c4002d88d8f2a1ddb"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 882872d47e146..9669bcc30e708 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.3"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "1gyxkwjnabqf8xxnkj787xh2dpcnm858g369fnahdcz1wn5hdmyp"; + sha256 = "9fff89e973bdf1aee75a351bd4dde53ca51a7e76944ddeae3ea3b6ad6c46045c"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 623a191bbb8e8..61567d851e9b3 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "minio"; - version = "5.0.1"; + version = "5.0.5"; src = fetchPypi { inherit pname version; - sha256 = "8f7ba1ca0750dfca3302cb03b14a92bf5f1c755ff84f9ba268079bf582e0f735"; + sha256 = "a5886b3ccb9b46cb4a322a486e06674d1f287b773f20b24cdc3de8450ff935a7"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 87b6fbeabdc79..6978bee000a31 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, unittest2 +, isPy27 , funcsigs , six , pbr @@ -17,8 +17,7 @@ buildPythonPackage rec { sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; }; - buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ funcsigs six pbr ]; + propagatedBuildInputs = [ six pbr ] ++ lib.optionals isPy27 [ funcsigs ]; # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. # Mock upstream has a decoration to disable the failing test and make @@ -30,10 +29,10 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Mock objects for Python"; homepage = http://python-mock.sourceforge.net/; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index a45a24b7a2a91..5802b33041f0d 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.5.3"; + version = "5.5.4"; src = fetchPypi { inherit pname version; - sha256 = "1k2yf2yglzx65gcv2bqql6w6lmgyp3f1jz4ddq9vylf09a8j7fga"; + sha256 = "08badabb6a1bbc9aa9e65fae8ecd3275d8342cb45d9c457b19e32b3312a8b663"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index f5ae020c71c66..5a6fa42f28692 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.3.9"; + version = "0.3.10"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q"; + sha256 = "1w67rrxsvxl7glh5lri7c5hn1011jij1yh1dn50dxlz79n4h51b5"; }; buildInputs = [ mpv ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 07038cb26e134..788a8f73ab89f 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.4.3"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "09j47hmzgvf7rnz7n4n7295pp6qscq9hp50qva70vglzqck9yyjp"; + sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index c2075fe4f8e38..bd0a7a5b2be80 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.0"; + version = "3.0.1"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "340a1ab2069764559b9d58027a43a24db18db0e25deb80f81ecb8ca7ee5253db"; + sha256 = "a3ee361d3ff04af6048d594775b3a54ffdf215d40fa5c6c78b2a41c0d0b020d3"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index 01f5595fea100..f9394efe398b5 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.0"; + version = "0.4.1"; disabled = (!isPy3k); # We can't use the pypi source because it doesn't include README.md which is @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - sha256 = "165rj08hwmbn44ra9n0cj5vfn6p49dqfn5lz2mks962mx19c7l0m"; + sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; }; # Remove a failing test which expects the test source file to reside in the diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 1fbddca8cc4fa..41009a4b7a27b 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.9.0"; + version = "1.10.0"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn"; + sha256 = "0bpprn5wcz414pqpvwjpd5cc0838shkw2cfvrwfiilhr09bhxbhb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index d37be90099cb1..cb81c2b40fc11 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.22"; + version = "8.10.23"; src = fetchPypi { inherit pname version; - sha256 = "705dc7bbaa0d5932e9c010437c718bb3c0d7c93ab25b9710b4d9ae7370cc0121"; + sha256 = "b31916281b0819c1e24ee3c21561ecd8be5af9381088557a986af85051a243bf"; }; meta = { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2b00da73bf79d..0a8d679ae5f90 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six, first +{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six , setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { pname = "pip-tools"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5427ea4dcc175649723985fbcace9b2d8f46f9adbcc63bc2d7b247d9bcc74917"; + sha256 = "0x36mp3a3f3wandfc0g8d53gg2jkc14nhisbryzspcl9f05sbvq6"; }; LC_ALL = "en_US.UTF-8"; checkInputs = [ pytest git glibcLocales mock ]; - propagatedBuildInputs = [ pip click six first setuptools_scm ]; + propagatedBuildInputs = [ pip click six setuptools_scm ]; disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [ # Depend on network tests: @@ -32,12 +32,8 @@ buildPythonPackage rec { "test_stdin" "test_upgrade_packages_option" "test_url_package" - # Expect specific version of "six": "test_editable_package" - "test_input_file_without_extension" "test_locally_available_editable_package_is_not_archived_in_cache_dir" - "test_no_candidates" - "test_no_candidates_pre" ]; checkPhase = '' @@ -50,6 +46,5 @@ buildPythonPackage rec { homepage = https://github.com/jazzband/pip-tools/; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 6c8fc211ae692..93aa5ad144cf7 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = with pkgs; with xorg; [ coin3d soqt qt5.qtbase - libGLU_combined + libGLU libGL libXi libXext libSM libICE libX11 ]; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index bd3c58c7dcc7e..ebda1976e2a2f 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pony is a Python ORM with beautiful query syntax"; homepage = "https://ponyorm.org/"; - maintainers = with maintainers; [ d-goldin ]; + maintainers = with maintainers; [ d-goldin xvapx ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index bcba04fdfd27b..789a9484d7304 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2019.1"; + version = "2019.2"; src = fetchPypi { inherit pname version; - sha256 = "19imrr17jnkd6fd2w1zzh63z0hcipg5b9v2x4svqm5c08p3cyc5c"; + sha256 = "1p2qizb35f9lfhklldzrn8g9mwiar3zmpc44463h5n1ln40ymw78"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 895a06ce558a2..d09862184c0d7 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.44"; + version = "1.44.1"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "067iyarllgdp40bzjxskzrixvmz350yj1qf8wvbddka504bcbh9r"; + sha256 = "16ngnnm7xj9bd97pvyddag17dx28c5wi0gjx4ws8c8nrmf5w3iqk"; }; propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index f8925cd3b52cb..e1d61866f90d2 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.4.7"; + version = "0.4.8"; src = fetchPypi { inherit pname version; - sha256 = "a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604"; + sha256 = "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index c6c1afdcc95f4..85140d3db49b1 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }: buildPythonPackage rec { - version = "0.3.21"; + version = "0.3.24"; pname = "pyaxmlparser"; # the PyPI tarball doesn't ship tests. @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "appknox"; repo = pname; rev = "v${version}"; - sha256 = "1bphd2vl9akk78yqvvxcz36wmr47hp3nh6xyrdc8w1avy1aby1ij"; + sha256 = "0fys26p7xhbnbdzp80zm6n3mragp38p08nyrsnilfgnlpi6rjpg0"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 2df360dfaabb2..0f386a7c42fe0 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -5,9 +5,10 @@ , python , pytest , cmake -, numpy ? null -, eigen ? null -, scipy ? null +, catch +, numpy +, eigen +, scipy }: buildPythonPackage rec { @@ -21,23 +22,42 @@ buildPythonPackage rec { sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd"; }; - dontUseCmakeConfigure = true; - nativeBuildInputs = [ cmake ]; - checkInputs = [ pytest ] - ++ (lib.optional (numpy != null) numpy) - ++ (lib.optional (eigen != null) eigen) - ++ (lib.optional (scipy != null) scipy); - checkPhase = '' - cmake ${if eigen != null then "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" else ""} - make -j $NIX_BUILD_CORES pytest - ''; - # re-expose the headers to other packages - postInstall = '' - ln -s $out/include/python${python.pythonVersion}m/pybind11/ $out/include/pybind11 + buildInputs = [ catch ]; + + cmakeFlags = [ + "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" + ] ++ lib.optionals (!python.isPy2) [ + # Enable some tests only on Python 3. The "test_string_view" test + # 'testTypeError: string_view16_chars(): incompatible function arguments' + # fails on Python 2. + "-DPYBIND11_CPP_STANDARD=-std=c++17" + ]; + + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + + preFixup = '' + pushd .. + export PYBIND11_USE_CMAKE=1 + setuptoolsBuildPhase + pipInstallPhase + # Symlink the CMake-installed headers to the location expected by setuptools + mkdir -p $out/include/${python.libPrefix} + ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11 + popd ''; + installCheckTarget = "pytest"; + doInstallCheck = true; + checkInputs = [ + pytest + numpy + scipy + ]; + meta = { homepage = https://github.com/pybind/pybind11; description = "Seamless operability between C++11 and Python"; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index f72f09a3328c6..f4c12f48542b3 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, libGLU_combined +, libGLU, libGL , xorg }: @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ - libGLU_combined + libGLU libGL xorg.libX11 ]; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ca6f72847158f..c38366894dc6b 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.18.1"; + version = "1.18.2"; format = "other"; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "0f4l7d1ibkk8xdspyv5zx8fah9z3x775bd91zirnp37vlgqds7xj"; + sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 23ed4917cc58b..fd3eb1b4c1874 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycollada"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "fcd6f38fd981e350f9ec754d9671834017accd600e967d6d299a6cfdae5ba4f4"; + sha256 = "0b2vz9fp9asw57m3p9zjlz9gddanrhpxbdfimg98ik654kp2vj7r"; }; propagatedBuildInputs = [ numpy dateutil ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index c3b807ce43c39..17bb7c9dcd03a 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.9.2"; + version = "3.9.4"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "e1e007d072d50844188c067c325af8b3ad31e4b87792381469b821e95bf14cd8"; + sha256 = "a168e73879619b467072509a223282a02c8047d932a48b74fbd498f27224aa04"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 7d3204e021a44..bf6ac65fc7f66 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.9.2"; + version = "3.9.4"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "137e8e2c7438184dae0b940cdf5d0d4f639b1df564a95dadbb7c4ec188850921"; + sha256 = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167"; }; } diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index bf92f7360ddba..90fd790380833 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, boost, freetype, ftgl, libGLU_combined +, boost, freetype, ftgl, libGLU, libGL , python }: @@ -24,7 +24,7 @@ buildPythonPackage rec { sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py ''; - buildInputs = [ boost freetype ftgl libGLU_combined ]; + buildInputs = [ boost freetype ftgl libGLU libGL ]; meta = with lib; { description = "Python bindings for FTGL (FreeType for OpenGL)"; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 16484cb1211ec..e6be92c0efb52 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,7 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, libGLU_combined +, libGL +, libGLU , xorg , future , pytest @@ -34,9 +35,9 @@ buildPythonPackage rec { for name in names: path = None if name == 'GL': - path = '${libGLU_combined}/lib/libGL${ext}' + path = '${libGL}/lib/libGL${ext}' elif name == 'GLU': - path = '${libGLU_combined}/lib/libGLU${ext}' + path = '${libGLU}/lib/libGLU${ext}' elif name == 'c': path = '${glibc}/lib/libc${ext}.6' elif name == 'X11': diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index f366f6e57f606..08d598c72db67 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pylibacl"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0c3xw1s5bh6jnsc0wwyxnn6kn6x6rpbmmi05ap1f81fyqlgrzgj0"; + sha256 = "060f375aeff90a16fbc3a827b7e234694ad636485d8ecd6654e01e1fc4ea3b37"; }; # ERROR: testExtended (tests.test_acls.AclExtensions) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 8861a364b0fa3..95f86e31c041a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.4.3"; + version = "2.4.4"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "856476331f3e26598017290fd65bebe81c960e806776f324093a46b76fb2d1c0"; + sha256 = "3db5468ad013380e987410a8d6956226963aed94ecb5f9d3a28acca6d9ac36cd"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index a9350f20eb3f5..85be0b4309c73 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.7"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs"; + sha256 = "08mrpnb6cv2nvfncvr8a9a8bpwhnasa924anapnjvnaw5jcd4k7p"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index dc9b38eec9b7a..98071962d4f96 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.7"; + version = "1.16.8"; src = fetchPypi { inherit pname version; - sha256 = "b16c85b2f89cc89e36b59fe734f14e5c939c8b24697bf33ff7a19584e8334976"; + sha256 = "3099b48a796885c0760d8ac5439131dee1bc6adadf7ae008417e0ca8d8fcdf15"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 74840d72a94dd..5016cfb741c5d 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d05d5e2b0f663679ad11421c6fc2cf2f89a2a5843e6ebc372706bf5a78d93762"; + sha256 = "0njbh3h6696nq5palqa0b8s0fbsvhbawpzl923dnfsa9kgq5m294"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 11a51f354d9f8..b00502700e814 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; }; - propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut pillow ]; + propagatedBuildInputs = [ pkgs.libGLU pkgs.libGL pkgs.freeglut pillow ]; patchPhase = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 1528623aa0ecb..8c0513b0b5130 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "4.8.0"; + version = "4.9.0"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "1nnmk7apg169bawqi06jbx3p0x4sq12kszzl7k6j39273hqq5ii4"; + sha256 = "1ww1l34zn25vxifs8nr0bg7gkhbpy5g45mj0jj4d8hzimahb1brx"; }; patches = [ diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix new file mode 100644 index 0000000000000..9e9d15e52956a --- /dev/null +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, EasyProcess +}: + +buildPythonPackage rec { + pname = "pyscreenshot"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "19ec6d17a61c0cd4e7fcf3ab2685598a54b53dc781755393cc5f76dcb7bf359c"; + }; + + propagatedBuildInputs = [ + EasyProcess + ]; + + # recursive dependency on pyvirtualdisplay + doCheck = false; + + meta = with lib; { + description = "python screenshot"; + homepage = "https://github.com/ponty/pyscreenshot"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 61beac17ab3db..0ba230075f9a0 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspf"; - version = "2.0.12"; # version 2.0.13 should not be used, see #72791 + version = "2.0.13"; # version 2.0.13 should not be used, see #72791 src = fetchPypi { inherit pname version; - sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; + sha256 = "62dc1be39519e343202d480da7ef93d834b5a50cd4f217bef9335ed15292929b"; }; propagatedBuildInputs = [ pydns ]; diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix new file mode 100644 index 0000000000000..4ce0241f415bc --- /dev/null +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pyqt5 +}: + +buildPythonPackage rec { + pname = "pytest-qt"; + version = "3.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f6ecf4b38088ae1092cbd5beeaf714516d1f81f8938626a2eac546206cdfe7fa"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pytest + ]; + + checkInputs = [ + pyqt5 + ]; + + # tests require X server + doCheck = false; + + meta = with lib; { + description = "pytest support for PyQt and PySide applications"; + homepage = "https://github.com/pytest-dev/pytest-qt"; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index afd36155cf788..768ad59673428 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -8,33 +8,29 @@ buildPythonPackage rec { pname = "pytest-repeat"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3"; + sha256 = "1nbdmklpi0ra1jnfm032wz96y9nxdlcr4m9sjlnffwm7n4x43g2j"; }; - # fixes support for pytest >3.6. Should be droppable during the - # next bump. - patches = [ - (fetchpatch { - url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch; - sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny"; - }) + nativeBuildInputs = [ + setuptools_scm ]; - buildInputs = [ setuptools_scm ]; - checkInputs = [ pytest ]; + checkInputs = [ + pytest + ]; checkPhase = '' - py.test + pytest ''; - meta = { + meta = with lib; { description = "Pytest plugin for repeating tests"; - homepage = https://github.com/pytest-dev/pytest-repeat; - maintainers = with lib.maintainers; [ costrouc ]; - license = lib.licenses.mpl20; + homepage = "https://github.com/pytest-dev/pytest-repeat"; + license = licenses.mpl20; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 79ce9fa63a9b8..f5c35905cf651 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "7.0"; + version = "8.0"; src = fetchPypi { inherit pname version; - sha256 = "1zfm9v80bqfdapygy9wmi6j6y5c179ixpnh9ih27py4v6cqwzjgk"; + sha256 = "04p8rfvv7yi3gsdm1dw1mfhjwg6507rhgj7nbm5gfqw4kxmj7h8p"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix new file mode 100644 index 0000000000000..b9ae9be428d34 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, virtual-display +}: + +buildPythonPackage rec { + pname = "pytest-xvfb"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979"; + }; + + propagatedBuildInputs = [ + pytest + virtual-display + ]; + + meta = with lib; { + description = "A pytest plugin to run Xvfb for tests"; + homepage = "https://github.com/The-Compiler/pytest-xvfb"; + license = licenses.mit; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 39eed4f13c602..a0e26b4420180 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python }: buildPythonPackage rec { - version = "5.2.2"; + version = "5.2.4"; pname = "pytest"; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6"; + sha256 = "ff0090819f669aaa0284d0f4aad1a6d9d67a6efdc6dd4eb4ac56b704f890a0d6"; }; checkInputs = [ hypothesis mock ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index bf6d4cd238175..e1c380b64c3a5 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y"; + sha256 = "1495r55177c38wq88pb28l50dfd4213iyxwq1k5rmsgp66vww09s"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index def0a2c0adb09..4858ef8f8a6f0 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec"; + sha256 = "125zimbdprfx2j90dp19hyh60lzj11264bm494awc585pr6v9d3k"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index 38642f066d776..4d10c985092b8 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "1.1.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1bhzkzjvz6zb6rc5zmvgqfszrcyh64v1hay7m1m5dn083gaznyk9"; + sha256 = "1arsibmc19iyzr70lqfrkq0fk6gd6imm3zxa7zxv93b6lwl5bw1d"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 06577249a02da..556be12872b5e 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.11"; + version = "1.12"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "d5f0af1bee9ddd9a20b398b46ce062dbd4d41fcc9646940f2667256a44df3854"; + sha256 = "19fb5asv0ngnbpiz1bqzq2jhgn845kv9hjcjajsgzgfp2k24f4sc"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index bb9aeaf32017f..f1ecdf7c4f4ff 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "18.1.0"; + version = "18.1.1"; src = fetchPypi { inherit pname version; - sha256 = "93f44739db69234c013a16990e43db1aa0af3cf5a4b8b377d028ff24515fbeb3"; + sha256 = "8c69a6cbfa94da29a34f6b16193e7c15f5d3220cb772d6d17425ff3faa063a6d"; }; checkInputs = [ pytest tornado ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 42b03849283b5..5da97c964c1ae 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.0"; + version = "1.1.1"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "0xa9jazsgsf7is4dbf2bbnfga8q8nmqy0qq4i7jj3riiccwlm6xw"; + sha256 = "1d0y16c5da252nj3pbdjwbzmd5kmh533s8jwlvg3aappa7h7qc1s"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 8b3487a98c605..948e523cb7e47 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cc94753be6b2db997e3291046b39e49d578f6441fd75159db22a51a29d2cf1fc"; + sha256 = "c920d8129752ee3f339c8cf3dfeba800a25730249d6ab43dc9b3c384312d1d32"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 62e0d2f0bebab..3c893a9a227ac 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.5.1"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "00cf6fa9ea3b6a195e9eca96216a9d206b6884624d0214bd776f8654cd5e8fea"; + sha256 = "30046ced74b5502eca604b1ae766fd3daa1b5ed6379fbe1210730710c752d4f6"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 9254e53d14286..ae39271a4b007 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "41.4.0"; + version = "41.6.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "0asxfnsi56r81lm48ynqbfkmm3kvw2jwrlf2l9azn5w6xm30jvp5"; + sha256 = "0j7bfxq9fwa55ijzw8zn9aa2z2zx4lw2n4jbn1662pjg7v62knv1"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 7202b3cf70e25..2e0af01fef076 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "1i4zrzamvgy3g117a2x66gyi7pzh27slc2w9pqysc0ldfcibi2wx"; + sha256 = "76b8a3ba577a62799e3ea86410aea54e1f403ef6efbf681a3f38baa2bf4e1c58"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 325f59b1df225..48cfcb132f094 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.8.4"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1y845mfsswyvczknwh359xprgc3hk8r17qy1wdibpz6y6pq0g3kq"; + sha256 = "0xmnp8ywakwg3y21gqdvjw8a4v42vaxfq6njqizzllm4c9g2nk76"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index e9e14b7da4d80..e77f2e0e7b2d5 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35 , mock , pysqlite , fetchpatch @@ -25,7 +25,9 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]; + # disable mem-usage tests on mac, has trouble serializing pickle files + disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "] + ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; patches = [ # Two patches for sqlite 3.30 compatibility. diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 7cad8346a6fa2..25ce5a0f65159 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "6924404b9ce7c55b427bebc5712656b87d17b5114e9fb610f2821865bd8d70f4"; + sha256 = "02002b908572fcd2c7471475936a6c375f143d15df871399ce86ced6d7aef865"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 956a10b6b047d..cda898d2725df 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.5"; + version = "0.8.6"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "d0097023658d4dea848d6ae73af84532d1e86617ac0925d1adf1dd903985dac3"; + sha256 = "5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 73b92ea6d4b6b..197c98def3ab3 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3964fb7e87f86dc5e2708addb67e69d0932534991991b6bae2e37a0c2059273f"; + sha256 = "19yra86g3wz2xgk22dnrjjh3gla969vb8jrps5rf0cdmsm9qqisv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index dbcc5935e5e2b..af1c4d53e13a8 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "de08e141f83c3a0798b050ecb097ab6259c3f0331b2f7b7750c9075ced2c20c2"; + sha256 = "4804a774f802306a7d9af7322193c5390f1da0abb429e082a10ef1d46e6fb2c2"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix new file mode 100644 index 0000000000000..2d4f9d10a8cc0 --- /dev/null +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -0,0 +1,34 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + # build dependencies + cython, + leptonica, + pkg-config, + tesseract, + # extra python packages + pillow +}: + +buildPythonPackage rec { + pname = "tesserocr"; + version = "2.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nj33mwvppacy6p5mqk9a4x26hx9ailshgad84ks60wyms6rgjiv"; + }; + + nativeBuildInputs = [ cython pkg-config ]; + buildInputs = [ leptonica tesseract ]; + propagatedBuildInputs = [ pillow ]; + + meta = with lib; { + description = "A simple, Pillow-friendly, wrapper around the tesseract-ocr API for Optical Character Recognition (OCR)"; + homepage = "https://github.com/sirfz/tesserocr"; + license = licenses.mit; + maintainers = with maintainers; [ mtrsk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index f429f72cc0179..caad494090439 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.10.1"; + version = "6.10.2"; src = fetchPypi { inherit pname version; - sha256 = "abbca7ed381d34a77699c6cb68be67919a1e7f5cf8728b57396145417fa34110"; + sha256 = "c0eb9d20ce3b53e0cf543da7c46c263cc9792f13223def8b26edb6180ecdc895"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix new file mode 100644 index 0000000000000..f4de29b5e6c9c --- /dev/null +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, pytestcov +, pytestrunner +, pycodestyle +, pyyaml +}: + +buildPythonPackage rec { + pname = "tinydb"; + version = "v3.14.1"; + + src = fetchFromGitHub { + owner = "msiemens"; + repo = pname; + rev = version; + sha256 = "02idbvrm8j4mwsjfkzy11f4png19k307p53s4qa2ifzssysxpb96"; + }; + + nativeBuildInputs = [ + pytestrunner + ]; + + checkInputs = [ + pytest + pytestcov + pycodestyle + pyyaml + ]; + + meta = with lib; { + description = "A lightweight document oriented database written in pure Python with no external dependencies"; + homepage = "https://github.com/msiemens/tinydb"; + license = licenses.asl20; + maintainers = with maintainers; [ marcus7070 ]; + }; +} diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 95c3756daded1..719ea78b7324b 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "cef15360ec42547a583d49ef5246936b3ace424a95c00b59c09dcbe44b289961"; + sha256 = "5963b22029e632a17bde87e35a19dc8c5b17266fb8c58e4d550d5593307e3a72"; }; propagatedBuildInputs = with python.pkgs; [ six ]; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index fdc2c9167a349..c24343b46953e 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.14.0"; + version = "3.14.1"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1"; + sha256 = "bcfa3e40abc1e9b70607b56adfd976fe7dc8286ad56aab44e3151daca7d2d0d0"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index bcf205aa1d2da..84aa1c5784e38 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "5.1.2"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0a17qmpw0z9h7ybh5yxrghvkcf2q90vgxzbnv1n4i0fxhi7mjy3s"; + sha256 = "1b71vp0l4523428aw098xw6rmkl8vlcy2aag40akijbyz1nnk541"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 95c58e20d91a0..9098d41bd69c6 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.32.0"; + version = "6.33.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0by2qjzxv13k4lvy4mas0hf468xf98qbc2arc8fcy6aj7h8jaam8"; + sha256 = "1k8hf4azgjzb4fifclzi8gj6v22368jk3y9f7f9qhq9ina7ilycj"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index abc072b19b7f9..d4e8d1505d689 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.5.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "4e6e86c05de588cbf5a2c35ddd080f23cd1770a1ad15c84dc1b2c78d65113af7"; + sha256 = "af6aea84ca42c889986f8baf86ccb9e3faae5ac1eaef470d2317dfe4131708b3"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index c667a5cb41939..f98b34112427a 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.10.10"; + version = "3.10.12"; src = fetchPypi { inherit pname version; - sha256 = "2c780472c5c328d2e34508db1da399038653142572fc3d0b5777b2311edabd83"; + sha256 = "34953903abe09bbab3ec1a9a4843b05c75b218daa6132c8275d871e88b6e3447"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 57d5c160ef099..0c8c97925a7b2 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.25.6"; + version = "1.25.7"; src = fetchPypi { inherit pname version; - sha256 = "9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86"; + sha256 = "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index bac478561f74f..689a1336ef79f 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "wxPython"; - version = "4.0.7.post1"; + version = "4.0.7.post2"; src = fetchPypi { inherit pname version; - sha256 = "da43eaa2eea32c34a52531331b0a69bd791c237803a7c5df451509624766f7ca"; + sha256 = "5a229e695b64f9864d30a5315e0c1e4ff5e02effede0a07f16e8d856737a0c4e"; }; doCheck = false; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index d120f17780b20..533e8d8b577b5 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.1.2"; + version = "4.1.3"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0icqhafsnmcs6628cg3jjgq0d3x835nqmhljcz93yi457hfqd2lp"; + sha256 = "0ixx9svyi0kw3z2i51cv1cyg4l5z8hy432kxgsvz20mr9a8z5c91"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index ccb4d879be9bf..1a54b8b4049c2 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.34.0"; + version = "2.35.0"; src = fetchPypi { inherit pname version; - sha256 = "7b9543edacc2f4fa12cea8b64ae8144afb493d7b2a0135494642f29592b5d272"; + sha256 = "0jpg9rxxw28n66wzznlhzdgv7b7gd1crcffjhlw7lam93ils4ah5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index a1d6eaea60036..66f31441ec567 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.3"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "82cdc67b41da904aa2921107e9877814079d9b067a99f19852b5d85e8a40555d"; + sha256 = "8b6b1afe7731d7d9cbb0398b4a811ebb5e6be5c174f72c68abf81f919a435de9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 0406f6fe5a0cf..1b83c8987a129 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "076hqf189ww95n9vcbkkn8an42nx79cy8pf2qnl251yjncsvnbfl"; + sha256 = "05fg2i27bq40z83avmz3h91i206dx5k6nyyvpa5vja54sqg14q02"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 1e577fc487cab..b24b5853876ae 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "1.0.4"; + version = "2.0.0"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "0n4hng2zil1j8sbz0b83pxx8ndlh34h2mnmli3bqjmnrbry5zlr5"; + sha256 = "0fb7c7pnz86pcs6qqwlyw72vnijc04ns2h1zfrm0h7yl8q7r7ng0"; }; # fails.. diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index e08973ecdeab5..537fc1465f231 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.3.2"; + version = "4.3.3"; src = fetchPypi { inherit pname version; - sha256 = "ab6d6975d9c51c13cac828ff03168de21fb562b0664c59bcdc4a4b10f39a5b17"; + sha256 = "dac4279aa05055d3897ab5e5ee5a7b39db121f91df65a530f8b1ac7f9bd93119"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index cd78084d60be8..f1a9a9e0e4123 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -311,7 +311,7 @@ let rgdal = [ pkgs.proj.dev pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; - rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ]; + rgl = [ pkgs.libGLU pkgs.libGL pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d8c3d484f4363..18e24d5a31ed5 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl -, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk @@ -70,11 +70,6 @@ in buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; - capybara-webkit = attrs: { - buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - }; - charlock_holmes = attrs: { buildInputs = [ which icu zlib ]; }; diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index 03cc0518ab517..05834565f9310 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -1,14 +1,14 @@ -{ fetchgit, stdenv }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kati-unstable"; - version = "2017-05-23"; - rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f"; + version = "2019-09-23"; - src = fetchgit { - inherit rev; - url = "https://github.com/google/kati.git"; - sha256 = "1das1fvycra546lmh72cr5qpgblhbzqqy7gfywiijjgx160l75vq"; + src = fetchFromGitHub { + owner = "google"; + repo = "kati"; + rev = "9da3296746a0cd55b38ebebf91e7f57105a4c36f"; + sha256 = "0s5dfhgpcbx12b1fqmm8p0jpvrhgrnl9qywv1ksbwhw3pfp7j866"; }; patches = [ ./version.patch ]; @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { install -D ckati $out/bin/ckati ''; - meta = { + meta = with stdenv.lib; { description = "An experimental GNU make clone"; homepage = https://github.com/google/kati; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.asl20; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ danielfullmer ]; }; } diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 75658dcbb3eab..6633d101ce407 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -77,6 +77,15 @@ python3Packages.buildPythonApplication rec { # https://github.com/mesonbuild/meson/issues/4784 # Should be fixed in 0.52 ./fix-objc-linking.patch + + # Fixes error finding some frameworks + # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553704175 + # https://github.com/mesonbuild/meson/pull/5980 + # Should be fixed in 0.52 + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/8d3fcb3dc4d7204a4646807f8b5191d79fb291e5.patch"; + sha256 = "0g95gl662mribnnz5jcyn1jaaw8w7r1vgbg2jbm91dcrr5zji5ng"; + }) ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 08baa53b1dc0e..cd08ae973eba1 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "19adxjyp5bf5hrjisv3ff9ndcmh1glrxfrzifs46xjn3r69kyv1k"; + sha256 = "0rqfnclhzln6v4gm68fn4vn6ncf5qpi90295fwm4fx6dq4l94b3v"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index bb2f000f606a2..7440b25c6e494 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0v27i8pd9ss53ipi1cs40426mnyppdjgcdjk8nn05bi6rm7a4r7y"; + sha256 = "0bz6jj7jiwxd35xw9l1jbd846r0129pwgdi8m6dxwb8zybj73k2m"; }; patchPhase = '' diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix new file mode 100644 index 0000000000000..7fa5302977228 --- /dev/null +++ b/pkgs/development/tools/ccloud-cli/default.nix @@ -0,0 +1,33 @@ +{ stdenv, autoPatchelfHook, fetchurl, lib }: + +stdenv.mkDerivation rec { + pname = "ccloud-cli"; + version = "0.202.0"; + + # To get the latest version: + # curl -L 'https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/&delimiter=/' | nix run nixpkgs.libxml2 -c xmllint --format - + src = fetchurl (if stdenv.hostPlatform.isDarwin then { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz"; + sha256 = "1w7c7fwpjj6f26nmcgm6rkrl4v9zhdpygkh02la77n23lg8wxah5"; + } else { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz"; + sha256 = "1xbhv2viw8cbwv03rfq99jddnw5lwy812a8xby348290l323xi89"; + }); + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + mkdir -p $out/{bin,share/doc/ccloud-cli} + cp ccloud $out/bin/ + cp LICENSE $out/share/doc/ccloud-cli/ + cp -r legal $out/share/doc/ccloud-cli/ + ''; + + meta = with lib; { + description = "Confluent Cloud CLI"; + homepage = https://docs.confluent.io/current/cloud/cli/index.html; + license = licenses.unfree; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index b57c9841978f0..8ab0ad211708d 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.2.4"; + version = "6.1.0"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "16ia6nlvj4cgmdkn66bjg73h5vah82hpzk9mf0n5kmqnwcaa8hmc"; + sha256 = "14f8vviki89dqhd429zlj0frma52xhyxpdln5c81z1dgs7819rpg"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -15,7 +15,7 @@ installPhase = '' mkdir -p $out/bin $out/share/flyway cp -r sql jars drivers conf $out/share/flyway - cp -r lib/community $out/share/flyway/lib + install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ @@ -23,6 +23,13 @@ ''; meta = with stdenv.lib; { description = "Evolve your Database Schema easily and reliably across all your instances"; + longDescription = '' + The Flyway command-line tool is a standalone Flyway distribution. + It is primarily meant for users who wish to migrate their database from the command-line + without having to integrate Flyway into their applications nor having to install a build tool. + + This package is only the Community Edition of the Flyway command-line tool. + ''; homepage = "https://flywaydb.org/"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 9b24fc7573c33..fd9fa5f02dae3 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.2.5"; + version = "1.2.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1ka70cr6kznl68ilc42blzqk59gy20spkyqfn26n6zbk0jm5ssxv"; + sha256 = "0y7qshg6v8s5rwi0fz9xpyhd1yhv8jrw2jhp276a30dfkglx19qn"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix new file mode 100644 index 0000000000000..6879d6875cc42 --- /dev/null +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -0,0 +1,47 @@ +{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool +, base, bower-json, bytestring, Cabal, containers, dhall, directory +, either, exceptions, extra, fetchgit, file-embed, filepath, foldl +, fsnotify, github, Glob, hpack, hspec, hspec-discover +, hspec-megaparsec, http-client, http-conduit, lens-family-core +, megaparsec, mtl, network-uri, open-browser, optparse-applicative +, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe +, semver-range, stdenv, stm, tar, template-haskell, temporary, text +, time, transformers, turtle, unliftio, unordered-containers +, vector, versions, zlib +}: +mkDerivation { + pname = "spago"; + version = "0.12.1.0"; + src = fetchgit { + url = "https://github.com/spacchetti/spago"; + sha256 = "17xgp75yxangmb65sv3raysad31kmc109c4q4aj9dgcdqz23fcn2"; + rev = "a4679880402ead320f8be2f091b25d30e27b62df"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async-pool base bower-json + bytestring Cabal containers dhall directory either exceptions + file-embed filepath foldl fsnotify github Glob http-client + http-conduit lens-family-core megaparsec mtl network-uri + open-browser prettyprinter process retry rio rio-orphans safe + semver-range stm tar template-haskell temporary text time + transformers turtle unliftio unordered-containers vector versions + zlib + ]; + libraryToolDepends = [ hpack ]; + executableHaskellDepends = [ + aeson-pretty async-pool base bytestring containers dhall filepath + github lens-family-core megaparsec optparse-applicative process + retry stm temporary text time turtle vector + ]; + testHaskellDepends = [ + base containers directory extra hspec hspec-megaparsec megaparsec + process QuickCheck temporary text turtle versions + ]; + testToolDepends = [ hspec-discover ]; + prePatch = "hpack"; + homepage = "https://github.com/spacchetti/spago#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 71f488c760a4a..c7bc96871f8d3 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut , avrgcc, avrlibc -, libGLU_combined +, libGLU, libGL , GLUT }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ which pkgconfig avrgcc ]; - buildInputs = [ libelf freeglut libGLU_combined ] + buildInputs = [ libelf freeglut libGLU libGL ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; # Hack to avoid TMPDIR in RPATHs. diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 43d3e20d3dfd7..3384dac541005 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.19.1"; + version = "1.19.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0qlrwmvpv0ifvywqqzg28ywmhk4prkk1dflnnpk6grpgkq3bfv77"; + sha256 = "05sjf7pgdj3hh92j2xxl683frrkiw1rqxs72z3an4gb83nllvi0n"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 440012461b97b..7c56cd827ca21 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.10.0"; + version = "7.12.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0k8np71p414407hvcw149gspvdgyadnmpvfdxwwkr3pydj70vn6f"; + sha256 = "0sz7cidajrsj43vq5g8jrkxlrp97r7n8dfr9gp8l0wxnidiqm401"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index ef285f8cb935d..8102235d88ebf 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,7 +1,7 @@ { stdenv, lib, perl, fetchurl, python2 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, libGLU_combined, xorgproto, libX11, libXcursor, nspr, SDL2 +, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal - libGLU_combined xorgproto libX11 libXcursor nspr SDL2 gloox + libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools libsodium ] ++ lib.optional withEditor wxGTK; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 9766e58c15ae1..2d3be1880de9d 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio +{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio , xorg }: let @@ -6,7 +6,7 @@ let inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [ - zlib libmad libpng12 libcaca libXext libX11 libGLU_combined alsaLib libpulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 89c74d83b490a..5c27e3426fd7c 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, libGLU_combined }: +, libvorbis, freetype, openal, libGL }: stdenv.mkDerivation { name = "alienarena-7.65"; @@ -11,12 +11,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal libGLU_combined libXxf86vm ]; + freetype openal libGL libXxf86vm ]; patchPhase = '' substituteInPlace ./configure \ --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 \ - --replace libGL.so.1 ${libGLU_combined}/lib/libGL.so.1 + --replace libGL.so.1 ${libGL}/lib/libGL.so.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 70c23664dc049..edb739125c014 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU_combined, zlib }: +{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU, libGL, zlib }: let versionMajor = "0.2.8"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; configureFlags = [ "--disable-etc" ]; - buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU_combined zlib ]; + buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ]; meta = with stdenv.lib; { homepage = http://armagetronad.org; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 37593d3bd7262..191428f66dbc7 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake xlibsWrapper libGLU_combined SDL openal freealut libogg libvorbis ]; + buildInputs = [ cmake xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 94a1e6ee91ab6..c6c5176ecdf8b 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, lua, libGLU_combined }: +{ stdenv, fetchurl, SDL, lua, libGLU, libGL }: stdenv.mkDerivation rec { name = "bitsnbots-20111230"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ln -s $out/share/${name}/bitsnbots $out/bin ''; - buildInputs = [ SDL lua libGLU_combined ]; + buildInputs = [ SDL lua libGLU libGL ]; meta = { description = "Simple puzzle game with moving robots"; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index a35b449f92fd1..608b32764bb95 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}: +{stdenv, fetchsvn, SDL, libGLU, libGL, openal, libvorbis, freealut, SDL_image}: stdenv.mkDerivation { name = "blackshades-svn-110"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lSDL_image"; - buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut ]; + buildInputs = [ SDL SDL_image libGLU libGL openal libvorbis freealut ]; patchPhase = '' sed -i -e s,Data/,$out/opt/$name/Data/,g \ diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index d3eb2348a0d5a..938d767c3d85a 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL2, SDL2_image, libGLU_combined, cmake, physfs, boost, zip, zlib +{stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib , pkgconfig, unzip}: stdenv.mkDerivation rec { version = "1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL2 SDL2_image libGLU_combined cmake physfs boost zip zlib + buildInputs = [SDL2 SDL2_image libGLU libGL cmake physfs boost zip zlib unzip]; preConfigure='' diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 56d2866a23553..d07088a30a3eb 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig -, curl, SDL2, libGLU_combined, glew, ncurses, c-ares +, curl, SDL2, libGLU, libGL, glew, ncurses, c-ares , Carbon, CoreServices }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ] + buildInputs = [ curl SDL2 libGLU libGL glew ncurses c-ares ] ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ]; meta = with lib; { diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index bbdc2a6031384..5c74b5962794a 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, libX11, zlib, xorgproto, libGL ? null, libGLU ? null, freeglut ? null }: +{ stdenv +, fetchurl +, libX11 +, zlib +, xorgproto +, libGL ? null +, libGLU ? null +, freeglut ? null +}: stdenv.mkDerivation rec { pname = "construo"; diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index bb06bec411bba..4741ac7bb6846 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU_combined, libXi, libXmu }: +{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-sound=yes" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU_combined libXi libXmu ]; + buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; hardeningDisable = [ "format" ]; enableParallelBuilding = true; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 47632408e7958..e4cccdd6221b1 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp +, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp , tileMode ? false, enableSound ? tileMode # MacOS / Darwin builds @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] ++ (with python3.pkgs; [ pyyaml ]) - ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ] + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU libGL ] ++ lib.optional enableSound SDL2_mixer ++ (lib.optionals stdenv.isDarwin ( assert (lib.assertMsg (darwin != null) "Must have darwin frameworks available for darwin builds"); diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index b9d3a69d87b3a..75ff970a16a8f 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU_combined, SDL, SDL_mixer, plib, libjpeg }: +{ stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, plib, libjpeg }: let version = "0.9.13"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libGLU_combined SDL SDL_mixer plib libjpeg + libGLU libGL SDL SDL_mixer plib libjpeg ]; patches = [ diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 441e9f66981c7..fd9729376403a 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU_combined, zlib, libjpeg, libogg, libvorbis +{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wsabvh1x4g12xmhzs2m2pgri2q9sir1w3m2r7fpy6kzxp32hqdk"; }; - # Add libGLU_combined linking + # Add libGLU libGL linking patchPhase = '' sed -i 's/\<idlib\()\?\)$/idlib GL\1/' neo/CMakeLists.txt ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 libGLU_combined zlib libjpeg libogg libvorbis openal curl ]; + buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; enableParallelBuilding = true; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 71024f3d5c91d..544fa26b21ccc 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin , perl, XMLLibXML, XMLLibXSLT, zlib -, enableStoneSense ? false, allegro5, libGLU_combined +, enableStoneSense ? false, allegro5, libGLU, libGL , enableTWBT ? true, twbt , SDL , dfVersion @@ -100,7 +100,7 @@ let nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] - ++ lib.optionals enableStoneSense [ allegro5 libGLU_combined ]; + ++ lib.optionals enableStoneSense [ allegro5 libGLU libGL ]; preConfigure = '' # Trick build system into believing we have .git diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 82806c7521cf1..b7eb2f02568dd 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,5 +1,5 @@ { gcc6Stdenv, fetchurl, fetchpatch, scons, pkgconfig -, SDL, SDL_mixer, libGLU_combined, physfs +, SDL, SDL_mixer, libGLU, libGL, physfs }: let @@ -33,7 +33,7 @@ in gcc6Stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig scons ]; - buildInputs = [ libGLU_combined physfs SDL SDL_mixer ]; + buildInputs = [ libGLU libGL physfs SDL SDL_mixer ]; enableParallelBuilding = true; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 2999da8fcaaf3..e305505d62cbc 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem -, flac, gtk2, libvorbis, libvpx, libGLU_combined +, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: let @@ -26,18 +26,18 @@ in stdenv.mkDerivation { sha256 = "09a7l23i6sygicc82w1in9hjw0jvivlf7q0vw8kcx9j98lm23mkn"; }; - buildInputs = [ flac gtk2 libvorbis libvpx libGLU_combined SDL2 SDL2_mixer ]; + buildInputs = [ flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; nativeBuildInputs = [ makeWrapper pkgconfig ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' substituteInPlace source/build/src/glbuild.cpp \ - --replace libGLU.so ${libGLU_combined}/lib/libGLU.so + --replace libGLU.so ${libGLU}/lib/libGLU.so for f in glad.c glad_wgl.c ; do substituteInPlace source/glad/src/$f \ - --replace libGL.so ${libGLU_combined}/lib/libGL.so + --replace libGL.so ${libGL}/lib/libGL.so done ''; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 98ab4d27d5f59..3cd2dc5827b3c 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_ttf }: +{ stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_ttf }: stdenv.mkDerivation rec { # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} ''; - buildInputs = [ libGLU_combined SDL SDL_mixer SDL_image SDL_ttf ]; + buildInputs = [ libGLU libGL SDL SDL_mixer SDL_image SDL_ttf ]; /* This big commented thing may be needed for versions 2.8.0 or beyond diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index e06975e8db418..1c007cc6bb54f 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, curl, expat -, jansson, libpng, libjpeg, libGLU_combined, libXxf86vm, pcre +, jansson, libpng, libjpeg, libGLU, libGL, libXxf86vm, pcre , pkgconfig, SDL2, vim }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg libGLU_combined libXxf86vm pcre SDL2 vim + expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim ]; installPhase = with stdenv.lib; let diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 9266428b5e7bb..d3c3271710a0e 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, wrapQtAppsHook -, freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib +, freeglut, freealut, libGLU, libGL, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xorgproto, libXext, libXi , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase, qtdeclarative, glew @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ - freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib + freeglut freealut libGLU libGL libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xorgproto libXext libXi libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase glew qtdeclarative diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index d0f514f239d55..dfad954f0f0c2 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper , boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff -, libjpeg, libGLU_combined, glew, libxslt +, libjpeg, libGLU, libGL, glew, libxslt }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ (boost.override { enablePython = true; }) - SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ]; + SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ]; nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index d334439cafb84..b8a0d5ff3c765 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU, libGL, wxGTK, libX11, xorgproto , runtimeShell }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xorgproto ]; + buildInputs = [ gtk2 glib libGLU libGL wxGTK libX11 xorgproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index fb60808bab700..09a472f4dac83 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libGLU_combined, SDL, freeglut, SDL_mixer, autoconf, automake, libtool +, libGLU, libGL, SDL, freeglut, SDL_mixer, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; }; - buildInputs = [ libGLU_combined SDL freeglut SDL_mixer autoconf automake libtool ]; + buildInputs = [ libGLU libGL SDL freeglut SDL_mixer autoconf automake libtool ]; meta = with stdenv.lib; { description = "An air combat simulator"; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index edfb05d237cd3..b953aad606d6f 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU_combined, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net +{ stdenv, fetchurl, libGLU, libGL, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net , speex, libvorbis, libogg, boost, fribidi, bsdiff , fetchpatch }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; - buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; + buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; postConfigure = '' sconsFlags+=" BINDIR=$out/bin" diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index bd3ae0b2e123d..0e70096ab53f1 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, libGLU_combined, zlib, libpng, libvorbis, libmikmod, SDL_sound } : +{stdenv, fetchurl, SDL, libGLU, libGL, zlib, libpng, libvorbis, libmikmod, SDL_sound } : stdenv.mkDerivation rec { name = "gltron-0.70"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # The build fails, unless we disable the default -Wall -Werror configureFlags = [ "--disable-warn" ]; - buildInputs = [ SDL libGLU_combined zlib libpng libvorbis libmikmod SDL_sound ]; + buildInputs = [ SDL libGLU libGL zlib libpng libvorbis libmikmod SDL_sound ]; meta = { homepage = http://www.gltron.org/; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index b6d14085351e1..38eff4f2fceb0 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, libGLU_combined} : +{stdenv, fetchurl, SDL, SDL_image, libGLU, libGL} : stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; - buildInputs = [ SDL SDL_image libGLU_combined ]; + buildInputs = [ SDL SDL_image libGLU libGL ]; prePatch = '' sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 3ec508040e7a0..67f15be1ed3e0 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig -, zlib, libxml2, libxslt, xorgproto, libX11, libGLU_combined, SDL +, zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - zlib libxml2 libxslt xorgproto libX11 libGLU_combined SDL SDL_mixer SDL_image + zlib libxml2 libxslt xorgproto libX11 libGLU libGL SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs ]; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 668605a9ae103..ed926461db21b 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, libGLU_combined, sfml, fribidi, taglib }: +{ stdenv, fetchgit, cmake, libGLU, libGL, sfml, fribidi, taglib }: stdenv.mkDerivation rec { name = "mars-${version}-${rev}"; version = "0.7.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit rev; sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"; }; - buildInputs = [ cmake libGLU_combined sfml fribidi taglib ]; + buildInputs = [ cmake libGLU libGL sfml fribidi taglib ]; patches = [ ./unbind_fix.patch ./fix-gluortho2d.patch diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 0f457cc688ba7..4654456bd6cd0 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, sqlite, luajit +, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg , leveldb, postgresql, hiredis }: @@ -47,7 +47,7 @@ let buildInputs = [ irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses ] ++ optionals buildClient [ - libpng libjpeg libGLU_combined openal libogg libvorbis xorg.libX11 libXxf86vm + libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm ] ++ optional buildServer [ leveldb postgresql hiredis ]; diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index d8a4e32faaab4..a1b525ff093b9 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis -, libpng, libGLU_combined, makeWrapper, zlib, freetype }: +, libpng, libGLU, libGL, makeWrapper, zlib, freetype }: let pname = "naev"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; }; - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU_combined zlib freetype ]; + buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index a0ae03cefb75b..093f071c7233c 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: +{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU, libGL }: stdenv.mkDerivation { pname = "newtonwars"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs"; }; - buildInputs = [ makeWrapper freeglut libGLU_combined ]; + buildInputs = [ makeWrapper freeglut libGL libGLU ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -26,7 +26,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/nw \ --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ - --prefix LD_LIBRARY_PATH ":" ${libGLU_combined}/lib + --prefix LD_LIBRARY_PATH ":" ${libGLU}/lib \ + --prefix LD_LIBRARY_PATH ":" ${libGL}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 72235d9131bc1..9f8d228e71677 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, libGLU_combined, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib , # sdl SDL }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation { # required for both unzip # glx - libX11 libGLU_combined libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib # sdl SDL ]; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 368fba1499f6f..04d8afd2786b9 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal +{ stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal , SDL2, boost, ffmpeg, Cocoa, OpenAL }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg + sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 2958a162bbcb5..a77b8f2ba4c81 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2019.10.18"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU_combined openssl zlib ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ]; meta = { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index dc47e5aa58e8d..640a4d761f47a 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer -, pkgconfig, libGLU_combined}: +, pkgconfig, libGLU, libGL}: let s = # Generated upstream information { @@ -14,7 +14,7 @@ in stdenv.mkDerivation { inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU libGL]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 02c91b1523d5f..0040bba6d3996 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined +, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL , glew }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng - assimp libGLU_combined glew + assimp libGLU libGL glew ]; preConfigure = '' diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 520f6503edfd8..ea6f8b01c71d9 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, SDL, SDL_mixer, SDL_net -, libGLU_combined ? assert false; null +, libGLU ? null +, libGL ? null , useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform }: +assert useOpenGL -> libGL != null && libGLU != null; + stdenv.mkDerivation rec { name = "prboom-2.5.0"; src = fetchurl { @@ -11,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_mixer SDL_net ] - ++ stdenv.lib.optional useOpenGL libGLU_combined; + ++ stdenv.lib.optionals useOpenGL [ libGL libGLU ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index d4945d43c7d77..607458f379868 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, libGLU_combined, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU, libGL, openal, pixman, pkgconfig, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng - libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU_combined openal + libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal pixman pkgconfig python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index e8678253b406a..e30065666b0f3 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.02.1"; + version = "1.03.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "0fk9jqql0crnf0s12cxnris392ajciyw1zbz17qgs5hdyivp9vdx"; + sha256 = "1x2lx1fvr2p91clbx2jcc29j5yyh0xwq9fh0lyxhyadf5a710fn0"; }; sourceRoot = "source/Quake"; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 79d657e668dc4..9b0cfaa3b50d8 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, openglSupport ? libGLSupported, libGLU_combined ? null +, openglSupport ? libGLSupported, libGLU, libGL ? null }: -assert openglSupport -> libGLU_combined != null; +assert openglSupport -> libGL != null && libGLU != null; with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optional openglSupport libGLU_combined; + ++ optionals openglSupport [ libGL libGLU ]; configureFlags = [ "--enable-all-engines" ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 09550339f83db..00faee7b92895 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, +{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU_combined boost + buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU libGL boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 1527f61c4d0f9..a2859c11712e8 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU_combined, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ stdenv, fetchurl, libGLU, libGL, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libGLU_combined glew openalSoft freealut wxGTK libogg freetype libvorbis + [ libGLU libGL glew openalSoft freealut wxGTK libogg freetype libvorbis SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 8c4ce46f6f5ec..8ef6e0c8be575 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, nasm -, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU_combined, SDL2, zlib +, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = [ - alsaLib curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU_combined SDL2 zlib + alsaLib curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU libGL SDL2 zlib ]; dontDisableStatic = true; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 2ffd3f3d053b9..7179c4f48b51b 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake -, boost, eigen2, lua, luabind, libGLU_combined, SDL }: +, boost, eigen2, lua, luabind, libGLU, libGL, SDL }: stdenv.mkDerivation rec { pname = "soi"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost lua luabind libGLU_combined SDL ]; + buildInputs = [ boost lua luabind libGLU libGL SDL ]; cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2" diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index 2b69dfccad154..e9fe6257fb63e 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libGLU_combined, libXi, libXt, libXext, libX11, libXmu, freeglut +, libGLU, libGL, libXi, libXt, libXext, libX11, libXmu, freeglut }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.01"; patchversion = "9"; - buildInputs = [ libGLU_combined libXi libXt libXext libX11 libXmu freeglut ]; + buildInputs = [ libGLU libGL libXi libXt libXext libX11 libXmu freeglut ]; src = fetchurl { url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 17cb57d3fdbc5..473409ffae95a 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchurl, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto + buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat SDL2 enet libjpeg openscenegraph libvorbis curl ]; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index e98148cbc832e..8f43a6d84b1ae 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor libGLU libGL glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd libunwind which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 9de9bd37e8dc7..1e2089b9c5031 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xorgproto, libX11 -, libXi, libXmu, libXext, libGLU_combined }: +, libXi, libXmu, libXext, libGLU, libGL }: stdenv.mkDerivation rec { pname = "stardust"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libtiff libxml2 SDL xorgproto libX11 libXi - libXmu libXext libGLU_combined + libXmu libXext libGLU libGL ]; installFlags = [ "bindir=\${out}/bin" ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 0bdd1f9f62df5..8eceea06243e1 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig -, openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype +, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr - openal freealut libGLU_combined libvorbis libogg zlib freetype + openal freealut libGLU libGL libvorbis libogg zlib freetype curl fribidi bluez libjpeg libpng enet ]; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 6cfabc4ee6a79..df6901585bb3b 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl -, libogg, libvorbis, libGLU_combined, openal, boost, glew +, libogg, libvorbis, libGLU, libGL, openal, boost, glew , libpng, freetype }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU libGL openal boost glew libpng freetype ]; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index f0a89adab5725..fef3350a061d8 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa -, xorg, libGLU_combined, openal +, xorg, libGLU, libGL, openal , lib, makeWrapper, makeDesktopItem }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation { buildInputs = [ glibc_multi mesa.dev xorg.libX11.dev openal xorg.libXext.dev xorg.libXxf86vm.dev - libGLU_combined + libGL libGLU ]; unpackPhase = '' 7z x $src @@ -86,7 +86,7 @@ EOF ''; postInstall = '' - wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGLU_combined ]} + wrapProgram $out/bin/tdm --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU ]} ''; enableParallelBuilding = true; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 02c55d7d06c90..4033835e3f9b8 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU, libGL }: with stdenv.lib; stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU_combined ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU libGL ]} \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 2e1837bdef66f..dc696d0555805 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.91"; + name = "tintin-2.01.92"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "0nb3przw84r5zaibhpcb8gxm5vllrchca663c3f650fm83asd5im"; + sha256 = "0id8rd2yhh6ccjnlwyixflsay1rq3sw6pwlhz1ic3nzj22cd91ik"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index af13ae2e7e118..9971aa0d16615 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "1z1w4ycgl5wbm0sv7577vcdfwwf4k7vaf2njzyb21rvqjizpbkwr"; + sha256 = "0c5a2bdyfccwkqnb6yqvzggyi2nk032v01kfc00zlgpdfzljcb9i"; }; prePatch = '' diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index b5ff38b93a106..b778579c9d78d 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU_combined }: +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl"; }; - buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ]; + buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; meta = { homepage = https://trackballs.github.io/; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 802bdb08a87c3..fc9bc985c00f2 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: +{ stdenv, fetchurl, unzip, libGLU, libGL, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { pname = "tremulous"; version = "1.1.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz"; sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql"; }; - buildInputs = [ unzip libGLU_combined libX11 SDL openal ]; + buildInputs = [ unzip libGLU libGL libX11 SDL openal ]; unpackPhase = '' unzip $src1 cd tremulous diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 0050ef19cea29..34ae0762beaae 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, runtimeShell -, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: +, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU, libGL, glew }: stdenv.mkDerivation rec { name = "trigger-rally-0.6.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08qa2f2s8zyn42ff6jb1gsi64d916020ixkzvl16kbb88rabqra8"; }; - buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU_combined glew ]; + buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU libGL glew ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index f699a6a05c624..beff8ada96b40 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtheora, xvidcore, libGLU_combined, SDL, SDL_ttf, SDL_mixer +{ stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; buildInputs = [ - libtheora xvidcore libGLU_combined SDL SDL_ttf SDL_mixer + libtheora xvidcore libGLU libGL SDL SDL_ttf SDL_mixer curl libjpeg libpng gettext cunit ]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index a7ad366aa195c..df80b3a555fbd 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis, +{stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, pkgconfig}: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libGLU_combined SDL_image freealut openal libvorbis ]; + buildInputs = [ SDL libGLU libGL SDL_image freealut openal libvorbis ]; postPatch = '' sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cpp') diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 8dd8222e55e44..1c40d8f5800f3 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,13 +1,13 @@ { stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , lua, fpc, pcre, portaudio, freetype, libpng , SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf -, ffmpeg, sqlite, zlib, libX11, libGLU_combined }: +, ffmpeg, sqlite, zlib, libX11, libGLU, libGL }: let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 libGLU_combined ffmpeg + sqlite lua zlib libX11 libGLU libGL ffmpeg ]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 638900c9e898c..3944050e9836d 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, libGLU_combined +{ stdenv, lib, fetchurl, pkgconfig, libGLU, libGL , SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU_combined ]; + buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU libGL ]; postUnpack = '' mkdir -p uqm-${version}/content/packages diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 999799de58d8f..98ef32b0472a5 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }: +{ stdenv, fetchurl, unzip, SDL, libGLU, libGL, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { pname = "urbanterror"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ unzip SDL libGLU_combined openal curl libXxf86vm ]; + buildInputs = [ unzip SDL libGL libGLU openal curl libXxf86vm ]; sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p + patchelf --set-rpath $cur_rpath:${libGL}/lib:${libGLU}/lib $p ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index e018dfd664d31..3002216b9d4bf 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image +{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU, libGL, SDL2, SDL2_image , libvorbis, bullet, curl, gettext, writeTextFile , data ? fetchsvn { @@ -21,7 +21,7 @@ let }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons libGLU_combined SDL2 SDL2_image libvorbis bullet curl gettext ]; + buildInputs = [ scons libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 9ea9ec7bd12fb..d8c16c9b7ced9 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }: +, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { pname = "voxelands"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm libGLU_combined openal libvorbis xlibsWrapper pkgconfig + libXxf86vm libGLU libGL openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 7d8380e9f7cea..0889e52d8f86c 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,5 +1,5 @@ { stdenv, requireFile -, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined +, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU, libGL , runtimeShell , demo ? false }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU libGL ] + ":" + stdenv.cc.cc + "/lib64"; installPhase = '' diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index d9bba3fdbdceb..34c9bf1f06d14 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg -, libpng, freeglut, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_net +, libpng, freeglut, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_net , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut libGLU_combined SDL SDL_mixer SDL_image SDL_net SDL_ttf + freeglut libGLU libGL SDL SDL_mixer SDL_image SDL_net SDL_ttf lua5 ode libxdg_basedir libxml2 ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index ac7bf7973d77e..f4ce3c86a6466 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -2,7 +2,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx - libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsaLib , # sdl SDL2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # required for both unzip libjpeg # glx - libX11 libGLU_combined libXpm libXext libXxf86vm alsaLib + libX11 libGLU libGL libXpm libXext libXxf86vm alsaLib # sdl SDL2 zlib libvorbis curl diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index aefc8ad987677..257b001024586 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }: +{ stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 SDL SDL_ttf SDL_image libGLU_combined expat zlib + libX11 SDL SDL_ttf SDL_image libGLU libGL expat zlib ]; NIX_LDFLAGS = [ "-lX11" ]; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index d0fe9f61896ec..7d83dece333ec 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf +{ stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf , SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { pname = "xpilot-ng"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj"; }; buildInputs = [ - libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib libXxf86misc + libX11 libSM SDL SDL_ttf SDL_image libGLU libGL expat zlib libXxf86misc ]; meta = with stdenv.lib; { description = "A multiplayer X11 space combat game"; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 228da68709478..38dc54ea9d7b1 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, unzip, zlib, SDL, readline, libGLU_combined, libX11 }: +, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; }; - buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ]; + buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ]; configureFlags = [ "--target=default" diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index a725d9c9b086b..7e6694b28d97a 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg -, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib +, libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib + expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 303c2f82d9ef5..cc49ef2aa1dc0 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib -, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline +, libGLU, libGL , gettext, libpthreadstubs, libXrandr, libXext, readline , openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml , libpulseaudio ? null }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib + buildInputs = [ cmake bluez ffmpeg libao libGLU libGL gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 9e03780daa36e..cec88918282e5 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index e725049160854..5b770a6471ab5 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, graphicsmagick }: +{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: stdenv.mkDerivation rec { name = "dosbox-0.74-3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ]; + buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ]; nativeBuildInputs = [ graphicsmagick ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index d8f5f1cbdb03f..668d18045445b 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: stdenv.mkDerivation { pname = "emulationstation"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 1cfa0db790fb7..81202008db19c 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined, +{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL, libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { glib gtk3 libX11 - libGLU_combined + libGLU libGL openssl_1_0_2 ncurses5 SDL diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index eb7964cc017d5..704cef52e5e44 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11, +{stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; - buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11 + buildInputs = [ allegro openal libGLU libGL zlib hawknl freeglut libX11 libXxf86vm libXcursor libXpm ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 0a43d8f2104de..9f092f91e2efa 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk2, SDL2, zlib, glib, openal, libGLU_combined, lua, freetype, libmpeg2, zip }: +, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU_combined lua freetype libmpeg2 zip ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU libGL lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index da53b4f8c5573..4120ec7ba6aa1 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU, libGL }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ]; + buildInputs = [ gtk2 SDL nasm zlib libpng libGLU libGL ]; # Work around build failures on recent GTK. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index ad96ca36bc163..c1e64d26b4767 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -2,7 +2,7 @@ , p7zip, pkgconfig , libX11, libXv , udev -, libGLU_combined, SDL +, libGLU, libGL, SDL , libao, openal, libpulseaudio , gtk2, gtksourceview , runtimeShell }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev libGLU_combined + [ p7zip pkgconfig libX11 libXv udev libGLU libGL SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 74c456cfb1051..337d19804fc4a 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freeglut, libGLU_combined, libcdio, libjack2 +{ stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut - libGLU_combined + libGLU libGL libcdio libjack2 libsamplerate diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 4f02d0f147d4b..20c7c39312a5a 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3 -, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils +, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { epoxy gtk3 gdk-pixbuf - libGLU_combined + libGLU libGL libarchive libao unzip diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 8787cd9d39e48..34e3961250cf6 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper -, ffmpeg, libGLU_combined, freetype, libxml2, python3 +, ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null , libdrm ? null @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional withVulkan [ makeWrapper ]; - buildInputs = [ ffmpeg freetype libxml2 libGLU_combined python3 SDL2 which ] + buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan [ vulkan-loader ] ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index daa6814a411e1..e44b45dbb4bc4 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ffmpeg , gettext -, libGLU_combined +, libGLU, libGL , openal , pkgconfig , SDL2 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cairo ffmpeg gettext - libGLU_combined + libGLU libGL openal SDL2 sfml diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 7cf4faf55cd72..cb083c0aa0d81 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined + buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL pkgconfig gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 8252c96282d20..057615a79a14b 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 1199f987bb6a9..2416ddd65b7ae 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined +{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ wafHook ]; - buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ]; + buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ]; preConfigure = '' tar xf ${mupen64plus.src} diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index ed8652d08f1b5..abceb752b2f8b 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; patches = [ ./linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 1ea8d7e68d3c0..55fe49895c9f6 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined +{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL , makeDesktopItem }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; - buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU libGL ]; prePatch = '' for i in $(cat debian/patches/series); do diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 89583bb15d3d5..541fbea1dd406 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff + (fetchpatch { + name = "CVE-2019-14869.patch"; + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; + sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; + }) ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 2efaa98d67b08..cfc0c3f7301ac 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -6,7 +6,9 @@ # renderers , enableAGG ? true, agg ? null , enableCairo ? false, cairo ? null -, enableOpenGL ? false, libGLU_combined ? null +, enableOpenGL ? false +, libGLU ? null +, libGL ? null # GUI toolkits , enableGTK ? true, gtk2 ? null, gnome2 ? null @@ -45,7 +47,7 @@ in # renderers assert enableAGG -> available agg; assert enableCairo -> available cairo; -assert enableOpenGL -> available libGLU_combined; +assert enableOpenGL -> all available [ libGLU libGL ]; # GUI toolkits assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; @@ -57,7 +59,7 @@ assert enableFFmpeg -> available ffmpeg_2 ; # misc assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> available libGLU_combined; +assert enableHwAccel -> all available [ libGLU libGL ]; assert enablePlugins -> all available [ xulrunner npapi_sdk ]; assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; @@ -85,11 +87,11 @@ stdenv.mkDerivation { libpng libjpeg giflib pango atk ] ++ optional enableAGG agg ++ optional enableCairo cairo - ++ optional enableOpenGL libGLU_combined ++ optional enableQt qt4 ++ optional enableFFmpeg ffmpeg_2 ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel libGLU_combined + ++ optional enableHwAccel [ libGL libGLU ] + ++ optionals enableOpenGL [ libGL libGLU ] ++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 4bd0a96fb3ac2..f6eaa553bb26e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, fetchpatch +{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt , wafHook # Darwin Dependencies @@ -15,7 +14,7 @@ with stdenv.lib; let - inherit (python2Packages) python dbus-python; + inherit (python3Packages) python dbus-python; shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; @@ -28,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "1dnq75ylcv3npsyvzzkj0g8mdnzwis1whc2pk6s5hkcc1bgvv2xy"; + sha256 = "1prxg1l8wrxfp2mh7l4mvjvmml6816fciq1la88ylhwm1qnfvnax"; }; nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index b1c2ec5c3bda4..b36f8bf98def6 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined +, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender - flam3 libgtop boost tinyxml freeglut libGLU_combined glee + flam3 libgtop boost tinyxml freeglut libGLU libGL glee ]; preAutoreconf = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 7f6d99297ab16..467f762de86ca 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ]; + buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 39706bb96edf0..1937874a49cbd 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam + [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 12bdf40d3265c..77ad13c2c00c5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -50,23 +50,23 @@ let alchemist-vim = buildVimPluginFrom2Nix { pname = "alchemist-vim"; - version = "2019-11-06"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "8b6ea7b1314bb3b47b115c04484b7af3c483f5b8"; - sha256 = "0jfwcd426hd9pb2dyq1949g8k8g1hhkc55k1kbp30r42m116p1qh"; + rev = "911eda990ef259d1f035061c5dfb2f44adb2697e"; + sha256 = "04lm3k6svq4y2a7kqq5phzyny93ynnjdmsv2s98pw6c4z5fq5y1m"; }; }; ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-11-15"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "b91d82bfaa395bb86b3ea51f63cc8cef05e90f98"; - sha256 = "0hgzi91213x0r5mvp1hw8dk1fcjmqjf706cnjcilgv7ljnd6sa5z"; + rev = "d8195e9276c27caabf173a268450a3420b53181a"; + sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2"; }; }; @@ -149,12 +149,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-11-05"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "c6962f051a0dff9c8d1390efea807a7440c9c0d4"; - sha256 = "1f5qq4l6mx7na008d5w6hji93w57vk26w78l4mp66wl790jcw4ky"; + rev = "b5037cbf87ee4b0beed91adb33c339122e58326f"; + sha256 = "1yxjdb2cmha6vqhmsv8vy80whs201wwwx0xmyp76mz9zkcsyljak"; }; }; @@ -204,12 +204,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-11-04"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "644f88b9ddb17ef04c4558e945d1995aab400a96"; - sha256 = "0wbj61q3qyk432wzci8q8pjw2qrl7kv4cxjlxrdcv15w45b8wskk"; + rev = "ff2149d6f022ffdd51c1fa5dbf9b653800f2298b"; + sha256 = "1396p6hvv9dyi91n9y7h5ik4l44xfr9xqhah0mbcg4v7dghrdsdx"; }; }; @@ -336,12 +336,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-10-29"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "0f395b22aee6f99ba3cfc07d3faaf13edcb1ca96"; - sha256 = "118nqx3k7frxvx0cz8w6k6sx905200aym2lqh0qajkg5m288vl75"; + rev = "82b66de274b0405fad8affcc21fcfec62655c266"; + sha256 = "0mfh1xscs1jn2fmzsq4cz57slicyvri83h1f7i3fwlmm1jw6l2nd"; }; }; @@ -413,12 +413,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-11-07"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "f1cb662a5d23f792c6920f122d200731a77150b9"; - sha256 = "1j5n859fyi7wvyqhqvcd81y2h7qiddwqfz3kqx3ri0br0j4hvwc4"; + rev = "c3d8bca71ba4cbf6eefdd24e77e62b595dcff856"; + sha256 = "0djmzw782m8vy3sfff3gnnib4iz3wilvjv4hagv7mhzcf2lzswsb"; }; }; @@ -446,23 +446,23 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2019-10-06"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "198fff4227cbc2742ed6167c1f097826e867d66d"; - sha256 = "1ylwcr8l3bhgxb2zkqskkq97757di6vq7acxw6dd1hb5hk5a17kc"; + rev = "5304a1087e454bb9da7d58e383837f4c3e356e6a"; + sha256 = "1vbyr1cxckdgxns86aknckhgqzp8x0kkk77y0c8my1qinhrmj8cl"; }; }; coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2019-11-21"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "756c9f623f6a82ad902e2bdfe3f0c77fba96c18e"; - sha256 = "1fab8bzj386zkgn7551l58q4ykqakjbx92afx30i1861y8m1a4p1"; + rev = "714ae8de45ab756d5b65f0be0b616153220b9257"; + sha256 = "17gb0xbvczkqxzs2abknr460v0rcvgsi0m7pc4v0waggr690z53l"; }; }; @@ -479,12 +479,12 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-10-28"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "1e8610b2642232185b7e020651423d11001b7546"; - sha256 = "18d2pxmifyacg7gki99bja7gjs7ycprsm3p6p7snf3dx3g5r4pqq"; + rev = "1c7df237f76a50f25e8bbe3d8bec897991ca86b2"; + sha256 = "0q9i1lz4id9c3d4lch3fxkh8qg9v59vh3kin9h2qdnp3xwgfcvjr"; }; }; @@ -567,12 +567,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-11-20"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "d48cc4a31217af3e0d2fa91159972ea7a9575b21"; - sha256 = "0zmzyqp8nw99ajzxr8469yfm9zgi53zggxsp6k6b9m6x8c9rqly9"; + rev = "4f493d6c35bfef71ec21e8db648bcabda5f9ad21"; + sha256 = "1n1b9ss5cjmn5vazfmy97x88s4nqw6f2mwvnqbnvx3cjrpwvyjy6"; }; }; @@ -622,12 +622,12 @@ let coc-yank = buildVimPluginFrom2Nix { pname = "coc-yank"; - version = "2019-10-28"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yank"; - rev = "636c8a3ff0fb4a950b72c626bf2075c20f7c0086"; - sha256 = "1wz8vp558v3l1c4d3igz55iv673ypapjapyy9q3fcxya8b3qs09y"; + rev = "1d145660c81cf4f160965feb12ea69129d1cce3e"; + sha256 = "1sdpkr1rkvqaiixiddd5a0095di071nxr2gvnikb4pnzrknacngk"; }; }; @@ -788,23 +788,23 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2019-09-24"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "f8486e58fb02351689ae247cebf28b5fee326c33"; - sha256 = "038zx5zn4da73ps5klixcwh64z6rivfp78l2lvaj5d1vjqh1ac83"; + rev = "1dca4e12299e26bf4277992fd9b8b22bcc2f4e56"; + sha256 = "11zjcp48c7n13pqmwg1s6fk8i0z2iyv5nmyl642xxdyg0h43v5hf"; }; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2019-11-18"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "1c59c0bbeea3d9162b1f8405c0cdcf23f29860f6"; - sha256 = "0pn3szp6kpk6za1q7f5wimwxsfrz5csgx8sxkzsch133q0f24p7f"; + rev = "4dc152ac826a825b69741cc79681a257e24497dc"; + sha256 = "1j9hgz76x554wzdz9ss14c94pwp2fk7yplznhyxamndn9wcy8yiv"; }; }; @@ -843,23 +843,23 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-11-19"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7712a251e172b2dc6a41d36504c0392797484ab1"; - sha256 = "0n696hjri23s9janar3k9la85apzl5kn51jgrjjf3p9xbx8h3ljk"; + rev = "41aa8302dc5ae8b27370bfcbf1124559c2f953de"; + sha256 = "1bbnz9d8qayrr40kxikcgjv28y109b0ksys9pnb27l9az8sx64bz"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-11-22"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6457c49bb90ea955755c6a47a561f04312a28ed8"; - sha256 = "0bmw6xw0qa25dix4lp82447w3ffl49vf431wz90j6xa0swaxifkj"; + rev = "856041638e98fc3bf4d4de5d90dee525f3dfa9a5"; + sha256 = "1y6kp56n26kabmp60nnyaw46yxv9nqv5bp15hzvfpwvzq7gvpm10"; }; }; @@ -934,12 +934,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-11-21"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "44185b8c477b1ba5a299f157569f842a5f2ed1ec"; - sha256 = "0y7ibagw5hj10qjrkqa8vq1a0h50xdnrirz2lnpyy8wyk9l5l2lc"; + rev = "37a307b1b4e922df0ff2695658602f1c34973db6"; + sha256 = "10rdk35bljzi705b2760n7f4hlsikaz366a62wsh09npbw63sdzb"; }; }; @@ -978,12 +978,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-11-20"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "57cf7710a8dd51797bbbe5a45e67aef44caa126f"; - sha256 = "1wmlx2nx3bciv9mhws04ryix0sp33j945mn09cm8vvipbq0bk2q2"; + rev = "41ab306416a951be661622d7b0d174fe74f84f7e"; + sha256 = "0sa6bzywlnpw4hrgnls0cs90ilykrbf9jblbq811di9d7rvn52zn"; }; }; @@ -1033,12 +1033,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-11-03"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "5df91ecb9008666912c7ee15f95ebe5ff4265c23"; - sha256 = "020ll1517z8hmmqcnif4kd579hwvxjf8m0m2x1lg2b9kzaid09d1"; + rev = "2ad3d7882d2e9622a7fdc1a5ba1c5d0064d89472"; + sha256 = "00cyvjzn2sr49fvjfsxv0rj7kmdr2m2xlcpqvnfamh6l19nagb35"; fetchSubmodules = true; }; }; @@ -1090,12 +1090,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-11-04"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "4f7c122c55aa8a4cfaedc6b12d3d2f26ce579250"; - sha256 = "0qvdp5y4bhb5nim0va1a25xahc7698lxj63q7cx2w2papbia69pi"; + rev = "4d34d3a44f7ee234460fcd8d543e5ba55b6b36e6"; + sha256 = "0llck06cpjjlfi4ga420z64fq064n0ykb9hh6dygklnnvkhdgb92"; }; }; @@ -1201,34 +1201,34 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-11-17"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "98cf39949b617b9f3a47d2e092af573060022301"; - sha256 = "1h3nz1rqkggf2gs9hywl3x67hprpspm3qc0lmjc3msc5p221f2n4"; + rev = "65edb6ad99b51514aaf29afc25e35ce5f05281ba"; + sha256 = "1d40whzc21c4zbzssjwvhzddyb0a106ib8r4zzzdd61s1935z4xr"; }; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2019-09-30"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "d09e3a3cf3b9c37b1cf0cd7e4952e24c46bfb9fe"; - sha256 = "0d0brqssq4qrx0l0yr668jvq5zk5pxqfkr8d8acbds8a48afz6zf"; + rev = "c7ab3c0f6efbe68e864273ad460ab06905930bd0"; + sha256 = "1h46s31miyd3j8shmrs61phkljj7qp9bkclcx1l0yd4cppm3vi06"; }; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2019-11-14"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "25faf559b6f5e8fdef8e1ca2aaf557644a57a165"; - sha256 = "08653iwhz29xskrj36sih0z2bb247p137g8ls8ydvjgfy60jzrkm"; + rev = "bd77010189fa5f14f9e06a0f71bb2831b9d5b4a6"; + sha256 = "0m1hxwri2imgjywrc9l1s8bnr38dbsfz8zxw228yknq392jpvlyk"; }; }; @@ -1311,12 +1311,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2019-10-13"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "7a84f6342cc79444e3fa873bf1d08fb6c53b097e"; - sha256 = "0q5xz8iw3jg42kbaspmgd8mlcgl3xglcqh3fyd2jmmwhnfzp3f7r"; + rev = "f12b8b80897c1214327e6075abc007ec6e55a691"; + sha256 = "0fb0zsmpx1vbdfh3d04dpgy2gkd4wkdn05jflcpr5cyf50zr1z9y"; }; }; @@ -1598,23 +1598,23 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2019-11-22"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "88548effe90b6b980e1320656231eaff57952d83"; - sha256 = "1xmsmvkbxqh0ib30qzkk5km5mjdr4f64mxll79x2x0wn8ldwjz9g"; + rev = "441b2d3827158c1c1781e797dd5953fa2b7ba63f"; + sha256 = "134lb5nnbkwlcgryd39n9dbqyqzadnfibk76m67pjk60sy4s64wk"; }; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-11-22"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "ae9d7cf976143a43af11d350ca3406733549b883"; - sha256 = "1jziwz9mp6jsfd0jkvj4s6n4fw1kg0zgbd5j5rjz2jgp1akqnz2l"; + rev = "a150fd6af763f9ec1d0785f8a3ba350d8f27d908"; + sha256 = "0l70gkzv279sv756yng7nq3m1pkw2bvjybl6xvjifm19rx8vmlsg"; }; }; @@ -1675,12 +1675,12 @@ let mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2019-11-13"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "17a0395f19739964b85672fb5538ea3f2e28ca7a"; - sha256 = "01g9ig5h7cqvlv2xakr8cml7l4rlgnypglqzag8zyr2lb2c1dmm3"; + rev = "de499b9525490b10edbd28fb8f0c4e81c6a6f20c"; + sha256 = "0xvvkq9zckmv9pnzvxg71fblly8lksfi736brbcwcvnszqif4b69"; }; }; @@ -1862,12 +1862,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-11-08"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "4e5ee03c61fbabf3eb90b6b30d9acd4f3d4b3fdb"; - sha256 = "13z45hsk99lcdfbinvbbwr1036fsakhp4dhlqd6dmq6fn3fw5y9w"; + rev = "fb9765ec9d8e14e01ed3f55364b56c608271fb45"; + sha256 = "02pqn7fjm4749qfbc13kz0bhf8azr7vhkzca8cq9imiwdpssvmjs"; }; }; @@ -1884,12 +1884,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-08-11"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "f38f1732e4bb0643b3019b5b733a87f5f03ea348"; - sha256 = "1brzryd2sc44xpkz4w4s78a8vmwddvzkqgiyiaygp45k87q2yp24"; + rev = "7e300f1b986f46b217c26906ca4ee88629f18610"; + sha256 = "121zqdmpz2dmgsc6zzvrbjhbc3ik5hbj069wh33laxvj74gsar6k"; }; }; @@ -1961,12 +1961,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-10-05"; + version = "2019-11-26"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "92082862364cf5ec3eec79a025bbc7bc5165e05f"; - sha256 = "0aqjc26l1m62jgj34difkkbbd0kam1sa6ldfwf2fbkxs3f5y63q8"; + rev = "023cc20324c41059b5ce79edaef0ffeef8bf5923"; + sha256 = "02459d88v2g8slrhajmaywwwanqifyrbrxg90vp7rrzx42f6p56r"; }; }; @@ -2060,12 +2060,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-10-13"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "81caad80107abb9c2f5159e02e2cd95876370bec"; - sha256 = "01x1jx7wxpjkv09l9wx1ygsjqrdvfy47pxqgjzmnx4x126ji9gw2"; + rev = "83c6f4e61aa73e2a53796ea6690fb7e5e64db50a"; + sha256 = "0yswx77gwxsac4aw2hkx0krjz4jh7pj5bgpvshynj5dlp34ip0m0"; }; }; @@ -2379,12 +2379,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-10-20"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "97fdc4e4975515d8e8a5a82380dd85628d59a005"; - sha256 = "1ggnl9h0jqb3zf8n8vpvlizxb3fikmghwpj8d3xq3ny54wfjgx78"; + rev = "b7176e7a1607bb17f2f57cb8b365042f5676b21b"; + sha256 = "12i213ci5db4xiyqzwkd4i6mmxgq2j1ipjsn42mif3yp0cr1rvvv"; }; }; @@ -2401,12 +2401,12 @@ let semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-10-01"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "b50f1bcc48bb944704c586b462a5e9d5cdf0d532"; - sha256 = "1f2wqqhnfyicx8dgna6lcsa3pl5bxbjqf261rz9phxw649rsa9a4"; + rev = "816b8d22adf59260f4355aab31c1cdc99db8f438"; + sha256 = "01s46f0gclbz3v73z75zmcy7xh9xvzjn067xiyhbf7m6jlzic0aq"; }; }; @@ -3084,23 +3084,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-11-21"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b9eb94120133a3be4cee77e9bedf68c4200f4b04"; - sha256 = "0x9z67i8g4p6iik110nfcnsdpny74gi6arx2yvwssa6vzdv2rh9f"; + rev = "ce932f3825f59258f814d4b66174283875348a95"; + sha256 = "0mwvmxy5x03crp7nkbnjl9h6gmjwlhwiw8i62x95nl8yf5zi8gdl"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-11-21"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "935dffc6ff96f7282db93e40e024c942056aedaa"; - sha256 = "0mx3w41sxvrvk4n4sv1zswlnxmkk93wy9wmc1gmc70yrd9q9jfbx"; + rev = "f4ba787e9c5455a6a88c6d04e61b189826375763"; + sha256 = "1w15r4c7qwlbjjc5mbdcmg4qv4skw9n5qcn543zmiws8hxfqhf6m"; }; }; @@ -3689,12 +3689,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-11-18"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "13fdeb5fa7f464266163f405f42322e6fb0d3067"; - sha256 = "1605vznbf66z7f2g2lzx4yzxm0dnzddwzfa9mgbxa4wv1836ng0x"; + rev = "67efbf66e0fcfd25e617d22892a7e9768bfd0f92"; + sha256 = "0ga8qi26yfc3k5ynw75ai4a9605s8x2pk9i9vb79hddciwh02ia1"; }; }; @@ -3733,12 +3733,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-11-22"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "fa8d0feb4103f15b97e2abb4e76cbaaf03495d1d"; - sha256 = "0ki46g0xl6gn75hh9p13any17x5v703bc86ya2nfqwyp2w0gapyg"; + rev = "c31581c25b4896ccb6418137c70a3a3c37326c89"; + sha256 = "1drjj5d50s3hsd8sh4cvh8ah785chi5fyzq5cy01vpxf8cfghljg"; }; }; @@ -4603,11 +4603,11 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-11-15"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "d15651463ab5c3dd6609e548527a8ea18ab80c98"; + rev = "15aeea662e0b08088ac7b6e3ee661c834e69106a"; sha256 = "1x7xx12hdydn37hb2k0awzv4s00sb7zk09jixr9mjfrh2x7ywf1c"; }; }; @@ -4669,12 +4669,12 @@ let vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2018-07-22"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; - sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; + rev = "1af106ef8fcbd096fdadf6f4f3a2b422594836f5"; + sha256 = "1703zqpaadjji34mmyfzmnwr9jvms63w12lwsrdnqv9h9ag03n7y"; }; }; @@ -4812,12 +4812,12 @@ let vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-11-13"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "bb75c2ec73f6b43346e0b159d46de3e304ac7dd6"; - sha256 = "0zxqm00c0aj5a55m35f42px4d19xbijfiqp6qs2xlqwzjw5na12m"; + rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; + sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; }; }; @@ -4922,12 +4922,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-11-07"; + version = "2019-11-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "5d259617f5198e511a759ccf4fb3000921abae21"; - sha256 = "1hxk0ab1r25m1mc09lvw6rsg9wrjrl0bgxql8slqpa7mqrkp47rn"; + rev = "c1d1cdce4f34d861cedebc948ef9cdecf633ae0a"; + sha256 = "1lnpv54mnn99yz4z4jr3al0bf1jxiz45rpqk8jvv5xz70zmfbrrg"; }; }; @@ -4988,12 +4988,12 @@ let vim-stylish-haskell = buildVimPluginFrom2Nix { pname = "vim-stylish-haskell"; - version = "2018-08-31"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "nbouscal"; repo = "vim-stylish-haskell"; - rev = "0df8a2dd397f232a9ee0e56bc57071ccf29e21bf"; - sha256 = "05f2ms2c914ycxjjd7csga89mpsk3wzyhi56vikg3nd7a8z54gzw"; + rev = "ef12ab024cb3928ae57ce7c4fa519c4751afef99"; + sha256 = "0ysz68v4c2i4kxchsvxgkpj5kb0jbm5x06ri1ns9cmk5gj01pmd6"; }; }; @@ -5010,12 +5010,12 @@ let vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2019-11-12"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "e4c4cc0f816515fbb7e87076a988604b2d163daa"; - sha256 = "080wwicibkzll8v6a9mkr6wkibp5cv9wqfwpgy8i8djgbafcvnbz"; + rev = "f51a26d3710629d031806305b6c8727189cd1935"; + sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; }; }; @@ -5087,12 +5087,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-11-06"; + version = "2019-11-25"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "dcd7995802c7b90555ef6d920289c5d7f063bcb6"; - sha256 = "1a7k7i75n3qb14fvngkdpwvcyjl7cri2f2v1vi89waf7blmn22ib"; + rev = "3592eff62d38531acb2a948f0445463f27c5d801"; + sha256 = "1q41vp404n2pn65pg4br282wyimnfsrrhfkciwp0mhfp4ksn20mz"; }; }; @@ -5296,12 +5296,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-11-16"; + version = "2019-11-27"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "99d367c4974a9e398943a0f457a8f3994732b050"; - sha256 = "1cgphcm2fkhvks6bx8f0i54i91pcprisb079sddildnq4lsj895r"; + rev = "fb6895c5c39862e495644e2cc0d300ad00bdeed2"; + sha256 = "14mcrwfkwjlqh7r6h2qmcxm8a4c6lldrk549c9bwnrpzmvjw5daw"; }; }; @@ -5329,12 +5329,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-07-27"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "29d14cca6593a4809a31cfc3565a366d87426daf"; - sha256 = "1b47fv3jm37yhbg2mwc7kmlsl54dapb4sw9isf1h3mbmgxnvi5p9"; + rev = "fd18019b94d97c2ded56f8cce6087d692e6a055c"; + sha256 = "0m3dp5m8fbb28b68kykcickgd79bwv7gg30w483ndh2bgjjahqn0"; }; }; @@ -5483,12 +5483,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2019-11-10"; + version = "2019-11-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "47b54dd23eeb0a7fa81529d3768b27b979821b30"; - sha256 = "14nhnbds463iys8ndvyajbskwsi6hjljmmlvic3rbvym2h9mn442"; + rev = "89065f62883edb10a99aa1b1640d6d411907316b"; + sha256 = "0699kf269rsyabl49m4n7vsi5bbxk129wq6ml3ykhy9g9m2b8a3k"; }; }; @@ -5505,12 +5505,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-11-19"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ed45b8b8ff5a61f05dea081d3eae98dcaee28857"; - sha256 = "1sd1315lg6sxydvwhk58kyp5hhdbrzqvkfgy0hvpy7c5h1rlfcjm"; + rev = "0647bb8991a490f92de173ca67e9b49a3f1fddcd"; + sha256 = "142wh5b2zl3s8jjlc6hnd1z8ysfiz4xllax84f6ddyny72z3di42"; }; }; @@ -5660,12 +5660,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-11-19"; + version = "2019-11-23"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "a7fd70cf7213c75088a47967c3e28aa4f6c47872"; - sha256 = "0knn6j85k6rpis3riv6j9nvxw7114ddz1fr1p6ayv4mhnyj669rc"; + rev = "8099995959e7e533306a2cadd38a2f83d2ea9ed9"; + sha256 = "1824jphq8mrswc594p032h459gn51mynfa5k8nnxkjws9c9myc4b"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index b9c599da66c2d..f3f9b8825e640 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -115,12 +115,12 @@ self: super: { # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "2019-11-18"; + version = "2019-11-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a12d6833b4611f996528615186af86c3e041ffb6"; - sha256 = "0rkfhzyf42rbsv8p2337pvkbs3crz1z3vv6ar26sadjg3802118z"; + rev = "d566fa03807d8d86ce9302680d135198a36c7d4d"; + sha256 = "0m355w837f61jfpjrhi3h47z7vq16g8yai8kd82v1h71ns5fw9gz"; }; }; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 2956b107aa71a..a5262d6ae9edd 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-plugins"; - version = "1.1.9"; + version = "1.2.1"; src = fetchurl { url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; - sha256 = "01zrg0h2jw9dlj9233vjsn916yf4f2s667yry6xsn8d57lq745qn"; + sha256 = "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d"; }; # ToDo: a52, etc.? diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index f6ad8e2c03b69..09d218e87458b 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -246,9 +246,9 @@ if test -z "$libsOnly"; then ( # build and install fgl_glxgears cd fgl_glxgears; gcc -DGL_ARB_texture_multisample=1 -g \ - -I$libGLU_combined/include \ + -I$libGL/include -I$libGLU/include \ -I$out/include \ - -L$libGLU_combined/lib -lGL -lGLU -lX11 -lm \ + -L$libGL/lib -L$libGLU/lib -lGL -lGLU -lX11 -lm \ -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c ) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index b79054d44065d..a391f73391fb1 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, kernel ? null, which , xorg, makeWrapper, glibc, patchelf, unzip -, fontconfig, freetype, libGLU_combined # for fgl_glxgears +, fontconfig, freetype, libGLU, libGL # for fgl_glxgears , # Whether to build the libraries only (i.e. not the kernel module or # driver utils). Used to support 32-bit binaries on 64-bit # Linux. @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE patchelf unzip - libGLU_combined + libGLU libGL fontconfig freetype makeWrapper @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE - libGLU_combined + libGLU libGL fontconfig freetype stdenv.cc.cc @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { xorg.libX11.out xorg.libXinerama.out xorg.libSM.out xorg.libICE.out ]; - inherit libGLU_combined; # only required to build the examples + inherit libGLU libGL; # only required to build the examples enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 19a393cbc7c6c..477aa6d0cce89 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.203"; + version = "4.4.205"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj"; + sha256 = "19pasidvfmf94rs86v80x7hpirz9gavmkxwcl76ya61fq7lqy7zs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 94ba9ae6abd82..940c7c7e57c17 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.203"; + version = "4.9.205"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jd8n8y3yf59sgfjhgjxsznxng7s4b30x5vdb48wrpgqmz7m1n8w"; + sha256 = "01cbqxw77g6rdg7dgk73pg9a2n9v4sxp48q2a77w1b068xjfifcq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index 25cdab9c7bea7..6349563bad1cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.13"; + version = "5.3.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0by9lmgmllf19yflzm9f24cy9glcq6m73ywm25bddsnh0czya14z"; + sha256 = "0ckrbzwsc4lxd3l287wsd88mkfsd0kpf8nzchd9nfmkjiil14mwm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 7745fc8099ff2..1ac0d81530c5c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4"; + version = "5.4.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "14glqppn90z79b36k4c76mv90q933i2bg54rgwlcl2v7n608jcxz"; + sha256 = "1nagqx18a49hgj13spvyf095231wgc441np4zcgl4gnm4jrqpm57"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 7d6ee61030c17..792cd32d654e1 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keyutils"; - version = "1.6"; + version = "1.6.1"; src = fetchurl { - url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2"; - sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pname}-${version}.tar.gz"; + sha256 = "0mzmw8c7gqmqaxm3sa0xki8ycjla47xxhqg0yh17pl00d7ydqw9w"; }; patches = [ diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index 0fff816eac7be..fd16acaa3a984 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -4,7 +4,7 @@ , systemd , libxkbcommon , libdrm -, libGLU_combined +, libGLU, libGL , pango , pixman , pkgconfig @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd libxkbcommon libdrm - libGLU_combined + libGLU libGL pango pixman pkgconfig diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index f2bf5c949704d..2f92b316003e0 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libratbag"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb"; + sha256 = "1fcdcs4i83yic4rp3dsr7rq040f78lh8fb1ni1nnvp3y78fmibmi"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 090b9d7183d74..34e2591d44abd 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.0.878"; + version = "2.1.0"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod openisns.lib openssl systemd utillinux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "0hkprlni0z1zdkrmhd897knyfws0l95bz67fgp0vvf63ag08b5ly"; + sha256 = "0z7rnbfa48j3r4ij7335xgjfb835gnnp10v7q6lvwg7bq6v5xvih"; }; DESTDIR = "$(out)"; @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { $out/sbin/iscsistart -v ''; + postFixup = '' + sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login + ''; + meta = with stdenv.lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 9fde84060247e..4a47ed8868db2 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tomb"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; rev = "v${version}"; - sha256 = "0pr0lw1byxwkgv857zfmd8yqa03a7mckhzklrf9rkv1l6nisz0z0"; + sha256 = "1vzkpzci6cp1r1q2n34pcgcns78i726k8d89dd6pibyj0vfnkl57"; }; buildInputs = [ sudo zsh pinentry ]; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index a9983561345e5..3b4c1c4b6655c 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -12,14 +12,14 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.6"; pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b"; + sha256 = "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"; }; nativeBuildInputs = [ diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 845fd41c12c43..8d2340647cb49 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.22.v20191022"; + version = "9.4.24.v20191120"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1a5av6ygsmjwbnlax7f7l58d7hlw3xm0cpk5ml7mb54vrlrcb7hv"; + sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A Web server and javax.servlet container"; - homepage = http://www.eclipse.org/jetty/; + homepage = "https://www.eclipse.org/jetty/"; platforms = stdenv.lib.platforms.all; license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; }; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index b0a4a84b2fa2c..2c0dbc7d66543 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt +, nixosTests , substituteAll, gd, geoip, perl , withDebug ? false , withStream ? true @@ -109,7 +110,10 @@ stdenv.mkDerivation { mv $out/sbin $out/bin ''; - passthru.modules = modules; + passthru = { + modules = modules; + tests.nginx = nixosTests.nginx; + }; meta = { description = "A reverse proxy and lightweight webserver"; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 9e7550a717177..dfb3ac2cfa202 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.19"; + version = "1.5.20"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1q2bb858iwc1jncav5vfl8c7dic9r1wqni5724qmy8ads6idmp1x"; + sha256 = "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg"; }; configureFlags = [ diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 523713e9d4dab..550ee4c160f32 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mtprotoproxy"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "alexbers"; repo = "mtprotoproxy"; rev = "v${version}"; - sha256 = "1j8bxwcq968h5sd58g03yc4zjqkhkjdn0f04vr826hhsdxy853r4"; + sha256 = "1bpgbqbgy7c637bzm6g5msm2i10dfl4qb7psy3k3cbaysw696kjc"; }; nativeBuildInputs = [ wrapPython ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index f7a67ce398d88..4b1003db28470 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, lua, jemalloc }: +{ stdenv, fetchurl, lua, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "5.0.6"; + version = "5.0.7"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1cr2dn9ilhj52snmlz38fw30gdlgbxq2sadyspawahp1cw988936"; + sha256 = "0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1"; }; # Cross-compiling fixes @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { doCheck = false; # needs tcl + passthru.tests.redis = nixosTests.redis; + meta = with stdenv.lib; { homepage = https://redis.io; description = "An open source, advanced key-value store"; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 360cc4d27d84a..7d91dc91a93e8 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "0v0j8lv1l7mxxwv7ycissya0rrvjqidb37dylqqy4zvirmk1b2av"; + sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; }; - cargoSha256 = "19333br2r27s0rsv7imsv2y1j9gmljy4v8bqybvblrw1vc5961kq"; + cargoSha256 = "08lizhag7aqz3a59gaapsymn7sf9c6im1aw64n0r9a5advhwdh18"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 8785e052224dc..fcb64550d6fe5 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,10 +5,11 @@ let self = stdenv.mkDerivation rec { - name = "mysql-8.0.17"; + pname = "mysql"; + version = "8.0.17"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${name}.tar.gz"; + url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; sha256 = "1mjrlxn8vigi69r0r674j2dibdnkaar01ji5965gsyx7k60z7qy6"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 135844b5e68e2..440375db841d5 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -180,41 +180,41 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.19"; + version = "9.5.20"; psqlSchema = "9.5"; - sha256 = "1cqvbsyfs9048wbvdv0vhhaksjyjqv2vvh6ij4vqmjibc4kal34n"; + sha256 = "03fygn3nn6l6ar66sldy5akdg1gynny3yxbrpvmmp5ygfnrm2mwj"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.15"; + version = "9.6.16"; psqlSchema = "9.6"; - sha256 = "02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w"; + sha256 = "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.10"; + version = "10.11"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd"; + sha256 = "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.5"; + version = "11.6"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz"; + sha256 = "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9"; this = self.postgresql_11; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.0"; + version = "12.1"; psqlSchema = "12"; - sha256 = "1ijm13gx1d9ai09n26nbdc77n9b8akh6pj21yy9vfn7p2mr3k8nd"; + sha256 = "1vc3hjcbgkdfczc1ipkk02rahabn7fabpb7qs203jxpnpamz76x0"; this = self.postgresql_12; inherit self; }; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index b999070a49e0f..6ec2319a49d87 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/powershell cp -r * $out/share/powershell makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ - --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 + --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; dontStrip = true; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index e925a239afb38..06886ba4c79d9 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -117,6 +117,9 @@ let azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "7.0.0" "zip" "104w7rxv7hy84yzddbbpkjqha04ghr0zz9qy788n3wl69cj4cv1a"; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.8.0" "zip" + "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip" "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 5a964a7fe70d8..3536e39418ebc 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -11,14 +11,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.9.0"; + version = "1.10.0"; pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - rev = "v1.9.0"; - sha256 = "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"; + rev = "v1.10.0"; + sha256 = "0l0x7cq65wv9n93r952qsikwzcls1sq3r32mx0c4wg19dha0x1m4"; }; inherit fontDirectories; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.tigervnc.org/; + homepage = "https://tigervnc.org/"; license = stdenv.lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index b1d440e51ce82..4b3a2f60c4fcd 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.8.3"; + version = "5.8.4"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "19lizlsbblkcdyc81jycp5k8kf5d8h2hlgfy16zb1g2vixf6i49m"; + sha256 = "15igz4xkzxlf81kl9p1n447rp2zrzpi6qdwn2iimzrppgqqb4z0b"; }; postPatch = '' diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 7eee02e220af2..93a70f1f08818 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,78 +1,78 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, coreutils -, boost, cryptopp, curl, fuse, openssl, python, spdlog +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, pkgconfig, python, gtest +, boost, cryptopp, curl, fuse, openssl }: stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.9.10"; + version = "0.10.2"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = version; - sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry"; + sha256 = "1m6rcc82hbaiwcwcvf5xmxma8n0jal9zhcykv9xgwiax4ny0l8kz"; }; - prePatch = '' + patches = [ + (fetchpatch { + name = "cryfs-0.10.2-install-targets.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; + sha256 = "1jz6gpi1i7dnfm88a6n3mccwfmsmvg0d0bmp3fmqqrkbcg7in00l"; + }) + (fetchpatch { + name = "cryfs-0.10.2-unbundle-libs.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; + sha256 = "0hzss5rawcjrh8iqzc40w5yjhxdqya4gbg6dzap70180s50mahzs"; + }) + ]; + + postPatch = '' patchShebangs src - substituteInPlace vendor/scrypt/CMakeLists.txt \ - --replace /usr/bin/ "" + # remove tests that require network access: + substituteInPlace test/cpp-utils/CMakeLists.txt \ + --replace "network/CurlHttpClientTest.cpp" "" \ + --replace "network/FakeHttpClientTest.cpp" "" - # scrypt in nixpkgs only produces a binary so we lift the patching from that so allow - # building the vendored version. This is very much NOT DRY. - # The proper solution is to have scrypt generate a dev output with the required files and just symlink - # into vendor/scrypt - for f in Makefile.in autocrap/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do - substituteInPlace vendor/scrypt/scrypt-*/scrypt/$f --replace "command -p " "" - done + # remove CLI test trying to access /dev/fuse + substituteInPlace test/cryfs-cli/CMakeLists.txt \ + --replace "CliTest_IntegrityCheck.cpp" "" - # cryfs is vendoring an old version of spdlog - rm -rf vendor/spdlog/spdlog - ln -s ${spdlog} vendor/spdlog/spdlog + # downsize large file test as 4.5G is too big for Hydra: + substituteInPlace test/cpp-utils/data/DataTest.cpp \ + --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; - buildInputs = [ boost cryptopp curl fuse openssl python spdlog ]; + nativeBuildInputs = [ cmake gtest pkgconfig python ]; - patches = [ - ./test-no-network.patch # Disable tests using external networking - ./skip-failing-test-large-malloc.patch - ]; - - # coreutils is needed for the vendored scrypt - nativeBuildInputs = [ cmake coreutils pkgconfig ]; + buildInputs = [ boost cryptopp curl fuse openssl ]; enableParallelBuilding = true; cmakeFlags = [ - "-DCRYFS_UPDATE_CHECKS=OFF" - "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive + "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" + "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive + "-DUSE_SYSTEM_LIBS:BOOL=TRUE" + "-DBUILD_TESTING:BOOL=TRUE" ]; - doCheck = true; + doCheck = (!stdenv.isDarwin); # Cryfs tests are broken on darwin - # Cryfs tests are broken on darwin - checkPhase = stdenv.lib.optionalString (!stdenv.isDarwin) '' + checkPhase = '' # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) - SKIP_IMPURE_TESTS="CMakeFiles|fspp|cryfs-cli" + SKIP_IMPURE_TESTS="CMakeFiles|fspp|my-gtest-main" - for test in `ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"`; do - "./$test`basename $test`-test" + for t in $(ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"); do + "./$t$(basename $t)-test" done ''; - installPhase = '' - # Building with BUILD_TESTING=ON is missing the install target - mkdir -p $out/bin - install -m 755 ./src/cryfs-cli/cryfs $out/bin/cryfs - ''; - meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; homepage = https://www.cryfs.org; license = licenses.lgpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch b/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch deleted file mode 100644 index feb0ed9cfbb9f..0000000000000 --- a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad3f7e9fa2dececfaab43963887a2f03de52d659 Mon Sep 17 00:00:00 2001 -From: adisbladis <adis@blad.is> -Date: Thu, 12 Oct 2017 21:45:26 +0800 -Subject: [PATCH] Skip failing test: large malloc - ---- - test/cpp-utils/data/DataTest.cpp | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp -index 6f9df070..bd426e62 100644 ---- a/test/cpp-utils/data/DataTest.cpp -+++ b/test/cpp-utils/data/DataTest.cpp -@@ -191,17 +191,6 @@ TEST_F(DataTest, Inequality_DifferentLastByte) { - EXPECT_TRUE(data1 != data2); - } - --#ifdef __x86_64__ --TEST_F(DataTest, LargesizeSize) { -- //Needs 64bit for representation. This value isn't in the size param list, because the list is also used for read/write checks. -- uint64_t size = 4.5L*1024*1024*1024; -- Data data(size); -- EXPECT_EQ(size, data.size()); --} --#else --#warning This is not a 64bit architecture. Large size data tests are disabled. --#endif -- - TEST_F(DataTest, LoadingNonexistingFile) { - TempFile file(false); // Pass false to constructor, so the tempfile is not created - EXPECT_FALSE(Data::LoadFromFile(file.path())); --- -2.14.2 - diff --git a/pkgs/tools/filesystems/cryfs/test-no-network.patch b/pkgs/tools/filesystems/cryfs/test-no-network.patch deleted file mode 100644 index 3392d3f855ec4..0000000000000 --- a/pkgs/tools/filesystems/cryfs/test-no-network.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8b1808e1278d2cb0dc56a4e98781eceeadfb9718 Mon Sep 17 00:00:00 2001 -From: adisbladis <adis@blad.is> -Date: Thu, 12 Oct 2017 18:13:28 +0800 -Subject: [PATCH] Disable tests using external networking - ---- - test/cpp-utils/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt -index 5a2bc9f8..d838edba 100644 ---- a/test/cpp-utils/CMakeLists.txt -+++ b/test/cpp-utils/CMakeLists.txt -@@ -20,7 +20,6 @@ set(SOURCES - tempfile/TempFileIncludeTest.cpp - tempfile/TempDirIncludeTest.cpp - tempfile/TempDirTest.cpp -- network/CurlHttpClientTest.cpp - network/FakeHttpClientTest.cpp - io/ConsoleIncludeTest.cpp - io/ConsoleTest_AskYesNo.cpp --- -2.14.2 - diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 1e89b5729c705..e9dc2c1f37cd3 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.105"; + version = "3.0.107"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx"; + sha256 = "18mw7a1by8l09fb2pan6zak29bcrgbf5zgfzrlw3c203yawqbx3k"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 79c905756537b..8c46e8154c104 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra , help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU_combined vigra ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ]; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index ae6291811a4ab..a68e64c0894c5 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, cmake, libGLU_combined, xorg }: +{stdenv, fetchgit, cmake, libGLU, libGL, xorg }: stdenv.mkDerivation rec { pname = "glee"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU_combined xorg.libX11 ]; + buildInputs = [ libGLU libGL xorg.libX11 ]; configureScript = '' cmake diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 1f1da8df3f2bb..aed8b0573bae7 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew -, libGLU_combined, boost, glm, freetype }: +, libGLU, libGL, boost, glm, freetype }: stdenv.mkDerivation rec { pname = "logstalgia"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost + buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 0e545fbfab9f5..90716d04a75a8 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }: stdenv.mkDerivation { pname = "nifskope"; @@ -18,6 +18,11 @@ stdenv.mkDerivation { src = ./qttools-bins.patch; qttools = "${qttools.dev}/bin"; }) + (fetchpatch { + name = "qt512-build-fix.patch"; + url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; + sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; + }) ]; buildInputs = [ qtbase qttools libGLU.dev ]; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 068aea5459503..6dafbfe2f9fea 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin -, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat +, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv, qt5, netpbm }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ - libGLU_combined freeglut + libGLU libGL freeglut ]); patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 4c0a7f0b4109a..230b2926561bf 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-cloudpinyin"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${pname}-${version}.tar.xz"; - sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf"; + sha256 = "0ai347wv3qdjzcbh0j9hdjpzwvh2kk57324xbxq37nzagrdgg5x0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index ff14a13da04f6..c915e8128913f 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: stdenv.mkDerivation rec { pname = "touchegg"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; - buildInputs = [ xorgserver libGLU_combined xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; + buildInputs = [ xorgserver libGLU libGL xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 8f3d245280c9f..9a27c4df77218 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -4,22 +4,22 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "12bj5xifnpj5yni563b6b33lzmkgm7j1wk0c9859zw59b33ifd1l"; + sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb"; }; - cargoSha256 = "1ias944wg55njjnap7w02b87bvb502vzkpjvsb704q5i9sr8hjry"; + cargoSha256 = "0sqmqfig40ragjx3jvwrng6hqz8l1zbmxzq470lk66x0gy4gziag"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = "Command-line benchmarking tool"; - homepage = https://github.com/sharkdp/hyperfine; + homepage = "https://github.com/sharkdp/hyperfine"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.thoughtpolice ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 3667b483383b8..5e5a7174a1497 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -1,6 +1,6 @@ { fetchzip , libX11 -, libGLU_combined +, libGLU, libGL , makeWrapper , stdenv }: @@ -8,7 +8,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - libGLU_combined + libGLU libGL stdenv.cc.cc libX11 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper - libGLU_combined + libGLU libGL libX11 ]; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 4317c46190dbd..d54302b31d1d3 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU_combined, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { xorg.libXrender stdenv.cc.cc glibc - libGLU_combined + libGLU libGL ]; installPhase = '' diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix index 521bebf47a3b5..8084f49f1b38d 100644 --- a/pkgs/tools/misc/paps/default.nix +++ b/pkgs/tools/misc/paps/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub -, autoconf, automake, pkgconfig, pango }: +, autoconf, automake, pkgconfig, intltool, pango }: stdenv.mkDerivation rec { pname = "paps"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dov"; repo = pname; - rev = version; - sha256 = "1f0qcawak76zk2xypipb6sy4bd8mixlrjby851x216a7f6z8fd4y"; + rev = "v${version}"; + sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkgconfig intltool ]; buildInputs = [ pango ]; preConfigure = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pango to PostScript converter"; - homepage = https://github.com/dov/paps; + homepage = "https://github.com/dov/paps"; license = licenses.lgpl2; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 27fd51ed447c3..e606b38775e0e 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20191022"; + name = "parallel-20191122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1a89x5ix9kls1abj8zkgxdf3g3s5phzb83xcd4cwpz4szfjfw6v4"; + sha256 = "01wmk3sf34d2lmhl37j4ga7aims2hcnzv1bydg1xs4pablar6ahq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 5bd1e34708291..20b45360f01b3 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wine-staging }: +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: let wine_custom = wine-staging; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "1kyy6knkr42k34rs661r0f5sf6l1s2jdbphdg89n73ynijqmzjhk"; }; - buildInputs = [ wine_custom libX11 libGLU_combined curl ]; + buildInputs = [ wine_custom libX11 libGLU libGL curl ]; propagatedbuildInputs = [ curl cabextract ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 2ff042d8cbbf3..c4868dd618351 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.11"; + version = "1.2019.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0k9l4d3rf5g5vwx6kd170ija872j3fafkn50fkd3ddzjqdd0v9lm"; + sha256 = "1682lcfk63grzhzzxv34jxw3jacznvz1pd5cb266p9akk560a3z0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 71b6dd90530ef..d01a3a877f2b4 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "screenFetch"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "KittyKatt"; repo = "screenFetch"; rev = "v${version}"; - sha256 = "11mqld9pppbappqbaj49mw2v5kysx06sy1xbs81i0hhgh35hlziv"; + sha256 = "04l8aqr474pb115nagn9f6y48jw92n1qfszgw7dbhgl4mpn95lcr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 65031c2a1fe72..335a687dbc286 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glew, glm, libGLU_combined, libX11, libXext, libXrender, icu +, glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu , cppcheck }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glew glm libGLU_combined libX11 libXext libXrender icu ] + buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] ++ stdenv.lib.optional doCheck cppcheck; doCheck = false; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 9327509308619..552327c3303f8 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "0r3ggy28zx94cjgf486s9qm9c8c0514k5a8fki466yghkxyjamj8"; + sha256 = "0a2jx82cwnxr0751qz2zp3chl0ndxf4wmjnar1y7s63syy9i6s52"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "16pdvzvn4na0yksham0kwfkk7jlk4iwrzb4qych3libbswgkaklj"; + cargoSha256 = "110ajwgdshakcqxfnqi30yy0miikp2qx86flwfkd78jawfll2krp"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index f3a482baa480b..7dc2bc618ea68 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "termtosvg"; - version = "0.9.0"; + version = "1.0.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1mf2vlq083mzhja449il78zpvjq6fv36pzakwrqmgxdjbsdyvxbd"; + sha256 = "1d0lmvprraspdqpn0rsqzvkkmpj8zk0crid5l39kxpjpxrv2irfg"; }; propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 9cc083e225f96..86ab249287778 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tmate"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "tmate-io"; repo = "tmate"; rev = version; - sha256 = "183rvga8nvh9r7p8104vwcmzp3vrfdhnx73vh06m2fgdq9i5rz3l"; + sha256 = "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi"; }; dontUseCmakeConfigure = true; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 36127dd57e643..c628ae30e959e 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, libevent, pkgconfig, makeWrapper }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, makeWrapper +, bison +, ncurses +, libevent +}: let @@ -13,20 +21,28 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "2.9a"; + version = "3.0"; outputs = [ "out" "man" ]; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "tmux"; + repo = "tmux"; rev = version; - sha256 = "040plbgxlz14q5p0p3wapr576jbirwripmsjyq3g1nxh76jh1ipg"; + sha256 = "0772hajzgpl4cvb9l2bma9hmnh4jg1phvqr2gg4292w34n5dsl3k"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ + pkgconfig + autoreconfHook + bison + ]; - buildInputs = [ ncurses libevent makeWrapper ]; + buildInputs = [ + ncurses + libevent + makeWrapper + ]; configureFlags = [ "--sysconfdir=/etc" @@ -39,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tmux.github.io/; + homepage = "http://tmux.github.io/"; description = "Terminal multiplexer"; longDescription = diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b794e46b25853..9ffa89f591966 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.3"; + version = "1.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0vxnq5r3h32dvznh4lal29q5ny70rd861r7435gn7sa6v5ajs2f1"; + sha256 = "13qnacqlcih731wfrsalbff1g81inkh6sypvabg5gi7gd7mha49p"; }; postPatch = '' diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 8514b4b9b5941..3adf37c22182f 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "14p7lpdp85ay5p2r9npm2adp9njcssi47mb1fh2iyn8lp51d22bi"; + sha256 = "15w1qi38dsx573nadqpvarxx63xla53w775fwkdds2iyspaljsg6"; }; - cargoSha256 = "07h8d8fm20dp9xcz9vic63xnx2rbvanf2ivks1jiv32iy0kgz74p"; + cargoSha256 = "0xhrgs2rpkgjzgsipq5rb3fmqwvxrl2wi0fly1xaa6p304k1710m"; meta = with stdenv.lib; { description = "Upgrade all the things"; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 9016dfdf712d8..a685dc7cbdee3 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "wakatime"; - version = "13.0.1"; + version = "13.0.2"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "1a188n763hg39s8wa20mb1bj6f3vs8h7knvm4ys7q8bhsib0pyrd"; + sha256 = "0ng7hb83gj6vb569qh58vqp4ana162r20dif086kgc3sch2z63j9"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 2cf111e8ccfc2..6f1660484e789 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }: +{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: stdenv.mkDerivation rec { version = "2.4.1"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.ferm = nixosTests.ferm; + meta = { homepage = http://ferm.foo-projects.org/; description = "Tool to maintain complex firewalls"; diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 37d2eea825f04..06faa06402571 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -1,12 +1,12 @@ {stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: let -version = "2.3"; +version = "2.4"; apk = stdenv.mkDerivation { pname = "gnirehtet.apk"; inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; - sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz"; + sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g"; }; installPhase = '' mkdir $out @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "Genymobile"; repo = "gnirehtet"; rev = "v${version}"; - sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr"; + sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "1500lfwbfnc0k2hn7r1n629fq11zfqm3fg13dddmhchq4i3sqkfb"; + cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283"; patchFlags = [ "-p2" ]; patches = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 4805d01deadd9..4e015254658ee 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.20.4"; + version = "1.20.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0k4i6m8acp48vl6l13267wv6kfkmzfjq2mraaa5m9n82wyvkimx3"; + sha256 = "0fa5my2czxxlr0lcrzm4zcbcfmvzflnzg1n0yrf6wssa07qaklp8"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -61,13 +61,6 @@ in stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch - - # Fixes https://github.com/NixOS/nixpkgs/issues/72330 - # Upstream MR: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/323 - (fetchpatch { - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/4c11364201c094ad19ab9980ea6051a82bd2a550.patch"; - sha256 = "14dgb6ijxyzcglrk67is2fn49iwrhljf2sld8w557i6zkypilmsv"; - }) ]; buildInputs = [ diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 792e6f68294d7..b9278dd7c0d5c 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.55"; + version = "5.56"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh"; + sha256 = "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index b0564ad7c74a6..e079f9a881edd 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.2"; + version = "5.5.3"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0587xvw0ifjrwxgisw0nfx7qykmkly1knfdghrpph9vicpzwsidw"; + sha256 = "099yvqng085f69k815961jnwk50nzmiknvhl1wwmji2hl36r160g"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index f6fff42efdfae..ca10adae0e44e 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "0cz9axphqvpqwy591ws9by7khpdw96iwf9vmhif3i52ghp8hpfd1"; + sha256 = "03ywxamjcnhcr20vm9pn3rq3hqq49i6rfdvx44czzr30h8xp8dhw"; }; modSha256 = "1vqk0jyqc1qcryi247r5pbvfjw3m48l028fb2mrq1xqqfkjqrr85"; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index f5cecaa8e049a..c8413c56854fe 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "1x3ln9sxczkh9rpznw8q5jqfk17kzsjiz125xd15rqj5zqkrwkkd"; + sha256 = "0snhm9r5igik030iqxm3zd9zvhlnsxi20zac71bbc29qflsi2dhk"; }; propagatedBuildInputs = [ vdf ]; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 0f8a6f19127f5..4aadc4b7af028 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "17qvsa2qnm767yv7x0v626np0kiyqpb0al7sjqmccarq2wnw8w90"; + sha256 = "17bslyvjndhqryrisba9y7y0ijyzi3gmyl9rddkcvdqi3lg9668y"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 3cb5c1163e574..6e61f05412259 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, xorg -, glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype +, glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python2Packages, lib , lsof, curl, libuuid, cups, mesa @@ -19,7 +19,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ mesa.drivers - libGLU_combined + libGLU libGL fontconfig freetype libpulseaudio diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index a896a57b08069..7866bece0661e 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inxi"; - version = "3.0.36-1"; + version = "3.0.37-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "04134l323vwd0g2bffj11rnpw2jgs9la6aqrmv8vh7w9mq5nd57y"; + sha256 = "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix new file mode 100644 index 0000000000000..19502e5a352fc --- /dev/null +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl +, jdk +, ant, cunit, ncurses +}: + +stdenv.mkDerivation rec { + pname = "java-service-wrapper"; + version = "3.5.41"; + + src = fetchurl { + url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; + sha256 = "0wvazc4y134brn99aa4rc9jdh1h2q3l7qhhvbcs6lhf4ym47sskm"; + }; + + buildInputs = [ jdk ]; + nativeBuildInputs = [ ant cunit ncurses ]; + + buildPhase = '' + export ANT_HOME=${ant} + export JAVA_HOME=${jdk}/lib/openjdk/jre/ + export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME + export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar + + ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} + ''; + + installPhase = '' + mkdir -p $out/{bin,lib} + cp bin/wrapper $out/bin/wrapper + cp lib/wrapper.jar $out/lib/wrapper.jar + cp lib/libwrapper.so $out/lib/libwrapper.so + ''; + + meta = with stdenv.lib; { + description = "Enables a Java Application to be run as a Windows Service or Unix Daemon"; + homepage = "https://wrapper.tanukisoftware.com/"; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.suhr ]; + }; +} diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 5617ed9dc934f..96f0a754f61b2 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.1910.0"; + version = "8.1911.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "14qczsj12spx0m3dz1pkxnacwi5njr0syamnmi1rg8ri5xlyw682"; + sha256 = "01713vwz3w5fx9b97286h1rx9hxhjsdah96nyhh75bb23impgx71"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index b15c8623fa59f..c98634e119948 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.08"; + version = "0.10.11"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kkmznn0y5wxi7x9nlhzyfy933bv66113in4rf0raw6brymympaa"; + sha256 = "16z45fmvncpa0bv91dpwarqfm9p7aiqkmlcpmv2y23rh6sikhkdq"; }; postPatch = '' diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix new file mode 100644 index 0000000000000..8325c6c08f359 --- /dev/null +++ b/pkgs/tools/text/boxes/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, bison, flex }: + +stdenv.mkDerivation rec { + pname = "boxes"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "ascii-boxes"; + repo = "boxes"; + rev = "v${version}"; + sha256 = "0b12rsynrmkldlwcb62drk33kk0aqwbj10mq5y5x3hjf626gjwsi"; + }; + + # Building instructions: + # https://boxes.thomasjensen.com/build.html#building-on-linux--unix + nativeBuildInputs = [ bison flex ]; + + dontConfigure = true; + + # Makefile references a system wide config file in '/usr/share'. Instead, we + # move it within the store by default. + preBuild = '' + substituteInPlace Makefile \ + --replace "GLOBALCONF = /usr/share/boxes" \ + "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" + ''; + + makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + + installPhase = '' + install -Dm755 -t $out/bin src/boxes + install -Dm644 -t $out/share/boxes boxes-config + install -Dm644 -t $out/share/man/man1 doc/boxes.1 + ''; + + meta = with stdenv.lib; { + description = "Command line ASCII boxes unlimited!"; + longDescription = '' + Boxes is a command line filter program that draws ASCII art boxes around + your input text. + ''; + homepage = https://boxes.thomasjensen.com; + license = licenses.gpl2; + maintainers = with maintainers; [ waiting-for-dev ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 07fcf0eca8b5a..7745a3e7cb563 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "0dqnxzfdic3v10rr8k83zfbv7qc3yanajd81a0amzs778sqp7x9f"; + sha256 = "1w4n7rkcxpdzg7450s22a80a27g845n61k2bdfhq4c1md7604nyz"; }; dontUnpack = true; diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix index ea088b486fc68..1605bcfa43b67 100644 --- a/pkgs/tools/virtualization/ec2-utils/default.nix +++ b/pkgs/tools/virtualization/ec2-utils/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation { meta = { description = "A set of tools for running in EC2"; - homepage = https://aws.amazon.com/amazon-linux-ami/; - license = lib.licenses.apsl20; + homepage = "https://aws.amazon.com/amazon-linux-ami/"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ thefloweringash ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce42f22d8e1c8..95c268d1c3d9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -724,6 +724,8 @@ in brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + boxes = callPackage ../tools/text/boxes { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -3022,9 +3024,7 @@ in endlessh = callPackage ../servers/endlessh { }; - cryfs = callPackage ../tools/filesystems/cryfs { - spdlog = spdlog_0; - }; + cryfs = callPackage ../tools/filesystems/cryfs { }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -4563,8 +4563,6 @@ in next = callPackage ../applications/networking/browsers/next { }; - next-gtk-webkit = callPackage ../applications/networking/browsers/next-gtk-webkit { }; - nfpm = callPackage ../tools/package-management/nfpm { }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -5214,7 +5212,7 @@ in niff = callPackage ../tools/package-management/niff { }; - nifskope = libsForQt59.callPackage ../tools/graphics/nifskope { }; + nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; @@ -6650,7 +6648,7 @@ in thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; - + tiledb = callPackage ../development/libraries/tiledb { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -8111,6 +8109,8 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + spago = haskell.lib.justStaticExecutables haskellPackages.spago; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -8337,6 +8337,8 @@ in jasmin = callPackage ../development/compilers/jasmin { }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; julia_07 = callPackage ../development/compilers/julia/0.7.nix { @@ -9894,7 +9896,7 @@ in funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt59.callPackage ../development/tools/misc/gede { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -10006,6 +10008,8 @@ in nodejs = nodejs-10_x; }; + ccloud-cli = callPackage ../development/tools/ccloud-cli { }; + htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; hyenae = callPackage ../tools/networking/hyenae { }; @@ -13086,16 +13090,6 @@ in # Default libGLU libGLU = mesa_glu; - # Combined derivation, contains both libGL and libGLU - # Please, avoid using this attribute. It was meant as transitional hack - # for packages that assume that libGLU and libGL live in the same prefix. - # libGLU_combined propagates both libGL and libGLU - libGLU_combined = buildEnv { - name = "libGLU-combined"; - paths = [ libGL libGLU ]; - extraOutputsToInstall = [ "dev" ]; - }; - mesa = callPackage ../development/libraries/mesa { llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; @@ -13531,14 +13525,11 @@ in pugixml = callPackage ../development/libraries/pugixml { }; - pybind11 = callPackage ../development/libraries/pybind11 { }; + pybind11 = pythonPackages.pybind11; python-qt = callPackage ../development/libraries/python-qt { python = python27; - qmake = qt59.qmake; - qttools = qt59.qttools; - qtwebengine = qt59.qtwebengine; - qtxmlpatterns = qt59.qtxmlpatterns; + inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; @@ -13589,39 +13580,6 @@ in developerBuild = true; }); - qt59 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.9) { - inherit newScope; - inherit stdenv fetchurl fetchpatch makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzzFull; - inherit libGL; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit gtk3; - inherit (gnome3) dconf; - }); - - libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; - - qt511 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.11) { - inherit newScope; - inherit stdenv fetchurl fetchFromGitHub fetchpatch makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - inherit cups; - harfbuzz = harfbuzzFull; - inherit libGL; - inherit perl; - inherit gtk3; - inherit (gnome3) dconf; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; - }); - - libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); - qt512 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.12) { inherit newScope; @@ -18267,7 +18225,7 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt59.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python27; }; @@ -18293,6 +18251,8 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; + cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; crun = callPackage ../applications/virtualization/crun {}; @@ -19935,6 +19895,8 @@ in canonicaljson; }; + matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; + mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; mcpp = callPackage ../development/compilers/mcpp { }; @@ -19967,9 +19929,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { - gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 - }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -21103,7 +21063,7 @@ in split2flac = callPackage ../applications/audio/split2flac { }; spotify-tui = callPackage ../applications/audio/spotify-tui { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) AppKit Security; }; squishyball = callPackage ../applications/audio/squishyball { @@ -22598,7 +22558,7 @@ in }); construo = construoBase.override { - inherit freeglut libGL libGLU; + inherit libGL libGLU freeglut; }; crack_attack = callPackage ../games/crack-attack { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 20cd2965549f9..7e5aa6598c17d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -235,6 +235,8 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; + eigen = callPackage ../development/ocaml-modules/eigen { }; + elina = callPackage ../development/ocaml-modules/elina { }; eliom = callPackage ../development/ocaml-modules/eliom { }; @@ -374,6 +376,8 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + kafka = callPackage ../development/ocaml-modules/kafka { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; @@ -601,6 +605,10 @@ let owee = callPackage ../development/ocaml-modules/owee { }; + owl-base = callPackage ../development/ocaml-modules/owl-base { }; + + owl = callPackage ../development/ocaml-modules/owl { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c932eaeeaaaa6..e24c3a5f9a4fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10552,6 +10552,22 @@ let }; }; + LWPUserAgentDNSHosts = buildPerlModule { + pname = "LWP-UserAgent-DNS-Hosts"; + version = "0.13"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz; + sha256 = "0piwcsb0m1xpzxbakhr9zq45a9hq3rx7s55lrjg66nd4x5n7xs5y"; + }; + propagatedBuildInputs = [ LWP ScopeGuard ]; + buildInputs = [ ModuleBuildTiny TestFakeHTTPD TestSharedFork TestTCP TestUseAllModules ]; + meta = { + description = "Override LWP HTTP/HTTPS request's host like /etc/hosts"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/masaki/p5-LWP-UserAgent-DNS-Hosts"; + }; + }; + LWPUserAgentDetermined = buildPerlPackage { pname = "LWP-UserAgent-Determined"; version = "1.07"; @@ -13702,8 +13718,8 @@ let sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; - # FIXME: try with libGL + libGLU instead of libGLU_combined - buildInputs = [ pkgs.libGLU_combined pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; + # FIXME: try with libGL + libGLU instead of libGLU libGL + buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -17566,6 +17582,22 @@ let }; }; + TestFakeHTTPD = buildPerlModule { + pname = "Test-Fake-HTTPD"; + version = "0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz; + sha256 = "1jkflkcjzrdvnlxff1xqfhfdcpsmvvjqzayl7hk3whavsxdrf9yh"; + }; + propagatedBuildInputs = [ HTTPDaemon Plack ]; + buildInputs = [ LWP ModuleBuildTiny TestException TestSharedFork TestTCP TestUseAllModules ]; + meta = { + description = "a fake HTTP server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/masaki/Test-Fake-HTTPD"; + }; + }; + TestFatal = buildPerlPackage { pname = "Test-Fatal"; version = "0.014"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 114d2140847c2..129074d6039ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -497,6 +497,8 @@ in { cachy = callPackage ../development/python-modules/cachy { }; + cadquery = callPackage ../development/python-modules/cadquery { }; + catalogue = callPackage ../development/python-modules/catalogue { }; cdecimal = callPackage ../development/python-modules/cdecimal { }; @@ -1101,6 +1103,8 @@ in { pyschedule = callPackage ../development/python-modules/pyschedule { }; + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -1155,12 +1159,16 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + pytmx = callPackage ../development/python-modules/pytmx { }; python-binance = callPackage ../development/python-modules/python-binance { }; @@ -1325,6 +1333,8 @@ in { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; + tesserocr = callPackage ../development/python-modules/tesserocr { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme {}; @@ -5264,6 +5274,8 @@ in { tiros = callPackage ../development/python-modules/tiros { }; + tinydb = callPackage ../development/python-modules/tinydb { }; + tifffile = callPackage ../development/python-modules/tifffile { }; tmdb3 = callPackage ../development/python-modules/tmdb3 { }; |