diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-11-30 21:12:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-30 21:12:27 +0100 |
commit | f99271be7c525e7b05a84432ea5b4da5cf6b7e34 (patch) | |
tree | c578ae1be2ca5a148ccd8b72103b1edbc155d53f /pkgs/top-level | |
parent | ab38b440307f0ba839d348c85eae57b712a44d1c (diff) | |
parent | a69ad18da9aa6a77b18986cc1f97b7bf6df44f08 (diff) | |
download | nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.gz nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.bz2 nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.lz nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.xz nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.zst nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.zip |
Merge pull request #74023 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 60 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 36 |
2 files changed, 40 insertions, 56 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0de7d7dda7f..95c268d1c3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5212,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 {}; @@ -9896,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 { }; @@ -13090,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; @@ -13539,10 +13529,7 @@ in 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 {}; @@ -13593,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; @@ -18271,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; }; @@ -19975,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 { }; @@ -22606,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/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c932eaeeaaa..e24c3a5f9a4 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"; |