From df686d37aad35bb228b89661750adcd9005b9bc2 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 24 Apr 2020 11:18:13 +0000 Subject: [PATCH 001/499] dump: init at 0.4b46 Tested by dumping a small filesystem and extracting files from the dump using restore -i. It worked, but complained: DUMP: WARNING: no file `/nix/store/y7r0q9l7663vii0j0lqlrwyi073z81n8-dump-0.4b46/etc/dumpdates' --- pkgs/tools/backup/dump/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/backup/dump/default.nix diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/tools/backup/dump/default.nix new file mode 100644 index 000000000000..38564e109d1c --- /dev/null +++ b/pkgs/tools/backup/dump/default.nix @@ -0,0 +1,24 @@ +# Tested with simple dump and restore -i, but complains that +# /nix/store/.../etc/dumpdates doesn't exist. + +{ stdenv, fetchurl, pkgconfig, + e2fsprogs, ncurses, readline }: + +stdenv.mkDerivation rec { + pname = "dump"; + version = "0.4b46"; + + src = fetchurl { + url = "mirror://sourceforge/dump/dump-${version}.tar.gz"; + sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"; + }; + + buildInputs = [ e2fsprogs pkgconfig ncurses readline ]; + + meta = with stdenv.lib; { + homepage = "https://dump.sourceforge.io/"; + description = "Linux Ext2 filesystem dump/restore utilities"; + license = licenses.bsd3; + maintainers = with maintainers; [ falsifian ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78f07dc3c166..ec55a25e153e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25284,6 +25284,8 @@ in dumb = callPackage ../misc/dumb { }; + dump = callPackage ../tools/backup/dump { }; + ecdsatool = callPackage ../tools/security/ecdsatool { }; emulationstation = callPackage ../misc/emulators/emulationstation { }; From d6d6d6030d4a2c1c3e01adf0676ad5f8b1bf1241 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 25 May 2020 21:07:23 -0700 Subject: [PATCH 002/499] maintainers: add bsima --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7ee71285138..cc25f9e37c0e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1127,6 +1127,12 @@ githubId = 5525646; name = "Brice Waegeneire"; }; + bsima = { + email = "ben@bsima.me"; + github = "bsima"; + githubId = 200617; + name = "Ben Sima"; + }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; From 5303493efc24660810924ba6040b99a5a5c4782f Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 25 May 2020 21:07:42 -0700 Subject: [PATCH 003/499] shen-sources: init at 22.3 --- .../interpreters/shen-sources/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/interpreters/shen-sources/default.nix diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix new file mode 100644 index 000000000000..42376689f545 --- /dev/null +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + name = "shen-sources-${version}"; + version = "22.3"; + + src = fetchurl { + url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz"; + sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q"; + }; + + buildInputs = []; + buildPhase = ""; + installPhase = '' + mkdir -p $out + cp . $out -R + ''; + + meta = with stdenv.lib; { + homepage = https://shenlanguage.org; + description = "Source code for the Shen Language"; + platforms = platforms.linux; + maintainers = with maintainers; [ bsima ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062e5bc97bc1..13c076812ff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6587,6 +6587,8 @@ in schema2ldif = callPackage ../tools/text/schema2ldif { }; + shen-sources = callPackage ../development/interpreters/shen-sources { }; + shocco = callPackage ../tools/text/shocco { }; shopify-themekit = callPackage ../development/web/shopify-themekit { }; From 12ce76d7a55112754e8fe9d50afcee59bb9955cc Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 25 May 2020 21:26:39 -0700 Subject: [PATCH 004/499] shen-sbcl: init at 3.0.3 --- .../interpreters/shen-sbcl/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/interpreters/shen-sbcl/default.nix diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix new file mode 100644 index 000000000000..55389d9b71db --- /dev/null +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, shen-sources +, sbcl +}: + +stdenv.mkDerivation rec { + name = "shen-sbcl-${version}"; + version = "3.0.3"; + src = fetchurl { + url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz"; + sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz"; + }; + buildInputs = [ + sbcl shen-sources + ]; + buildPhase = '' + ln -s ${shen-sources} kernel + make sbcl + ''; + installPhase = '' + mkdir -p $out + install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl + ''; + meta = with stdenv.lib; { + homepage = https://shenlanguage.org; + description = "Port of Shen running on Steel Bank Common Lisp"; + platforms = platforms.linux; + maintainers = with maintainers; [ bsima ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13c076812ff3..945bb3196c6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6587,6 +6587,8 @@ in schema2ldif = callPackage ../tools/text/schema2ldif { }; + shen-sbcl = callPackage ../development/interpreters/shen-sbcl { }; + shen-sources = callPackage ../development/interpreters/shen-sources { }; shocco = callPackage ../tools/text/shocco { }; From eaa851c41f0802a80317010da51a4d9e3104b644 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 29 May 2020 12:07:53 -0700 Subject: [PATCH 005/499] shen-sbcl: set platforms to same as sbcl See https://github.com/NixOS/nixpkgs/pull/88915#issuecomment-636138041 --- pkgs/development/interpreters/shen-sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 55389d9b71db..6d10669d20d8 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://shenlanguage.org; description = "Port of Shen running on Steel Bank Common Lisp"; - platforms = platforms.linux; + platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; }; From 976d2e5c0d3afd23c0a7c1c7a98253fdf912719f Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 29 May 2020 12:08:29 -0700 Subject: [PATCH 006/499] shen-sources: set platforms to all See https://github.com/NixOS/nixpkgs/pull/88915#issuecomment-636138041 --- pkgs/development/interpreters/shen-sources/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix index 42376689f545..f35631daa282 100644 --- a/pkgs/development/interpreters/shen-sources/default.nix +++ b/pkgs/development/interpreters/shen-sources/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://shenlanguage.org; description = "Source code for the Shen Language"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ bsima ]; license = licenses.bsd3; }; From f0c032a4ae626d9b8d6f9e8fedfe1fe9ba299d03 Mon Sep 17 00:00:00 2001 From: Roman Gonzalez Date: Tue, 2 Jun 2020 11:31:54 -0700 Subject: [PATCH 007/499] gotools: update comments regarding gopls The replaced comment was stating some properties about upstream source code that are no longer the case. The new comment mentions what's the current situation in regards to the gopls binary. --- pkgs/development/tools/gotools/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index a7858474a426..7724f5b34fe0 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -11,12 +11,16 @@ buildGoModule rec { sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; - # Build of golang.org/x/tools/gopls fails with: - # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls - # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. - # In order to fix this, we simply remove the module. - # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. - # See https://github.com/NixOS/nixpkgs/pull/64335. + # The gopls folder has its own module definition which causes a build failure. + # Given that, we can't have the gopls binary be part of the gotools + # derivation. + # + # We have a seperate derivation to build the gopls tool. + # + # Related + # + # * https://github.com/NixOS/nixpkgs/pull/85868 + # * https://github.com/NixOS/nixpkgs/issues/88716 postPatch = '' rm -rf gopls ''; @@ -47,4 +51,4 @@ buildGoModule rec { # Do not copy this without a good reason for enabling # In this case tools is heavily coupled with go itself and embeds paths. allowGoReference = true; -} \ No newline at end of file +} From c45e09039b412fe81ad9828af59431f5dfa20bc9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jun 2020 04:20:00 -0500 Subject: [PATCH 008/499] tab: use python3 --- pkgs/tools/text/tab/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index f7796c8a3291..cd3bfbe85d8a 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, python2 }: +{ stdenv, fetchFromBitbucket, python3 }: stdenv.mkDerivation rec { version = "7.2"; @@ -11,10 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax"; }; - nativeBuildInputs = [ python2 ]; + checkInputs = [ python3 ]; doCheck = true; + preCheck = '' + substituteInPlace Makefile --replace "python2 go2.py" "python go.py" + ''; + checkTarget = "test"; installPhase = '' From c193d3b494b669c7c0c0833f242c42650ecbbcf0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 19 Jun 2020 04:21:00 -0500 Subject: [PATCH 009/499] tab: enable on darwin --- pkgs/tools/text/tab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index cd3bfbe85d8a..8a80c7ad10e9 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { checkInputs = [ python3 ]; - doCheck = true; + doCheck = !stdenv.isDarwin; preCheck = '' substituteInPlace Makefile --replace "python2 go2.py" "python go.py" @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } From 3483bf8b7b484266aee274baea8d1f2458de37dd Mon Sep 17 00:00:00 2001 From: luc65r Date: Tue, 19 May 2020 18:10:52 +0200 Subject: [PATCH 010/499] rbw: init at 0.4.4 --- pkgs/tools/security/rbw/default.nix | 76 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/tools/security/rbw/default.nix diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix new file mode 100644 index 000000000000..11045e53f23b --- /dev/null +++ b/pkgs/tools/security/rbw/default.nix @@ -0,0 +1,76 @@ +{ lib +, rustPlatform +, fetchCrate +, pinentry +, openssl +, pkgconfig +, makeWrapper +, cargo + +# rbw-fzf +, withFzf ? false, fzf, perl + +# rbw-rofi +, withRofi ? false, rofi, xclip + +# pass-import +, withPass ? false, pass +}: + +rustPlatform.buildRustPackage rec { + pname = "rbw"; + version = "0.4.4"; + + src = fetchCrate { + inherit version; + crateName = "${pname}"; + sha256 = "01p37zx2h3gpm363xn96w0wlg7kqayjl3an65h9p6md21d41bvyr"; + }; + + cargoSha256 = "1xiw21snsbqxfw624cdc340asp2kmcp8rymfcjj7w2lwcqhadrh9"; + + nativeBuildInputs = [ + pkgconfig + makeWrapper + ]; + + postPatch = '' + substituteInPlace src/pinentry.rs \ + --replace "Command::new(\"pinentry\")" "Command::new(\"${pinentry}/bin/pinentry\")" + '' + lib.optionalString withFzf '' + patchShebangs bin/rbw-fzf + substituteInPlace bin/rbw-fzf \ + --replace fzf ${fzf}/bin/fzf \ + --replace perl ${perl}/bin/perl + '' + lib.optionalString withRofi '' + patchShebangs bin/rbw-rofi + substituteInPlace bin/rbw-rofi \ + --replace rofi ${rofi}/bin/rofi \ + --replace xclip ${xclip}/bin/xclip + '' + lib.optionalString withRofi '' + patchShebangs bin/pass-import + substituteInPlace bin/pass-import \ + --replace pass ${pass}/bin/pass + ''; + + preConfigure = '' + export OPENSSL_INCLUDE_DIR="${openssl.dev}/include" + export OPENSSL_LIB_DIR="${openssl.out}/lib" + ''; + + postInstall = lib.optionalString withFzf '' + cp bin/rbw-fzf $out/bin + '' + lib.optionalString withRofi '' + cp bin/rbw-rofi $out/bin + '' + lib.optionalString withPass '' + cp bin/pass-import $out/bin + ''; + + meta = with lib; { + description = "Unofficial command line client for Bitwarden"; + homepage = "https://crates.io/crates/rbw"; + license = licenses.mit; + maintainers = with maintainers; [ albakham luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 109c39e804f1..9bda9984a345 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6220,6 +6220,8 @@ in pywal = with python3Packages; toPythonApplication pywal; + rbw = callPackage ../tools/security/rbw { }; + remarshal = callPackage ../development/tools/remarshal { }; rig = callPackage ../tools/misc/rig { From 4bea790b9ce87e0e0019967cc7f06411e83d802b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=A5linder?= Date: Tue, 28 Jul 2020 16:51:05 +0200 Subject: [PATCH 011/499] next: Added more gstreamer plugins Next now supports most video formats --- .../networking/browsers/next/next-gtk-webkit.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix index 8039c5492408..316913be000c 100644 --- a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix +++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -27,8 +27,12 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 webkitgtk - gst_all_1.gst-plugins-base gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; makeFlags = [ From 387333c25ddae8a09ce50f1ef7218291221d115d Mon Sep 17 00:00:00 2001 From: Ehden Sinai Date: Tue, 28 Jul 2020 11:19:18 -0400 Subject: [PATCH 012/499] tmuxPlugins.cpu: unstable-2020-04-05 -> unstable-2020-07-25 bump revision for tmux-cpu (885805 -> 20120a). new revision includes a number of small fixes. motivation for the change is 5feb11, which fixes an issue calculating ram percentage with vm_stat (mostly affects macOS). --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 74bbe1891821..49c59aa4cda4 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -89,12 +89,12 @@ in rec { cpu = mkDerivation { pluginName = "cpu"; - version = "unstable-2020-04-05"; + version = "unstable-2020-07-25"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "8858050756e1fc3c081d37894b441f05ea893a67"; - sha256 = "1bydzrnd9y5y46hjr844p4ylx2dpijn6pv3w94yyvwbyswmirhff"; + rev = "20120a38ade17057441482b43eb5390e6ea2c1c1"; + sha256 = "1gdz2awyd9icvyiw2p40gwymh6ngjhb9mkiv63ix53snp9ii794i"; }; }; From 1371d3df8ad77e2373b73f98d7c127d6cfd3ae43 Mon Sep 17 00:00:00 2001 From: syberant Date: Wed, 29 Jul 2020 01:17:52 +0200 Subject: [PATCH 013/499] dwm: add conf option Allow users to set their own config.def.h configuration file for dwm. --- pkgs/applications/window-managers/dwm/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 8f9c28c78511..7fddeb451fbd 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}: +{stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [], conf ? null}: + +with stdenv.lib; let name = "dwm-6.2"; @@ -18,6 +20,10 @@ stdenv.mkDerivation { # Allow users set their own list of patches inherit patches; + # Allow users to set the config.def.h file containing the configuration + postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; + in optionalString (conf!=null) "cp ${configFile} config.def.h"; + buildPhase = " make "; meta = { From 1275f71c0dc14d4ab46d8d7418eaa2846b163c68 Mon Sep 17 00:00:00 2001 From: syberant Date: Wed, 29 Jul 2020 10:41:04 +0200 Subject: [PATCH 014/499] dwm: refactor Removed buildPhase as it calls make by default --- pkgs/applications/window-managers/dwm/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 7fddeb451fbd..455e3249adf7 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { postPatch = let configFile = if isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; in optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildPhase = " make "; - meta = { homepage = "https://suckless.org/"; description = "Dynamic window manager for X"; From 4733735ebf6e10668c22980a574a539c369c45e8 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Tue, 28 Jul 2020 21:43:04 +0200 Subject: [PATCH 015/499] xbattbar: init at 1.4.9 --- pkgs/applications/misc/xbattbar/default.nix | 46 +++++++++++++++++++ .../misc/xbattbar/sys-by-default.patch | 26 +++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/applications/misc/xbattbar/default.nix create mode 100644 pkgs/applications/misc/xbattbar/sys-by-default.patch diff --git a/pkgs/applications/misc/xbattbar/default.nix b/pkgs/applications/misc/xbattbar/default.nix new file mode 100644 index 000000000000..0864e24f8c9d --- /dev/null +++ b/pkgs/applications/misc/xbattbar/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchgit, libX11, perl, ... }: + +stdenv.mkDerivation rec { + pname = "xbattbar"; + version = "1.4.9"; + + # The current active upstream of xbattbar seems to be the Debian source + # repository. + src = fetchgit { + url = "https://salsa.debian.org/debian/xbattbar.git"; + rev = "upstream/${version}"; + sha256 = "10w7gs0l4hzhdn38yqyr3az7n4ncmfnd6hhhly6lk5dg7k441ck6"; + }; + + buildInputs = [ libX11 ]; + + # The following patches are applied: + # - sys-by-default: remove the APM checker binary, make the sys checker + # script the default. Rationale: checking battery status by /proc/apm is + # extremely oldschool and does not work on NixOS, while the sysfs script + # does. + # - perl shebang patches for acpi/sys scripts + # - unhardcode path to checker scripts + patchPhase = '' + patch -p1 < ${./sys-by-default.patch} + sed -i -e "s,/usr/lib/xbattbar/,$out/libexec/," xbattbar.c + sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-acpi + sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-sys + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/libexec + install -m 0755 xbattbar $out/bin/ + install -m 0755 xbattbar-check-acpi $out/libexec/ + install -m 0755 xbattbar-check-sys $out/libexec/ + ''; + + meta = with stdenv.lib; { + description = "Display battery status in X11"; + homepage = "https://salsa.debian.org/debian/xbattbar"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.q3k ]; + }; +} diff --git a/pkgs/applications/misc/xbattbar/sys-by-default.patch b/pkgs/applications/misc/xbattbar/sys-by-default.patch new file mode 100644 index 000000000000..367f7217eecb --- /dev/null +++ b/pkgs/applications/misc/xbattbar/sys-by-default.patch @@ -0,0 +1,26 @@ +diff --git a/xbattbar.c b/xbattbar.c +index 1e26019..cb3eab5 100644 +--- a/xbattbar.c ++++ b/xbattbar.c +@@ -75,9 +75,8 @@ char *ONOUT_C = "olive drab"; + char *OFFIN_C = "blue"; + char *OFFOUT_C = "red"; + +-char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-apm"; ++char *EXTERNAL_CHECK = "/usr/lib/xbattbar/xbattbar-check-sys"; + char *EXTERNAL_CHECK_ACPI = "/usr/lib/xbattbar/xbattbar-check-acpi"; +-char *EXTERNAL_CHECK_SYS = "/usr/lib/xbattbar/xbattbar-check-sys"; + + int alwaysontop = False; + +@@ -245,10 +244,6 @@ main(int argc, char **argv) + EXTERNAL_CHECK = EXTERNAL_CHECK_ACPI; + break; + +- case 'r': +- EXTERNAL_CHECK = EXTERNAL_CHECK_SYS; +- break; +- + case 's': + EXTERNAL_CHECK = optarg; + break; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fe2683ab62..9d45cbd7ec6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23430,6 +23430,8 @@ in xautomation = callPackage ../tools/X11/xautomation { }; xawtv = callPackage ../applications/video/xawtv { }; + + xbattbar = callPackage ../applications/misc/xbattbar { }; xbindkeys = callPackage ../tools/X11/xbindkeys { }; From 67012aa383eb5fca52ff15519be1b9cb11ac2355 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Thu, 30 Jul 2020 21:57:41 +0200 Subject: [PATCH 016/499] openbgpd: init at 6.7p0 --- pkgs/servers/openbgpd/default.nix | 45 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/servers/openbgpd/default.nix diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/servers/openbgpd/default.nix new file mode 100644 index 000000000000..2e0c787d0b21 --- /dev/null +++ b/pkgs/servers/openbgpd/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, autoconf, automake +, libtool, m4, yacc }: + +let + openbsd_version = "OPENBSD_6_7"; # This has to be equal to ${src}/OPENBSD_BRANCH + openbsd = fetchFromGitHub { + owner = "openbgpd-portable"; + repo = "openbgpd-openbsd"; + rev = openbsd_version; + sha256 = "sha256-YJTHUsn6s4xLcLQuxCLmEkIE8ozxzooj71cJ5Wl+0lI="; + }; +in stdenv.mkDerivation rec { + pname = "opengpd"; + version = "6.7p0"; + + src = fetchFromGitHub { + owner = "openbgpd-portable"; + repo = "openbgpd-portable"; + rev = version; + sha256 = "sha256-10DfK45BsSHeyANB0OJLKog1mEj0mydXSDAT9G6u1gM"; + }; + + nativeBuildInputs = + [ autoconf automake libtool m4 yacc ]; + + preConfigure = '' + mkdir ./openbsd + cp -r ${openbsd}/* ./openbsd/ + chmod -R +w ./openbsd + openbsd_version=$(cat ./OPENBSD_BRANCH) + if [ "$openbsd_version" != "${openbsd_version}" ]; then + echo "OPENBSD VERSION does not match" + exit 1 + fi + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol."; + license = licenses.isc; + homepage = "http://www.openbgpd.org/"; + maintainers = with maintainers; [ kloenk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba0ff0acd51..22dbf97833ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16189,6 +16189,8 @@ in oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + openbgpd = callPackage ../servers/openbgpd { }; + openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; From b6d309c8cf480408b895949e061abb6c790b50e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 08:30:20 +0000 Subject: [PATCH 017/499] rootlesskit: 0.3.0-alpha.2 -> 0.10.0 --- pkgs/tools/virtualization/rootlesskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 224e7b33081a..d57a054a8b72 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "rootlesskit"; - version = "0.3.0-alpha.2"; + version = "0.10.0"; goPackagePath = "github.com/rootless-containers/rootlesskit"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6"; + sha256 = "0jrzqaczd5zxlbvh0hjym8pc1d7y8c66gslq3d3l5vv4z7hz7yfr"; }; meta = with lib; { From 88e7bb10a57afaf9627e99103f37cd2090a14adb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 11:38:47 +0000 Subject: [PATCH 018/499] the-way: 0.4.0 -> 0.6.1 --- pkgs/development/tools/the-way/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index d6e894a7b1b5..5a3bdc7b9859 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0q7yg90yxnpaafg6sg7mqkh86qkn43kxy73p9nqkkgrikdnrjh5a"; + sha256 = "0h33jsai8gvfp0js06qa8cqpzfbjkd001kfj6p24d08ds2i00asx"; }; - cargoSha256 = "1a747bmc6s007ram0w4xf1y2nb3pphvqnlx59098lr3v7gllp7x3"; + cargoSha256 = "1r0mv1q1bz67zbxnd5qmji4svcbln8h5h0gysfddpn4dy9424fp3"; #checkFlags = "--test-threads=1"; doCheck = false; From d99c48fc41a712e6a3dae8e975c2d5eb1c84313b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jul 2020 08:00:00 -0500 Subject: [PATCH 019/499] the-way: fix build on darwin --- pkgs/development/tools/the-way/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 5a3bdc7b9859..a41c7283b0f8 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "the-way"; @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0h33jsai8gvfp0js06qa8cqpzfbjkd001kfj6p24d08ds2i00asx"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + cargoSha256 = "1r0mv1q1bz67zbxnd5qmji4svcbln8h5h0gysfddpn4dy9424fp3"; #checkFlags = "--test-threads=1"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77b25f0ea598..71ee0dc0f7f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3327,7 +3327,9 @@ in teamocil = callPackage ../tools/misc/teamocil { }; - the-way = callPackage ../development/tools/the-way { }; + the-way = callPackage ../development/tools/the-way { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; From 716ffb420c4c93c3fe475b35503a60ff72d7ea3f Mon Sep 17 00:00:00 2001 From: albakham Date: Mon, 27 Jul 2020 16:47:09 +0400 Subject: [PATCH 020/499] sublime-music: 0.11.0 -> 0.11.7 --- pkgs/applications/audio/sublime-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 515a653d6bc9..7e3c1b9164f1 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.0"; + version = "0.11.7"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1rnjc8pjfaq67mq10gy939g77azc80lxf77s9nsaxds4q5j1yrl2"; + sha256 = "1x6b02gw46gp6qcgv67j7k3gr1dpfczbyma6dxanag8pnpqrj8qi"; }; nativeBuildInputs = [ From c33b26ff59ca108c94053e49c1e60cde4c4da026 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Sun, 26 Jul 2020 23:33:06 -0300 Subject: [PATCH 021/499] MIDIVisualizer: init at 5.1 --- .../audio/midi-visualizer/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/audio/midi-visualizer/default.nix diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix new file mode 100644 index 000000000000..c66771be1c9d --- /dev/null +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper, + libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}: + +stdenv.mkDerivation rec { + pname = "MIDIVisualizer"; + version = "5.1"; + + src = fetchFromGitHub { + owner = "kosua20"; + repo = pname; + rev = "v${version}"; + sha256 = "1fjlfa0qjpnjxl3bx5cq3dkswv9wihxmgfpkjijqp7kvf3q127rq"; + }; + + nativeBuildInputs = [ cmake pkg-config makeWrapper]; + + buildInputs = [ + libX11 + glfw + libXrandr + libXinerama + libXcursor + gtk3 + ffmpeg-full + ]; + + installPhase = '' + mkdir -p $out/bin + cp MIDIVisualizer $out/bin + + wrapProgram $out/bin/MIDIVisualizer \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + ''; + + meta = with stdenv.lib; { + description = "A small MIDI visualizer tool, using OpenGL"; + homepage = "https://github.com/kosua20/MIDIVisualizer"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.ericdallo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ba74b4ae62f..8f5da28a0e58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14020,6 +14020,8 @@ in micropython = callPackage ../development/interpreters/micropython { }; + MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { }; + mimalloc = callPackage ../development/libraries/mimalloc { }; minizip = callPackage ../development/libraries/minizip { }; From 6dfdc15ac3765e53947f2773c01cc0160ee3d45c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Aug 2020 01:57:05 +0100 Subject: [PATCH 022/499] gpac: 0.8.0 -> 1.0.0 addressing numerous CVEs --- pkgs/applications/video/gpac/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index e587a5999054..4fcff75f0956 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchFromGitHub, pkgconfig, zlib }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "1.0.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "1w1dyrn6900yi8ngchfzy5hvxr6yc60blvdq8y8mczimmmq8khb5"; + sha256 = "11jrklaahhdfqhci7f3lzv8wchh9bc91rg6w8ibh6varrk692vsb"; }; + postPatch = '' + substituteInPlace Makefile --replace 'dh_link' 'ln -s' + ''; + # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended nativeBuildInputs = [ pkgconfig ]; From 67326dfbe8d2fc00f4e80cb9238a9afbce46ec37 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 16 Aug 2020 13:51:00 +0100 Subject: [PATCH 023/499] flink: 1.9.0 -> 1.11.1 addressing CVE-2020-1960 --- pkgs/applications/networking/cluster/flink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 3d418f9a47fb..f99c708161eb 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -8,8 +8,8 @@ let sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; }; "1.6" = { - flinkVersion = "1.9.0"; - sha256 = "1dzfcmqz5j4b545wq2q3xb2xkbhqllr04s3av1afv54y61l5y952"; + flinkVersion = "1.11.1"; + sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0"; }; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre ]; installPhase = '' - rm bin/*.bat + rm bin/*.bat || true mkdir -p $out/bin $out/opt/flink mv * $out/opt/flink/ From ccee8dc09f791f363c1e4d2053983434aec54bc6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Aug 2020 17:56:49 +0300 Subject: [PATCH 024/499] nixos/mpd: Allow to configure a credentialsFile Allow to specify a password file to be located outside the store, and be read in `ExecStartPre`. --- nixos/modules/services/audio/mpd.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 1d2a982ac536..9e77ee85b893 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -140,6 +140,18 @@ in { ''; }; + credentialsFile = mkOption { + type = types.path; + description = '' + Path to a file to be merged with the settings during the service startup. + Useful to merge a file which is better kept out of the Nix store + because it contains sensible data like MPD's password. Example may look like this: + password "myMpdPassword@read,add,control,admin" + ''; + default = "/dev/null"; + example = "/var/lib/secrets/mpd.conf"; + }; + fluidsynth = mkOption { type = types.bool; default = false; @@ -181,7 +193,12 @@ in { serviceConfig = { User = "${cfg.user}"; - ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon ${mpdConf}"; + ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf"; + ExecStartPre = pkgs.writeScript "mpd-start-pre" '' + #!${pkgs.runtimeShell} + set -euo pipefail + cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf + ''; Type = "notify"; LimitRTPRIO = 50; LimitRTTIME = "infinity"; @@ -195,6 +212,14 @@ in { Restart = "always"; }; }; + environment.etc."mpd.conf" = { + mode = "0640"; + group = cfg.group; + user = cfg.user; + # To be modified by the service' ExecStartPre + text = '' + ''; + }; users.users = optionalAttrs (cfg.user == name) { ${name} = { From afe699eb058bf288e08fbc4155d74cb790ea1a6c Mon Sep 17 00:00:00 2001 From: kraem Date: Sun, 23 Aug 2020 12:08:48 +0200 Subject: [PATCH 025/499] rar2fs: 1.29.0 -> 1.29.1 --- pkgs/tools/filesystems/rar2fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 81cd1191b0bf..816aa1498cc6 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "137hv2fhlbdca6qyf4vjv1sl87g02zn137ja0fdjbzcc9y1n96d3"; + sha256 = "03m20bnlm70xamrxnswxs4fzc2lr2wr6f7jq6b3a8sdwq3pqbzzx"; }; postPatch = '' From 8f729e53bc0961c784c89d53707d8c1b87377ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 21 Aug 2020 21:51:40 +0200 Subject: [PATCH 026/499] xdragon: Init at 1.1.1 The package is renamed from `dragon` to prevent name conflicts with the existing package as recommended in [1]. 1: https://github.com/mwh/dragon/issues/17 --- pkgs/applications/misc/xdragon/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/xdragon/default.nix diff --git a/pkgs/applications/misc/xdragon/default.nix b/pkgs/applications/misc/xdragon/default.nix new file mode 100644 index 000000000000..74f1f755ec8a --- /dev/null +++ b/pkgs/applications/misc/xdragon/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkg-config, gtk3 }: + +stdenv.mkDerivation rec { + pname = "xdragon"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "mwh"; + repo = "dragon"; + rev = "v${version}"; + sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + + installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; + postInstall = '' + ln -s $out/bin/dragon $out/bin/xdragon + ''; + + meta = with stdenv.lib; { + description = "Simple drag-and-drop source/sink for X (called dragon in upstream)"; + homepage = "https://github.com/mwh/dragon"; + license = licenses.gpl3; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9eb70096fbe..ed8054dbe9fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26872,6 +26872,8 @@ in sift = callPackage ../tools/text/sift { }; + xdragon = lowPrio (callPackage ../applications/misc/xdragon { }); + xlockmore = callPackage ../misc/screensavers/xlockmore { }; xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; From f0c65f21edc43dde27a732e39ff9d777d9cf05f4 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Wed, 26 Aug 2020 14:13:16 +0200 Subject: [PATCH 027/499] matomo: 3.13.6 -> 3.14.0 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 152ed4087114..22b1bf200ed8 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.6"; - sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; + version = "3.14.0"; + sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; }; matomo-beta = { - version = "3.13.6"; + version = "3.14.0"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; + sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; }; }; common = pname: { version, sha256, beta ? null }: From 168a85b122b2c425099ceeef89516f18a7845918 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Thu, 27 Aug 2020 00:04:46 +0200 Subject: [PATCH 028/499] nomad: 0.12.2 -> 0.12.3 --- pkgs/applications/networking/cluster/nomad/0.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index ae131702df6e..b39748e9eba0 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "0.12.2"; - sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404"; + version = "0.12.3"; + sha256 = "100ynhc4nm4mmjxx1jhq2kjbqshxvi5x8y482520j8gsyn40g6zc"; } From fbc54ca20f8652796a1b6d92415ea0d2076e8bdc Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 27 Aug 2020 13:00:10 +0200 Subject: [PATCH 029/499] ubootNovena: install u-boot-dtb.img instead of u-boot.bin SPL now looks for u-boot-dtb.img instead of u-boot.bin. --- pkgs/misc/uboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 85df90a9fe11..c4b9377f8f88 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -176,7 +176,7 @@ in { ubootNovena = buildUBoot { defconfig = "novena_defconfig"; extraMeta.platforms = ["armv7l-linux"]; - filesToInstall = ["u-boot.bin" "SPL"]; + filesToInstall = ["u-boot-dtb.img" "SPL"]; }; # Flashing instructions: From 1c4de332c3babf49bb4f7e4eeabb4b86d9b9b0d4 Mon Sep 17 00:00:00 2001 From: Mikolaj Galkowski Date: Fri, 28 Aug 2020 15:19:57 +0200 Subject: [PATCH 030/499] unityhub: fix editor with versions >= 2020.1.3f1 not opening --- pkgs/development/tools/unityhub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 7e62aaf4088d..768f29fdd841 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb - libselinux pciutils libpulseaudio + libselinux pciutils libpulseaudio libxml2 ]); profile = '' From 60c3ade786ab4900481b152ec32f8a48bf7385a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Galkowski Date: Fri, 28 Aug 2020 15:48:40 +0200 Subject: [PATCH 031/499] unityhub: update to 2.3.2 --- pkgs/development/tools/unityhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 7e62aaf4088d..0c4cf545e99d 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let - version = "2.3.1"; + version = "2.3.2"; in appimageTools.wrapType2 rec { name = "unityhub"; @@ -23,7 +23,7 @@ in appimageTools.wrapType2 rec { src = fetchurl { # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; - sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny"; + sha256 = "07nfyfp9apshqarc6pgshsczila6x4943hiyyizc55kp85aw0imn"; }; meta = with stdenv.lib; { From b38cfd104d4239dd835c79f23e8df1b995665495 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 29 Aug 2020 11:59:03 +0200 Subject: [PATCH 032/499] elmPackages.elm-optimize-level-2: Init at 0.1.3 --- pkgs/development/compilers/elm/default.nix | 2 + .../compilers/elm/packages/node-packages.json | 3 +- .../compilers/elm/packages/node-packages.nix | 1026 ++++++++++++----- 3 files changed, 726 insertions(+), 305 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 6c534bb83629..53ccb57abe6b 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -124,6 +124,8 @@ let elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; + elm-optimize-level-2 = nodePkgs."elm-optimize-level-2"; + inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; }; diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 29d00ef23ecc..a440533b2414 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -8,5 +8,6 @@ "elm-upgrade", "elm-verify-examples", "elm-xref", - "create-elm-app" + "create-elm-app", + "elm-optimize-level-2" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index ba17a1f06232..7a296af4669d 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.10.5" = { + "@babel/compat-data-7.11.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.5.tgz"; - sha512 = "mPVoWNzIpYJHbWje0if7Ck36bpbtTvIxOi9+6WSK9wjGEXearAqlwBoTQvVjsAY2VIwgcs8V940geY3okzRCEw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; "@babel/core-7.9.6" = { @@ -49,13 +49,13 @@ let sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; }; }; - "@babel/generator-7.10.5" = { + "@babel/generator-7.11.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.10.5"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz"; - sha512 = "3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; + sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -103,13 +103,13 @@ let sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.10.4" = { + "@babel/helper-explode-assignable-expression-7.11.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; - sha512 = "4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -139,13 +139,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.5" = { + "@babel/helper-member-expression-to-functions-7.11.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz"; - sha512 = "HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; }; }; "@babel/helper-module-imports-7.10.4" = { @@ -157,13 +157,13 @@ let sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; }; }; - "@babel/helper-module-transforms-7.10.5" = { + "@babel/helper-module-transforms-7.11.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz"; - sha512 = "4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -193,13 +193,13 @@ let sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; - "@babel/helper-remap-async-to-generator-7.10.4" = { + "@babel/helper-remap-async-to-generator-7.11.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz"; - sha512 = "86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; }; }; "@babel/helper-replace-supers-7.10.4" = { @@ -220,13 +220,22 @@ let sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; }; }; - "@babel/helper-split-export-declaration-7.10.4" = { + "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; + packageName = "@babel/helper-skip-transparent-expression-wrappers"; + version = "7.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + }; + }; + "@babel/helper-split-export-declaration-7.11.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha512 = "pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg=="; }; }; "@babel/helper-validator-identifier-7.10.4" = { @@ -265,13 +274,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.10.5" = { + "@babel/parser-7.11.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.5"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz"; - sha512 = "wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; + sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.10.5" = { @@ -319,13 +328,13 @@ let sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.4" = { + "@babel/plugin-proposal-object-rest-spread-7.11.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz"; - sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { @@ -337,13 +346,13 @@ let sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.4" = { + "@babel/plugin-proposal-optional-chaining-7.11.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz"; - sha512 = "ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { @@ -463,13 +472,13 @@ let sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; }; }; - "@babel/plugin-transform-block-scoping-7.10.5" = { + "@babel/plugin-transform-block-scoping-7.11.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.10.5"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz"; - sha512 = "6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; }; }; "@babel/plugin-transform-classes-7.10.4" = { @@ -679,13 +688,13 @@ let sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; }; }; - "@babel/plugin-transform-spread-7.10.4" = { + "@babel/plugin-transform-spread-7.11.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.10.4"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz"; - sha512 = "1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; }; }; "@babel/plugin-transform-sticky-regex-7.10.4" = { @@ -733,13 +742,13 @@ let sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; }; }; - "@babel/preset-modules-0.1.3" = { + "@babel/preset-modules-0.1.4" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; "@babel/runtime-7.9.6" = { @@ -760,22 +769,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.10.5" = { + "@babel/traverse-7.11.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz"; - sha512 = "yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz"; + sha512 = "ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg=="; }; }; - "@babel/types-7.10.5" = { + "@babel/types-7.11.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.10.5"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz"; - sha512 = "ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz"; + sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; }; }; "@hapi/address-2.1.4" = { @@ -823,6 +832,24 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; + "@jest/types-25.5.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "25.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; + sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; + }; + }; + "@jest/types-26.3.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz"; + sha512 = "BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -967,6 +994,51 @@ let sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; }; }; + "@types/istanbul-lib-coverage-2.0.3" = { + name = "_at_types_slash_istanbul-lib-coverage"; + packageName = "@types/istanbul-lib-coverage"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; + }; + }; + "@types/istanbul-lib-report-3.0.0" = { + name = "_at_types_slash_istanbul-lib-report"; + packageName = "@types/istanbul-lib-report"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; + }; + }; + "@types/istanbul-reports-1.1.2" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; + }; + }; + "@types/istanbul-reports-3.0.0" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; + sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; + }; + }; + "@types/jest-26.0.10" = { + name = "_at_types_slash_jest"; + packageName = "@types/jest"; + version = "26.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.10.tgz"; + sha512 = "i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q=="; + }; + }; "@types/json-schema-7.0.5" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -994,13 +1066,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-14.0.23" = { + "@types/node-14.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.23"; + version = "14.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz"; - sha512 = "Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.6.2.tgz"; + sha512 = "onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A=="; }; }; "@types/q-1.5.4" = { @@ -1057,13 +1129,31 @@ let sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; }; }; - "@types/webpack-sources-1.4.0" = { + "@types/webpack-sources-1.4.2" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz"; - sha512 = "c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz"; + sha512 = "77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw=="; + }; + }; + "@types/yargs-15.0.5" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "15.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz"; + sha512 = "Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w=="; + }; + }; + "@types/yargs-parser-15.0.0" = { + name = "_at_types_slash_yargs-parser"; + packageName = "@types/yargs-parser"; + version = "15.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -1282,13 +1372,13 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "ajv-6.12.3" = { + "ajv-6.12.4" = { name = "ajv"; packageName = "ajv"; - version = "6.12.3"; + version = "6.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; - sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; + sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; }; }; "ajv-errors-1.0.1" = { @@ -1300,13 +1390,13 @@ let sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; - "ajv-keywords-3.5.1" = { + "ajv-keywords-3.5.2" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz"; - sha512 = "KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA=="; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; }; "alphanum-sort-1.0.2" = { @@ -1570,13 +1660,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "asn1.js-4.10.1" = { + "asn1.js-5.4.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.10.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; }; "assert-1.5.0" = { @@ -1705,13 +1795,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.0" = { + "aws4-1.10.1" = { name = "aws4"; packageName = "aws4"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; - sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; + sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; }; }; "babel-extract-comments-1.0.0" = { @@ -1912,13 +2002,13 @@ let sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; }; }; - "bn.js-5.1.2" = { + "bn.js-5.1.3" = { name = "bn.js"; packageName = "bn.js"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz"; - sha512 = "40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz"; + sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; }; }; "body-parser-1.18.2" = { @@ -2029,13 +2119,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "browserify-sign-4.2.0" = { + "browserify-sign-4.2.1" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz"; - sha512 = "hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; }; }; "browserify-zlib-0.2.0" = { @@ -2065,13 +2155,22 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.13.0" = { + "browserslist-4.14.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; - sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; + sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; + }; + }; + "bs-logger-0.2.6" = { + name = "bs-logger"; + packageName = "bs-logger"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"; + sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog=="; }; }; "buffer-4.9.2" = { @@ -2272,13 +2371,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001102" = { + "caniuse-lite-1.0.30001119" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001102"; + version = "1.0.30001119"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001102.tgz"; - sha512 = "fOjqRmHjRXv1H1YD6QVLb96iKqnu17TjcLSaX64TwhGYed0P1E1CCWZ9OujbbK4Z/7zax7zAzvQidzdtjx8RcA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001119.tgz"; + sha512 = "Hpwa4obv7EGP+TjkCh/wVvbtNJewxmtg4yVJBLFnxo35vbPapBr138bUWENkb5j5L9JZJ9RXLn4OrXRG/cecPQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2353,6 +2452,15 @@ let sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; "chardet-0.7.0" = { name = "chardet"; packageName = "chardet"; @@ -2407,13 +2515,13 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.4.1" = { + "chokidar-3.4.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz"; - sha512 = "TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; + sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; }; }; "chownr-1.1.4" = { @@ -2434,6 +2542,15 @@ let sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -2677,6 +2794,15 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; + "commander-6.1.0" = { + name = "commander"; + packageName = "commander"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; + sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + }; + }; "common-tags-1.8.0" = { name = "common-tags"; packageName = "common-tags"; @@ -2920,13 +3046,13 @@ let sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; - "create-ecdh-4.0.3" = { + "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; "create-hash-1.2.0" = { @@ -3442,6 +3568,15 @@ let sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; + "diff-sequences-25.2.6" = { + name = "diff-sequences"; + packageName = "diff-sequences"; + version = "25.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; + }; + }; "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; @@ -3595,13 +3730,13 @@ let sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; }; }; - "duplexer-0.1.1" = { + "duplexer-0.1.2" = { name = "duplexer"; packageName = "duplexer"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; "duplexer3-0.1.4" = { @@ -3640,13 +3775,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.500" = { + "electron-to-chromium-1.3.555" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.500"; + version = "1.3.555"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.500.tgz"; - sha512 = "Zz8BZh4Ssb/rZBaicqpi+GOQ0uu3y+24+MxBLCk0UYt8EGoZRP4cYzYHHwXGZfrSbCU4VDjbWN+Tg+TPgOUX6Q=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz"; + sha512 = "/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg=="; }; }; "elliptic-6.5.3" = { @@ -3704,6 +3839,15 @@ let sha512 = "qPDP/o/Fkifriaxaf3E7hHFB5L6Ijihyg8is4A6xna6/h/zebUiNssbQrxywI2oxNUkr6W/leEu/WlIC1tmVnw=="; }; }; + "elm-hot-1.1.5" = { + name = "elm-hot"; + packageName = "elm-hot"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.5.tgz"; + sha512 = "HSMlAr6INTV82wkpPNG0zsHoJXo/04GwG7bnhFX8s4zyIbbzuJAovsdo27FAT6/NKx5IVTXGI+IFcK9Z7oN1Tw=="; + }; + }; "elm-hot-webpack-loader-1.1.6" = { name = "elm-hot-webpack-loader"; packageName = "elm-hot-webpack-loader"; @@ -3992,22 +4136,22 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.4" = { + "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.4"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; - sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; - "events-3.1.0" = { + "events-3.2.0" = { name = "events"; packageName = "events"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; - sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="; + url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz"; + sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="; }; }; "eventsource-0.1.6" = { @@ -4370,6 +4514,15 @@ let sha512 = "nM5UCbccD1G8CGK2GsM7ykG3ksOAl9E+34jiDfl07CAl2OPnLpBVWY2hlxEmIkSBfdJjSopEowWHrO0cI8RhxQ=="; }; }; + "find-elm-dependencies-2.0.4" = { + name = "find-elm-dependencies"; + packageName = "find-elm-dependencies"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.4.tgz"; + sha512 = "x/4w4fVmlD2X4PD9oQ+yh9EyaQef6OtEULdMGBTuWx0Nkppvo2Z/bAiQioW2n+GdRYKypME2b9OmYTw5tw5qDg=="; + }; + }; "find-parent-dir-0.3.0" = { name = "find-parent-dir"; packageName = "find-parent-dir"; @@ -4424,6 +4577,15 @@ let sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; }; }; + "firstline-1.3.1" = { + name = "firstline"; + packageName = "firstline"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/firstline/-/firstline-1.3.1.tgz"; + sha512 = "ycwgqtoxujz1dm0kjkBFOPQMESxB9uKc/PlD951dQDIG+tBXRpYZC2UmJb0gDxopQ1ZX6oyRQN3goRczYu7Deg=="; + }; + }; "firstline-2.0.2" = { name = "firstline"; packageName = "firstline"; @@ -4442,13 +4604,13 @@ let sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; - "follow-redirects-1.12.1" = { + "follow-redirects-1.13.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; - sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; }; }; "for-in-1.0.2" = { @@ -4685,13 +4847,13 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { + "get-stream-5.2.0" = { name = "get-stream"; packageName = "get-stream"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; "get-value-2.0.6" = { @@ -4874,13 +5036,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; "has-1.0.3" = { @@ -5594,6 +5756,15 @@ let sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; }; }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; "is-color-stop-1.1.0" = { name = "is-color-stop"; packageName = "is-color-stop"; @@ -5657,13 +5828,13 @@ let sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; }; }; - "is-docker-2.0.0" = { + "is-docker-2.1.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; - sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; }; }; "is-extendable-0.1.1" = { @@ -5819,13 +5990,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-regex-1.1.0" = { + "is-regex-1.1.1" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; - sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; + sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; }; }; "is-regexp-1.0.0" = { @@ -5990,6 +6161,33 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; + "jest-diff-25.5.0" = { + name = "jest-diff"; + packageName = "jest-diff"; + version = "25.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz"; + sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; + }; + }; + "jest-get-type-25.2.6" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "25.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; + }; + }; + "jest-util-26.3.0" = { + name = "jest-util"; + packageName = "jest-util"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz"; + sha512 = "4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw=="; + }; + }; "js-tokens-4.0.0" = { name = "js-tokens"; packageName = "js-tokens"; @@ -6359,13 +6557,13 @@ let sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; - "lodash-4.17.19" = { + "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; - version = "4.17.19"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; - sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; "lodash._reinterpolate-3.0.0" = { @@ -6413,13 +6611,13 @@ let sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "loglevel-1.6.8" = { + "loglevel-1.7.0" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.8"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; - sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"; + sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; }; }; "loose-envify-1.4.0" = { @@ -6494,6 +6692,15 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; + "make-error-1.3.6" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -6512,13 +6719,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "md5-2.2.1" = { + "md5-2.3.0" = { name = "md5"; packageName = "md5"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"; - sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + url = "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; }; "md5.js-1.3.5" = { @@ -6845,6 +7052,15 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; "moment-2.27.0" = { name = "moment"; packageName = "moment"; @@ -7016,6 +7232,15 @@ let sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; }; }; + "node-elm-compiler-5.0.5" = { + name = "node-elm-compiler"; + packageName = "node-elm-compiler"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.5.tgz"; + sha512 = "vapB+VkmKMY1NRy7jjpGjzwWbKmtiRfzbgVoV/eROz5Kx30QvY0Nd5Ua7iST+9utrn1aG8cVToXC6UWdEO5BKQ=="; + }; + }; "node-forge-0.9.0" = { name = "node-forge"; packageName = "node-forge"; @@ -7034,13 +7259,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.59" = { + "node-releases-1.1.60" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.59"; + version = "1.1.60"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz"; - sha512 = "H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz"; + sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; "node-watch-0.5.5" = { @@ -7322,13 +7547,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "onetime-5.1.0" = { + "onetime-5.1.2" = { name = "onetime"; packageName = "onetime"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; "open-6.4.0" = { @@ -7340,13 +7565,13 @@ let sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; }; }; - "open-7.0.4" = { + "open-7.2.1" = { name = "open"; packageName = "open"; - version = "7.0.4"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.0.4.tgz"; - sha512 = "brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ=="; + url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz"; + sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; }; }; "opn-5.4.0" = { @@ -7601,13 +7826,13 @@ let sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; }; }; - "parse-asn1-5.1.5" = { + "parse-asn1-5.1.6" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; }; }; "parse-json-2.2.0" = { @@ -7925,13 +8150,13 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "portfinder-1.0.26" = { + "portfinder-1.0.28" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.26"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; - sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz"; + sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; }; }; "posix-character-classes-0.1.1" = { @@ -7961,13 +8186,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-calc-7.0.2" = { + "postcss-calc-7.0.3" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz"; + sha512 = "IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA=="; }; }; "postcss-colormin-4.0.3" = { @@ -8114,13 +8339,13 @@ let sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; - "postcss-modules-local-by-default-3.0.2" = { + "postcss-modules-local-by-default-3.0.3" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha512 = "jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ=="; + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; }; }; "postcss-modules-scope-2.2.0" = { @@ -8339,6 +8564,15 @@ let sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; }; }; + "pretty-format-25.5.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "25.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"; + sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -8555,13 +8789,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "querystringify-2.1.1" = { + "querystringify-2.2.0" = { name = "querystringify"; packageName = "querystringify"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; }; "randombytes-2.1.0" = { @@ -8645,6 +8879,15 @@ let sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="; }; }; + "react-is-16.13.1" = { + name = "react-is"; + packageName = "react-is"; + version = "16.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; + }; + }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -8744,6 +8987,15 @@ let sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; + "reflect-metadata-0.1.13" = { + name = "reflect-metadata"; + packageName = "reflect-metadata"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"; + sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; + }; + }; "regenerate-1.4.1" = { name = "regenerate"; packageName = "regenerate"; @@ -8771,13 +9023,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.5" = { + "regenerator-runtime-0.13.7" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.5"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; }; }; "regenerator-runtime-0.9.6" = { @@ -8924,22 +9176,22 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "request-promise-4.2.5" = { + "request-promise-4.2.6" = { name = "request-promise"; packageName = "request-promise"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz"; - sha512 = "ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg=="; + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz"; + sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ=="; }; }; - "request-promise-core-1.1.3" = { + "request-promise-core-1.1.4" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; }; }; "require-directory-2.1.1" = { @@ -9158,13 +9410,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "rxjs-6.6.0" = { + "rxjs-6.6.2" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.0"; + version = "6.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz"; - sha512 = "3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz"; + sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg=="; }; }; "safe-buffer-5.1.1" = { @@ -9365,13 +9617,13 @@ let sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; }; }; - "serialize-javascript-3.1.0" = { + "serialize-javascript-4.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz"; - sha512 = "JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; }; }; "serve-index-1.9.1" = { @@ -10112,6 +10364,15 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; "svgo-1.3.2" = { name = "svgo"; packageName = "svgo"; @@ -10175,13 +10436,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-webpack-plugin-1.4.4" = { + "terser-webpack-plugin-1.4.5" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz"; - sha512 = "U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; "text-table-0.2.0" = { @@ -10400,6 +10661,24 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; + "ts-jest-26.3.0" = { + name = "ts-jest"; + packageName = "ts-jest"; + version = "26.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-jest/-/ts-jest-26.3.0.tgz"; + sha512 = "Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q=="; + }; + }; + "ts-union-2.2.1" = { + name = "ts-union"; + packageName = "ts-union"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-union/-/ts-union-2.2.1.tgz"; + sha512 = "GLHuuu+N+n3mHY8/XzHUbuXf64Xy2nzYUa1/8rNCtkP6pD3mTiSM5OIyxV81ecT33S3i7lbVWdvCtyFmS8rplw=="; + }; + }; "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; @@ -10409,6 +10688,15 @@ let sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; + "tsyringe-4.3.0" = { + name = "tsyringe"; + packageName = "tsyringe"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.3.0.tgz"; + sha512 = "Vzty1M/EQXSsEE8aoIOLl1l793chcPyQAnFJaS1mFDtFvNPY+jknSPwMIF6yfcjua+2GTgwxWFzuA3cjIx4NZA=="; + }; + }; "tty-browserify-0.0.0" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -10463,6 +10751,15 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "typescript-3.9.7" = { + name = "typescript"; + packageName = "typescript"; + version = "3.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; + sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; + }; + }; "uglify-es-3.3.10" = { name = "uglify-es"; packageName = "uglify-es"; @@ -10886,13 +11183,13 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "watchpack-1.7.2" = { + "watchpack-1.7.4" = { name = "watchpack"; packageName = "watchpack"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz"; - sha512 = "ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"; + sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; }; }; "watchpack-chokidar2-2.0.0" = { @@ -11439,14 +11736,14 @@ in }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -11511,7 +11808,7 @@ in sources."getpass-0.1.7" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -11528,7 +11825,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -11626,7 +11923,7 @@ in dependencies = [ sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -11635,7 +11932,7 @@ in sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -11717,7 +12014,7 @@ in sources."glob-parent-5.1.1" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -11738,7 +12035,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."lru-cache-4.1.5" // { dependencies = [ sources."yallist-2.1.2" @@ -11782,8 +12079,8 @@ in sources."qs-6.5.2" sources."readdirp-3.1.3" sources."request-2.88.2" - sources."request-promise-4.2.5" - sources."request-promise-core-1.1.3" + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.6.3" @@ -11887,12 +12184,12 @@ in sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) sources."chalk-3.0.0" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -11940,7 +12237,7 @@ in sources."ini-1.3.5" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-docker-2.0.0" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -11965,7 +12262,7 @@ in sources."normalize-url-4.5.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.0.4" + sources."open-7.2.1" sources."p-cancelable-1.1.0" sources."package-json-6.5.0" sources."parseurl-1.3.3" @@ -12005,7 +12302,7 @@ in sources."shebang-regex-3.0.0" sources."statuses-1.5.0" sources."strip-json-comments-2.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" sources."tmp-0.1.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" @@ -12032,17 +12329,17 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.9.1.tgz"; - sha512 = "3wqe5OfqVWn0o92vDRuYwK7T6fohG0uSrNRr5EhJYrOUwlZFaSBx50RR79v12j7sNepDrACrsULSENcuyxNzIQ=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.11.0.tgz"; + sha512 = "GYphbimDGTl9icqLf6ObivJIHnIn/5B7Vc4FsAJD7CwwfjRU0LQZ3uSLNOYMVol8NgxbULXBvJOgojMu3QHJ5Q=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."asn1-0.2.4" @@ -12050,7 +12347,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -12106,13 +12403,13 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs-extra-2.0.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-parent-5.1.1" sources."globby-11.0.1" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."human-signals-1.1.1" @@ -12135,7 +12432,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" @@ -12154,7 +12451,7 @@ in sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."onetime-5.1.0" + sources."onetime-5.1.2" sources."opn-6.0.0" sources."options-0.0.6" sources."os-homedir-1.0.2" @@ -12175,6 +12472,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-2.0.6" + sources."reflect-metadata-0.1.13" sources."regenerator-runtime-0.9.6" (sources."request-2.88.2" // { dependencies = [ @@ -12207,6 +12505,8 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."traverse-chain-0.1.0" + sources."tslib-1.13.0" + sources."tsyringe-4.3.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -12287,7 +12587,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."fresh-0.5.2" sources."fsevents-2.1.3" sources."get-stream-4.1.0" @@ -12308,7 +12608,7 @@ in sources."is-wsl-1.1.0" sources."isexe-2.0.0" sources."lru-cache-4.1.5" - sources."md5-2.2.1" + sources."md5-2.3.0" sources."mime-2.4.3" sources."ms-2.0.0" sources."nice-try-1.0.5" @@ -12372,14 +12672,14 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" 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.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12427,7 +12727,7 @@ in sources."glob-parent-5.1.1" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -12477,8 +12777,12 @@ in sources."qs-6.5.2" sources."readdirp-3.2.0" sources."request-2.88.2" - sources."request-promise-4.2.5" - sources."request-promise-core-1.1.3" + sources."request-promise-4.2.6" + (sources."request-promise-core-1.1.4" // { + dependencies = [ + sources."lodash-4.17.20" + ]; + }) sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -12531,7 +12835,7 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.23" + sources."@types/node-14.6.2" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -12548,7 +12852,7 @@ in sources."end-of-stream-1.4.4" sources."fs-extra-8.1.0" sources."get-proxy-2.1.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."got-10.7.0" sources."graceful-fs-4.2.4" sources."has-symbol-support-x-1.4.2" @@ -12605,7 +12909,7 @@ in sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -12613,7 +12917,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12679,7 +12983,7 @@ in sources."glob-parent-5.1.1" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-flag-3.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -12733,8 +13037,12 @@ in sources."qs-6.5.2" sources."readdirp-3.1.3" sources."request-2.88.2" - sources."request-promise-4.2.5" - sources."request-promise-core-1.1.3" + sources."request-promise-4.2.6" + (sources."request-promise-core-1.1.4" // { + dependencies = [ + sources."lodash-4.17.20" + ]; + }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.7.1" @@ -12842,46 +13150,47 @@ in dependencies = [ sources."@babel/cli-7.8.4" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.10.5" + sources."@babel/compat-data-7.11.0" (sources."@babel/core-7.9.6" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" ]; }) - sources."@babel/generator-7.10.5" + sources."@babel/generator-7.11.4" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" sources."@babel/helper-create-regexp-features-plugin-7.10.4" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.10.5" + sources."@babel/helper-member-expression-to-functions-7.11.0" sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.10.5" + sources."@babel/helper-module-transforms-7.11.0" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-split-export-declaration-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.10.5" + sources."@babel/parser-7.11.4" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-dynamic-import-7.10.4" sources."@babel/plugin-proposal-json-strings-7.10.4" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -12895,7 +13204,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.10.4" sources."@babel/plugin-transform-async-to-generator-7.10.4" sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.10.5" + sources."@babel/plugin-transform-block-scoping-7.11.1" sources."@babel/plugin-transform-classes-7.10.4" sources."@babel/plugin-transform-computed-properties-7.10.4" sources."@babel/plugin-transform-destructuring-7.10.4" @@ -12919,22 +13228,22 @@ in sources."@babel/plugin-transform-reserved-words-7.10.4" sources."@babel/plugin-transform-runtime-7.9.6" sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" sources."@babel/plugin-transform-sticky-regex-7.10.4" sources."@babel/plugin-transform-template-literals-7.10.5" sources."@babel/plugin-transform-typeof-symbol-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" sources."@babel/preset-env-7.9.6" - sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.9.6" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.10.5" // { + (sources."@babel/traverse-7.11.0" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.10.5" + sources."@babel/types-7.11.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -12949,7 +13258,7 @@ in sources."@types/http-proxy-1.17.4" sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.23" + sources."@types/node-14.6.2" sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -12963,7 +13272,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-1.4.0" // { + (sources."@types/webpack-sources-1.4.2" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -12991,9 +13300,9 @@ in sources."accepts-1.3.7" sources."acorn-6.4.1" sources."address-1.0.3" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.1" + sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" sources."ansi-colors-3.2.4" sources."ansi-escapes-3.2.0" @@ -13019,7 +13328,7 @@ in sources."array-unique-0.3.2" sources."asap-2.0.6" sources."asn1-0.2.4" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -13048,7 +13357,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-extract-comments-1.0.0" sources."babel-loader-8.1.0" sources."babel-plugin-dynamic-import-node-2.3.3" @@ -13075,7 +13384,7 @@ in sources."bindings-1.5.0" sources."binwrap-0.2.2" sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -13104,14 +13413,14 @@ in sources."bn.js-4.11.9" ]; }) - (sources."browserify-sign-4.2.0" // { + (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -13128,7 +13437,7 @@ in sources."camel-case-4.1.1" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001102" + sources."caniuse-lite-1.0.30001119" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" @@ -13212,7 +13521,7 @@ in }) sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.3" // { + (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -13325,11 +13634,11 @@ in sources."dot-case-3.0.3" sources."dot-prop-5.2.0" sources."dotenv-8.2.0" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.500" + sources."electron-to-chromium-1.3.555" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -13337,7 +13646,7 @@ in }) sources."elm-0.19.1-3" sources."elm-asset-webpack-loader-1.1.2" - sources."elm-hot-1.1.4" + sources."elm-hot-1.1.5" sources."elm-hot-webpack-loader-1.1.6" (sources."elm-test-0.19.1-revision2" // { dependencies = [ @@ -13389,8 +13698,8 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.4" - sources."events-3.1.0" + sources."eventemitter3-4.0.7" + sources."events-3.2.0" sources."eventsource-0.1.6" sources."evp_bytestokey-1.0.3" (sources."execa-1.0.0" // { @@ -13475,7 +13784,7 @@ in sources."find-up-3.0.0" sources."firstline-2.0.2" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -13524,7 +13833,7 @@ in }) sources."handle-thing-2.0.1" sources."har-schema-2.0.0" - sources."har-validator-5.1.3" + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -13642,7 +13951,7 @@ in sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.0" + sources."is-regex-1.1.1" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" @@ -13690,13 +13999,13 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.memoize-4.1.2" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" sources."loose-envify-1.4.0" sources."lower-case-2.0.1" sources."lru-cache-5.1.1" @@ -13764,7 +14073,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.59" + sources."node-releases-1.1.60" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -13821,7 +14130,7 @@ in sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."param-case-3.0.3" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."parse-json-4.0.0" sources."parse-passwd-1.0.0" sources."parseurl-1.3.3" @@ -13857,10 +14166,11 @@ in ]; }) sources."pkginfo-0.4.1" - (sources."portfinder-1.0.26" // { + (sources."portfinder-1.0.28" // { dependencies = [ sources."async-2.6.3" sources."debug-3.2.6" + sources."mkdirp-0.5.5" sources."ms-2.1.2" ]; }) @@ -13870,7 +14180,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."postcss-calc-7.0.2" // { + (sources."postcss-calc-7.0.3" // { dependencies = [ sources."postcss-7.0.32" sources."postcss-value-parser-4.1.0" @@ -13987,7 +14297,7 @@ in sources."supports-color-6.1.0" ]; }) - (sources."postcss-modules-local-by-default-3.0.2" // { + (sources."postcss-modules-local-by-default-3.0.3" // { dependencies = [ sources."postcss-7.0.32" sources."postcss-value-parser-4.1.0" @@ -14147,7 +14457,7 @@ in sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."querystringify-2.1.1" + sources."querystringify-2.2.0" sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" @@ -14199,7 +14509,7 @@ in sources."recursive-readdir-2.2.2" sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.5" + sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.0" @@ -14220,8 +14530,8 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" - sources."request-promise-4.2.5" - sources."request-promise-core-1.1.3" + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" @@ -14240,7 +14550,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.6.0" + sources."rxjs-6.6.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -14438,10 +14748,10 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" - sources."serialize-javascript-3.1.0" + sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" ]; }) @@ -14556,12 +14866,12 @@ in sources."vendors-1.0.4" sources."verror-1.10.0" sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.2" // { + (sources."watchpack-1.7.4" // { dependencies = [ sources."anymatch-3.1.1" sources."binary-extensions-2.1.0" sources."braces-3.0.2" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."fill-range-7.0.1" sources."fsevents-2.1.3" sources."glob-parent-5.1.1" @@ -14690,4 +15000,112 @@ in bypassCache = true; reconstructLock = true; }; + elm-optimize-level-2 = nodeEnv.buildNodePackage { + name = "elm-optimize-level-2"; + packageName = "elm-optimize-level-2"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.3.tgz"; + sha512 = "RC5Pz/U6Hf244j95SIxmO33Cc7XZhj4KYKZCFJYGpeb1YGARciBv2AOikm9pBHErtiKtiJwzEWHBoruhpAZnAQ=="; + }; + dependencies = [ + (sources."@jest/types-25.5.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."@types/color-name-1.1.1" + sources."@types/istanbul-lib-coverage-2.0.3" + sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-reports-1.1.2" + sources."@types/jest-26.0.10" + sources."@types/node-14.6.2" + sources."@types/yargs-15.0.5" + sources."@types/yargs-parser-15.0.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."bs-logger-0.2.6" + sources."buffer-from-1.1.1" + sources."camelcase-5.3.1" + sources."chalk-4.1.0" + sources."ci-info-2.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.1.0" + sources."concat-map-0.0.1" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."decamelize-1.2.0" + sources."diff-sequences-25.2.6" + sources."fast-json-stable-stringify-2.1.0" + sources."fill-range-7.0.1" + sources."find-elm-dependencies-2.0.4" + sources."firstline-1.3.1" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + sources."graceful-fs-4.2.4" + sources."has-flag-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-ci-2.0.0" + sources."is-number-7.0.0" + sources."isexe-2.0.0" + (sources."jest-diff-25.5.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."jest-get-type-25.2.6" + (sources."jest-util-26.3.0" // { + dependencies = [ + sources."@jest/types-26.3.0" + sources."@types/istanbul-reports-3.0.0" + ]; + }) + sources."json5-2.1.3" + sources."lodash-4.17.20" + sources."lodash.memoize-4.1.2" + sources."make-error-1.3.6" + sources."micromatch-4.0.2" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-1.0.4" + sources."nice-try-1.0.5" + sources."node-elm-compiler-5.0.5" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."picomatch-2.2.2" + sources."pretty-format-25.5.0" + sources."react-is-16.13.1" + sources."rimraf-2.6.3" + sources."semver-7.3.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."supports-color-7.2.0" + sources."temp-0.9.1" + sources."to-regex-range-5.0.1" + sources."ts-jest-26.3.0" + sources."ts-union-2.2.1" + sources."typescript-3.9.7" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A second level of optimization for the Javascript that the Elm Compiler produces."; + homepage = "https://github.com/mdgriffith/elm-optimize-level-2#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } \ No newline at end of file From 29ac9bedf045cbfb8d2b9eaeb1e991cdf532f3bd Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 30 Aug 2020 11:41:14 +0200 Subject: [PATCH 033/499] erlang: make `configureFlags` appending instead of overwriting The erlang `generic-builder` accepts a lot of arguments that would affect the `configureFlags` passed to `mkDerivation`. Though all these arguments would be without any effect if additionally `configureFlags` is passed and not the empty list. This change should make it easier to "compose" arbitrary erlang overrides. --- pkgs/development/interpreters/erlang/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index af944e6fd143..a53a917b7b37 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -89,7 +89,8 @@ in stdenv.mkDerivation ({ ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" ++ optional withSystemd "--enable-systemd" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; + ++ optional stdenv.isDarwin "--enable-darwin-64bit" + ++ configureFlags; # install-docs will generate and install manpages and html docs # (PDFs are generated only when fop is available). @@ -131,7 +132,6 @@ in stdenv.mkDerivation ({ // optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } From 0c688868e7a02cb197b9c0b60339400fac904214 Mon Sep 17 00:00:00 2001 From: misuzu Date: Tue, 18 Aug 2020 16:53:30 +0300 Subject: [PATCH 034/499] nixosTests.3proxy: fix flakiness --- nixos/tests/3proxy.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix index 3e2061d7e42f..de3056f6710f 100644 --- a/nixos/tests/3proxy.nix +++ b/nixos/tests/3proxy.nix @@ -134,6 +134,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; testScript = '' + start_all() + + peer0.wait_for_unit("network-online.target") + peer1.wait_for_unit("3proxy.service") peer1.wait_for_open_port("9999") From 71ac9f191a9bfdf249421c9dafe1f4dbc6449e83 Mon Sep 17 00:00:00 2001 From: Amit Aryeh Levy Date: Mon, 31 Aug 2020 12:42:01 -0700 Subject: [PATCH 035/499] zoom-us: 5.1.422789.0705 -> 5.2.446620.0816 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index fde318c99aec..8defa7d0b43f 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.1.422789.0705"; + version = "5.2.446620.0816"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1sc454xadxsbxxyb68qi7ac20yq0vymzzw1i07z19c9idfpjy75f"; + sha256 = "0d7x4ji5l0rpanh0md75lywa8l9v6pd8bba5dba2xbfp7x9c3c4q"; }; }; From 548ded0ad5076f786bd801e6c46a4b6183e5490c Mon Sep 17 00:00:00 2001 From: Amit Aryeh Levy Date: Tue, 1 Sep 2020 15:43:29 -0700 Subject: [PATCH 036/499] zoom-us: 5.2.446620.0816 -> 5.2.454870.0831 thanks to @doronbehar for changes to update script --- .../instant-messengers/zoom-us/default.nix | 4 ++-- .../instant-messengers/zoom-us/update.sh | 15 +++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8defa7d0b43f..11325daffb8f 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.2.446620.0816"; + version = "5.2.454870.0831"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0d7x4ji5l0rpanh0md75lywa8l9v6pd8bba5dba2xbfp7x9c3c4q"; + sha256 = "198p7a6kd5bakywj314lwizsy03g3j7w5zd7j3xghmpcfjz5drbn"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 6214d4e26255..bda9c5ae0a07 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -1,17 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl pcre common-updater-scripts +#!nix-shell -i bash -p curl pup common-updater-scripts set -eu -o pipefail -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion zoom-us" | tr -d '"') -version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')" +version="$(curl -Ls https://zoom.us/download\?os\=linux | pup '.linux-ver-text text{}' | cut -d' ' -f2)" -if [ ! "${oldVersion}" = "${version}" ]; then - update-source-version zoom-us "$version" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix" - git add "${default_nix}" - git commit -m "zoom-us: ${oldVersion} -> ${version}" -else - echo "zoom-us is already up-to-date" -fi +update-source-version zoom-us "$version" From 9a5a8949aa415bd49312e42610d0c3e07f5d581e Mon Sep 17 00:00:00 2001 From: Serval Date: Wed, 2 Sep 2020 22:13:02 +0800 Subject: [PATCH 037/499] v2ray: 4.26.0 -> 4.27.5 --- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index ab3f5eb3ef4d..d362810b56c8 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ , ... } @ args: callPackage ./generic.nix (rec { - version = "4.26.0"; + version = "4.27.5"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "069wm0n44i4l9pnrhwf60ssld65p6gfj4wfc68hrhj4zi4jvlyds"; + sha256 = "168kz8hq7mcfy6h758mmrky550p04bi9jsfqhy67jcxq81874m2k"; }; - vendorSha256 = "1520h69z0inbsrw5505cxbinqakvwcrdx3pisrwnp9lv4jsrzzsr"; + vendorSha256 = "0m889byxw70vv1mzlivalq444byp0y182nqqzdr458gfifvpc7s7"; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202007080004"; - geoipSha256 = "1j4qg831dhxdy7brgxn4ca69cvwr3zsgizidlzasbkdn2rwai17y"; + geoipRev = "202009020005"; + geoipSha256 = "1xsy678cpqv6ycnhzl3pms76ic40aggq46q9dsd5ghj94mcx9837"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "20200708125309"; - geositeSha256 = "1pr4137ri3v3r880yx5sqf2p7qfn8g7s555q51x3smkjzkyrskcy"; + geositeRev = "20200901194123"; + geositeSha256 = "0fjx1wrq14d9v326k4fjwca3h5nv8ghk11kprf6jkjncjszwvgby"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; From 4ac99e76bc032c0fa85491165a078f541c283b05 Mon Sep 17 00:00:00 2001 From: Serval Date: Fri, 12 Jun 2020 16:12:51 +0800 Subject: [PATCH 038/499] nixos/tests/v2ray: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/v2ray.nix | 83 +++++++++++++++++++++++++ pkgs/tools/networking/v2ray/generic.nix | 6 +- 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/v2ray.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 60ef5a027637..fa03e2506e8d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -362,6 +362,7 @@ in unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; + v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/nixos/tests/v2ray.nix b/nixos/tests/v2ray.nix new file mode 100644 index 000000000000..f1b2570cc860 --- /dev/null +++ b/nixos/tests/v2ray.nix @@ -0,0 +1,83 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: let + + v2rayUser = { + # A random UUID. + id = "a6a46834-2150-45f8-8364-0f6f6ab32384"; + alterId = 4; + }; + + # 1080 [http proxy] -> 1081 [vmess] -> direct + v2rayConfig = { + inbounds = [ + { + tag = "http_in"; + port = 1080; + listen = "127.0.0.1"; + protocol = "http"; + } + { + tag = "vmess_in"; + port = 1081; + listen = "127.0.0.1"; + protocol = "vmess"; + settings.clients = [v2rayUser]; + } + ]; + outbounds = [ + { + tag = "vmess_out"; + protocol = "vmess"; + settings.vnext = [{ + address = "127.0.0.1"; + port = 1081; + users = [v2rayUser]; + }]; + } + { + tag = "direct"; + protocol = "freedom"; + } + ]; + routing.rules = [ + { + type = "field"; + inboundTag = "http_in"; + outboundTag = "vmess_out"; + } + { + type = "field"; + inboundTag = "vmess_in"; + outboundTag = "direct"; + } + ]; + }; + +in { + name = "v2ray"; + meta = with lib.maintainers; { + maintainers = [ servalcatty ]; + }; + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.v2ray = { + enable = true; + config = v2rayConfig; + }; + services.httpd = { + enable = true; + adminAddr = "foo@example.org"; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("httpd.service") + machine.wait_for_unit("v2ray.service") + machine.wait_for_open_port(80) + machine.wait_for_open_port(1080) + machine.succeed( + "curl --fail --max-time 10 --proxy http://localhost:1080 http://localhost" + ) + ''; +}) diff --git a/pkgs/tools/networking/v2ray/generic.nix b/pkgs/tools/networking/v2ray/generic.nix index 4499e91425f9..04ac482e8985 100644 --- a/pkgs/tools/networking/v2ray/generic.nix +++ b/pkgs/tools/networking/v2ray/generic.nix @@ -1,4 +1,4 @@ -{ lib, linkFarm, buildGoModule, runCommand, makeWrapper +{ lib, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests # Version specific args , version, src, assets, vendorSha256 @@ -44,6 +44,10 @@ in runCommand "v2ray-${version}" { maintainers = with lib.maintainers; [ servalcatty ]; }; + passthru.tests = { + simple-vmess-proxy-test = nixosTests.v2ray; + }; + } '' for file in ${core}/bin/*; do makeWrapper "$file" "$out/bin/$(basename "$file")" \ From 405f49dc4aa4901e6cd3020ddc842c5f4fef55c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 3 Sep 2020 15:28:01 +0200 Subject: [PATCH 039/499] mkl: 2020.2.254 -> 2020.3.279 Release notes: https://software.intel.com/content/www/us/en/develop/articles/intel-math-kernel-library-release-notes-and-new-features.html --- .../libraries/science/math/mkl/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 11c5e42335b1..2be3baed4497 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -19,14 +19,18 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "2"; - rel = if stdenvNoCC.isDarwin then "199" else "254"; + spot = if stdenvNoCC.isDarwin then "3" else "3"; + rel = if stdenvNoCC.isDarwin then "199" else "279"; + + # Replace `openmpSpot` by `spot` after 2020.3. Release 2020.03 + # adresses performance regressions and does not update OpenMP. + openmpSpot = if stdenvNoCC.isDarwin then spot else "2"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; # Intel openmp uses its own versioning, but shares the spot release patch. openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; - openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; + openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; @@ -42,8 +46,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_${version}.tgz"; - sha256 = "08q2q5rary7fxlrk09kpw0vl7mkk2smmklib44a6qainmxks407d"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz"; + sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib"; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin From ea5ba6e13d8b359059245668b69fe72e6d2a6211 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 3 Sep 2020 21:16:29 +0200 Subject: [PATCH 040/499] lib/types: Show sub options of freeform types Previously if you set the freeform type to e.g. attrsOf (submodule ..), those submodule options wouldn't be shown in the manual. --- lib/types.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 1845b6ae339e..cc125c20311d 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -522,7 +522,12 @@ rec { # would be used, and use of `<` and `>` would break the XML document. # It shouldn't cause an issue since this is cosmetic for the manual. args.name = "‹name›"; - }).options; + }).options // optionalAttrs (freeformType != null) { + # Expose the sub options of the freeform type. Note that the option + # discovery doesn't care about the attribute name used here, so this + # is just to avoid conflicts with potential options from the submodule + _freeformOptions = freeformType.getSubOptions prefix; + }; getSubModules = modules; substSubModules = m: submoduleWith (attrs // { modules = m; From 8741611e580c1f2158ec0e0efde603d2eed43dd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 05:35:42 +0000 Subject: [PATCH 041/499] cargo-udeps: 0.1.13 -> 0.1.14 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 40e172972b79..b7879adcc31c 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0wxpzrcrdxlihzxzqmrhii5bfxknliqb4d5mka4k42x5vim8pq2f"; + sha256 = "0imvq63i3s9qmm0x8cbaknjap2yfmpzva3y0sxmgkcm8ajkvp114"; }; - cargoSha256 = "0q1q7x1205a8dp35d4dds3mizl6y4d3rfc5gkarri1g189nrk5pl"; + cargoSha256 = "196w9rgz4pwqvkiy839kqz765ljqx1k129w4nvxgxv3rcmy4lbzm"; nativeBuildInputs = [ pkgconfig ]; From 568f50aaeceb1bce151baeb9df1c4360670ee9d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 07:59:08 +0000 Subject: [PATCH 042/499] circleci-cli: 0.1.9321 -> 0.1.9454 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 881516cf25ec..b434358e1d20 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.9321"; + version = "0.1.9454"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0n0is4aradlx0jbzs819swidi2x1gnpca9f2b0lkxrxgqcm7viix"; + sha256 = "0ld7lb69wmhyrpqjaj1pddx93x529qk2fzyrwlipglwn3mbala5a"; }; vendorSha256 = "1zd95n9k2fags0qh3wvjinxv1ahygr958mmiax2kz117yipaz4rb"; From 197799c2633da5377cb6336f1f7a85186dbbf2fe Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 4 Sep 2020 12:38:23 +0200 Subject: [PATCH 043/499] firefox-bin: 80.0 -> 80.0.1 --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e8e5109351e4..e7f064b2f6bb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0"; + version = "80.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ach/firefox-80.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02"; + sha256 = "d3297316b481d6fa10cf71e7d1331f407e6167fbd1b6a854fc39fe2aca466250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/af/firefox-80.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b"; + sha256 = "464726f6cf660a8f5d6059ee85fdd0b87cd97c51abf578fdb851a181c94b110a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/an/firefox-80.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043"; + sha256 = "3fcc891f53ed5986554c5f595fa75631402ae35eb484ae22c15cdcf3d1885311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ar/firefox-80.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884"; + sha256 = "d30299d7e707c7528a87d3094612bff6013bf135f4ca5e2cc2105bcd434baddf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ast/firefox-80.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54"; + sha256 = "c766b9c3fc2b63e0e61e113678afa783efabb96620d1715fb72bd17f4a93188d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/az/firefox-80.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6"; + sha256 = "49264b6f35bc0cc5198782fd2fa62a0388e04141b1580a44f71c48e6b44853df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/be/firefox-80.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b"; + sha256 = "391f9423e7211790509e03822a4186117320da8f660a1e3b44ff44712235762e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bg/firefox-80.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317"; + sha256 = "45e04e624329abe7704242581599a11e177ff3418adc49cd5bd59f45b2f0d517"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bn/firefox-80.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c"; + sha256 = "36c1ce02ae8b4ed1dd78ade3dadfb24042c6fe7d942c9e3be6b9c94dd7fa96df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/br/firefox-80.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8"; + sha256 = "83c0b3ec0fcf7d26a45c7e59a7c467c64fbc7d9fcce5358451e51828aa57acde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bs/firefox-80.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34"; + sha256 = "d1c1dbb0060ab256ca932f1ae2a8df8e8b130242c8a1d9014a047eae79d95687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca-valencia/firefox-80.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a"; + sha256 = "8b4b1b7bb92287b4049712335c6da52f7bd825490996a48e4b376a3811700790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca/firefox-80.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca"; + sha256 = "34a48e1d85e7557b318590faccf621fd4c32e51060dc5d06f40ec933599ac4b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cak/firefox-80.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676"; + sha256 = "8db14d21c578d8e238b3a0882bcce70bb48d66fe60fc74053acf5bcf212fd243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cs/firefox-80.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e"; + sha256 = "361414fede99694a9b8f31076b1a9d7c871d857870cfe0ef01cb3e02a5be0b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cy/firefox-80.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc"; + sha256 = "bde481d7acfca3e0c33c63d7dffd9772adbd11c252dc4e92367476c5fc347cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/da/firefox-80.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784"; + sha256 = "bca4e7d4690cb950d9fa87623da30b93f54d0efd005e440b1af9acb06833baf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/de/firefox-80.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712"; + sha256 = "e4deb64c304ec7b5c06c0f8ec8299d6c513def1e0524cb93dba2fb3e22fca8e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/dsb/firefox-80.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff"; + sha256 = "809080cde0646ed2e4a64e2e70beb25aa3dcc47f7f749f2722c898f8efd9271b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/el/firefox-80.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0"; + sha256 = "7f5abfb89c70187b9b8e954c21b566da9b28781f1de80634da6c47d149363cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-CA/firefox-80.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9"; + sha256 = "61d6a1cf59a89d2e690423f38779dc7c776757ed39a1fd66b9bfa6b5e63e68b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-GB/firefox-80.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf"; + sha256 = "75b1808a6d5ea0b70df3bbb7d9b8890418069c5fa9bd8a5dce6b0f18f5e3b2de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-US/firefox-80.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7"; + sha256 = "3ac0c9c4454647ce986bbe6f3567b0e1de5c0719ed6b6627344292c581a2afd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eo/firefox-80.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f"; + sha256 = "5c61e9348fe69bbd32d9501730b9cc12c14b55746b5b670379ab0c463f2d71c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-AR/firefox-80.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3"; + sha256 = "0203caa38c1526c8c3df9c315e205770b43594f222364f9bebb3e89485a1803d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-CL/firefox-80.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64"; + sha256 = "c2b7e09dce573ef945379a7a5f7691d877efa14e226bcd20ad48a3dedba1d1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-ES/firefox-80.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5"; + sha256 = "0653d855ff0e04b6f6a6e44de558de69fac582996c7b944dec043810c8faa704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-MX/firefox-80.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33"; + sha256 = "9c6f7b6208b390a73dfe778ac0a798b4999abe93840b4224a5852143f3588f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/et/firefox-80.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992"; + sha256 = "786495f0ef9af4475755378d9ae3095041c4f329e9cbca197eaff0199d6bdf02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eu/firefox-80.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef"; + sha256 = "91c9baea255e46ebc3ef8702eb8e233b395cd39c9c092c0812adcdcb60f5f3ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fa/firefox-80.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d"; + sha256 = "1baf78177598c3e0fa6714ed85a305b6a811baa26b1d0c6d7d6d05c8bb8b8595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ff/firefox-80.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0"; + sha256 = "20e44b613633e84c8808c76ccd61a78bb8dce1a09bdaa1d6aa95dae1eacaafc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fi/firefox-80.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787"; + sha256 = "d6f634e7aa109d368bb2b7e8b3c3682117d350ad7630d6283006f8d22f98201c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fr/firefox-80.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8"; + sha256 = "a0c7326670acb7b097c17905b23410819429b2357534eade971a9c3b22b268ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fy-NL/firefox-80.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04"; + sha256 = "f28ae560003555ded4590f0640a89090cbe0e732449973aa2b42d530e3829b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ga-IE/firefox-80.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051"; + sha256 = "04b260885b755f9c7fe93a82ad10855abfbd14706ec81f0fe38c96c2355c833d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gd/firefox-80.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb"; + sha256 = "b8f4529a7970906654a6df2f91a5687d49dccf8f1438ed86bcc4d9608a2f26fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gl/firefox-80.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686"; + sha256 = "234c4f3ddb6e5a59f8eaae2b58d8a1dc302f66a5e7edc6337d9b1e6e1e1dab24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gn/firefox-80.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e"; + sha256 = "0c7688233efc95bcbefa8b2faaced313d69c0fb246a91564b3629ec24026843b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gu-IN/firefox-80.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051"; + sha256 = "12c45963b4b7e4976f656b60e9c4964ad871f96cefeb5e898c3a830c85d92d78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/he/firefox-80.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f"; + sha256 = "8e0c8c06f5e9665a7bc9733e3afe514620c2b6071451c9ca05f0a1fa9b953c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hi-IN/firefox-80.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab"; + sha256 = "008d5f194b9572ecee09ea67481ed1fa91f6a7987105d90c53924fd9d8e7ec7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hr/firefox-80.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010"; + sha256 = "2ce4d27f389f2f4137d8f8487c4f4d32bf6833870592755e13694f48ab6966f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hsb/firefox-80.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6"; + sha256 = "2c540fc55a0bebe2886123e3edcaaedf793e022eb0244c2eead9e1fba337d129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hu/firefox-80.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4"; + sha256 = "8f2c14860f0a97c2aea13b262a7f4ba62efbf643eb285f2282ba3467d7aa59c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hy-AM/firefox-80.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125"; + sha256 = "c003e6572b150a9c0f33f1fe0d2d2e537e1d5bd901b937663cbdb8c50a0b2639"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ia/firefox-80.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a"; + sha256 = "b8da547a7236c08b681d33d405f6ddf3f17a5342f8354a3565c6dfc39d3cabd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/id/firefox-80.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc"; + sha256 = "7c3adc7ec426b3f8a2da36fba744d07774037fa8dbadbf727eae3fdbb19a3bf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/is/firefox-80.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012"; + sha256 = "57bbfd97596d9d2c557186d729ea74f233bc50833d8a1d768402cf6d25cb8dd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/it/firefox-80.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782"; + sha256 = "0de8a984c4a328020d351edfefe717325d4c50403f126b8c211b2798062c854c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ja/firefox-80.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18"; + sha256 = "5a718d304fd3dd30abb9b9b5f6a54aca5c9a6cd1c9ccc3bd5859773112432f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ka/firefox-80.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c"; + sha256 = "2422236d92428e2a0f921433f6bbcb87505aac7110cacc6ca61173a28555ba35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kab/firefox-80.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc"; + sha256 = "ab81137395002af2626e534e5133b455d4b50f441cf71f9a11b8f92444221535"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kk/firefox-80.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a"; + sha256 = "daba81c27dc36bcd267a0c77255b8333b8ab0f3e0e338a74eb17a36cd83af7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/km/firefox-80.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457"; + sha256 = "021f7787bfe87ccc8bc33ed6668196f4a7d528672ba14eff1ca4fa4efe0c2768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kn/firefox-80.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9"; + sha256 = "973259c5b54672b0f5aedbb5c2126716cc7b8792f3b2c6f9d6d745eb9e6d9529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ko/firefox-80.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6"; + sha256 = "3bda308c8bce3b00250827d7b505c9cbe9574cd7809dd866ffe7a230dbdbb7bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lij/firefox-80.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b"; + sha256 = "c57dccdb4f9281b31c1b359bd2a07b3376a693f3f37c513223029fa854b61644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lt/firefox-80.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3"; + sha256 = "ce04853033bb00b760c4814b436a67e151f54842ab736b440f118c44945e53d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lv/firefox-80.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb"; + sha256 = "79b71529569df018e86925e8df25dae43cc54629eee50035fe515c9299d2664f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mk/firefox-80.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876"; + sha256 = "3a015b82f1f966e1ecc49af369ff80bd922dd1dd4d93a642c9b7bb8f9ea078bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mr/firefox-80.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4"; + sha256 = "4fbf77e82ac6739eb4f557ef9fbf2d86574c50260d2661964ee01b99d496a10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ms/firefox-80.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce"; + sha256 = "c6e07a8f1eff5239ee19eec7d4828ca175535656fd130fcb72552e4585e1d9e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/my/firefox-80.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a"; + sha256 = "a98a72b72665fda08f2b834af3a7c060d07cd638a69cad4f165f9af4730b642e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nb-NO/firefox-80.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2"; + sha256 = "948454e67ed57e47f3879c866c9ef72245b552066689d1e5d7e95431c06c72ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ne-NP/firefox-80.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc"; + sha256 = "280857446256df49b901eae8d64f4255fb279dae7f67ff83beefd59d227ea466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nl/firefox-80.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483"; + sha256 = "6e50983c69ac40ddb403c1e2a5b6ac1fb713bd1d169d8dd402516f827907d457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nn-NO/firefox-80.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8"; + sha256 = "27178fe7b5bf19c4b9fdc42c90651f4c53379996ba67b743485decce0fd9e18d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/oc/firefox-80.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867"; + sha256 = "aa517e0e68aff16ccd693a7a282ee8aef1df8486b68b546af166bf39ef67baba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pa-IN/firefox-80.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae"; + sha256 = "cb5ea9559d416f44c0830cb1bc85fffd3ee02a63697ffed7c0d5ec9bee8bf1e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pl/firefox-80.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638"; + sha256 = "36d0b84933e689b36701b50c1145b6f64e8f09af4ab8a7aafa53e1d33d8148f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-BR/firefox-80.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b"; + sha256 = "24093debf351c29812350c5feb68f741fd0d05cadad962ec5acb5ea0d9450bec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-PT/firefox-80.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05"; + sha256 = "bac0a7f9f902ec3a1006a45a330b52520377b43c61aba4b6fb3a45eb126379ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/rm/firefox-80.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb"; + sha256 = "e86c79a49f0c980ff4ad60f151e9350e66df0ecf8b9bfcd08586cbae9abad957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ro/firefox-80.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504"; + sha256 = "32d089bfa4ebed3c6938abea0e16a9527cf303f6b9c5fd68e3adb2cd967ac3b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ru/firefox-80.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113"; + sha256 = "75a470c503f19282b3b1730cfc1bfef450634f1166d094b4e4f30a8f872da1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/si/firefox-80.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691"; + sha256 = "f919ae9b3f2b6e1df1d073e3e7556091bc3586584c39a8dcbe91b8c29a4396d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sk/firefox-80.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9"; + sha256 = "de6b476f015fad31e80a504c29c05d60c95c0dce18309765a3108ab27c926900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sl/firefox-80.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220"; + sha256 = "9cba9b423bfda5788a76692e78310d961db70cc870e0797bcfc4020dc63e2019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/son/firefox-80.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070"; + sha256 = "4423551873bfee1d1d4c7acdeaed8a133df3d467e711d4b2ffdcfe4dcecf434f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sq/firefox-80.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d"; + sha256 = "739918066fae4e5b20093540a2ea6e527878991ffab59ecbbd264aba5a13eabf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sr/firefox-80.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e"; + sha256 = "5fe944b1fcb260fdbd747b9009ce05708d6ac82ae9f501d6a7efefc87d95fbfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sv-SE/firefox-80.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc"; + sha256 = "3f0ba11adce493f8ab6a771a362ada50abe442f60a2d910a36339ee19889b152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ta/firefox-80.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666"; + sha256 = "7fdcfb26091269bbda4f81991d3dff20fcbfba534be9e9ae315459306aef0d17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/te/firefox-80.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426"; + sha256 = "54fbdcd804f4d2dec3096a041927e65ed999126f21a748a7f0b36091c4c4c7b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/th/firefox-80.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801"; + sha256 = "ebccb1cfdc0394889e7c67a5ef9be54dd87818c8f326e89ac6a97fcd9865c721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tl/firefox-80.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730"; + sha256 = "7585a169f7975bbaa752caacf1863a2bd3ac9eeb17a031492a7cea5dd1b24efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tr/firefox-80.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa"; + sha256 = "a475825fb5f0125f16edc895921d3839393fa806a12b3bf2f296321853cb66ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/trs/firefox-80.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337"; + sha256 = "4dedb4d60db089358b9371a828165f6fa7e329af5deb1177d090730c22323b9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uk/firefox-80.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b"; + sha256 = "5a2a6f9234db28e79c8472206d40f1d403af05de2f9f4e1b6253bf3e912386e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ur/firefox-80.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f"; + sha256 = "30f3516680ef54d1e3636e858b8000aac4ac462e3fe6e20db16fbb0d037c2394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uz/firefox-80.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03"; + sha256 = "84a6ed8eed48ebf993ebf779c623472ea3d2bee84457fdc4e1968c013c8b8383"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/vi/firefox-80.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124"; + sha256 = "eb58bad9266d0e46b55d4815212083609197acc4c8a7cd3a1ee9901adca7dae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/xh/firefox-80.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68"; + sha256 = "d478b199b9096b264f92f793f713b3e1cb42fb7c5f017ac0f1b82eea33434cbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-CN/firefox-80.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f"; + sha256 = "b91d7637a20ebd8dc3200d222f98ac2d065a3633988ef0d17591cc8e72efac03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-TW/firefox-80.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea"; + sha256 = "42bbf8d38c417fbf0d6de21e4fb4f3090096e0bcc2820504b8ea69f057d50a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ach/firefox-80.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a"; + sha256 = "1d39224b647c9a18c6a5021366775c05bf704bf316d6329f170cc4eb59c05a10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/af/firefox-80.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c"; + sha256 = "a4b998c95454270fa98c59cb94dcad6e5db2da8a92f9cd75e8d0e30041eccc5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/an/firefox-80.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5"; + sha256 = "ff786a29ef12215fdc8bc057f596ef9ab1ef207fbe84910504a314e27fa54c79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ar/firefox-80.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1"; + sha256 = "498ecc3042b4ccfbb155e632531df9ab75f7e3225820f0fe6929f80a91a91660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ast/firefox-80.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d"; + sha256 = "1174347fac624e8c4573bf80ce0867ec8e94694bb0cd623de86949fab0780044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/az/firefox-80.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60"; + sha256 = "ddd0856d036f9f3eb87874440bcd6e85106f7391f03e76cd1f1d5428a69b8374"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/be/firefox-80.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2"; + sha256 = "23a8c4cb1c4d9e0e0b5a5924119670a4224ded0595d8326ae500a7bbafdd49a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bg/firefox-80.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34"; + sha256 = "a0fdc2f520e251f624ae19a169ee7f1349017a8af87b9c149ea731e32054ef4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bn/firefox-80.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3"; + sha256 = "553e9a0704e4984e091716d41fb040f3b93bb192fa292cd7453ede137b170b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/br/firefox-80.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f"; + sha256 = "dd82f29c768befcbcc691a1665a5fe2e519f94558c331ed29c368c005e764d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bs/firefox-80.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c"; + sha256 = "59fca5c16258a5f5e3f8725ae1da886381fc78963fc6174762c9b74e6a83b01f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca-valencia/firefox-80.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1"; + sha256 = "d75878b8d573a96a65fe320cd00208733f46984b88f44a3ab571bbbec17f2fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca/firefox-80.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e"; + sha256 = "f89d8655184f74f3218510d8e44b8bf4fe9840fc3555d4a4ca59dab8b77f8a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cak/firefox-80.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728"; + sha256 = "31008fdaf9a7ff5a3051b936dbd4253da76770da2e59fd97707378b4c9cae4c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cs/firefox-80.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f"; + sha256 = "7e8ed50ec696cf3fa98aa2ec0d2755e0064dd285c43f17fc4f58adfb427cbb3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cy/firefox-80.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e"; + sha256 = "64b5cda8d4a0febaa96c778a3b45c380903835b7eb27ff375cb24c7ab3c56813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/da/firefox-80.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421"; + sha256 = "b7ba473e03fb0bd3efc7f00882270e65e2f74d12e4a150221519e9fefed6f470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/de/firefox-80.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701"; + sha256 = "4ff6aa86a82b4466c5809fb192021fcacefe3309f73cbcbb8d4f952c066e4307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/dsb/firefox-80.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef"; + sha256 = "8ff130011dd318c45d7c85f26137a73f2abdd90eeb21ff4e29f45eb786e24541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/el/firefox-80.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed"; + sha256 = "c2c7f0d40a3c32896678cffce276a8d71613b09eda6fa715d10f156c13a1f6e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-CA/firefox-80.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632"; + sha256 = "b06db042a7429c1743f4b0488e403a5051acfa1be556e07769880345b72f5cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-GB/firefox-80.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd"; + sha256 = "435e24ff0665065a2eef6efbd8ea86e5c7e2752f44c420e94a7b0fdd503ea5b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-US/firefox-80.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b"; + sha256 = "fc1d7b798644f41a0da9e2dccc1e8fda86cd12e2f2dd3808ccbc247084221648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eo/firefox-80.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1"; + sha256 = "e5504a7bf75e2eba860f61fc3fdd979b2a766a4299b3652bf62d5a46526e50eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-AR/firefox-80.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0"; + sha256 = "b53c9605b8798c6ecea9f1f47b0a1590a788c12f2fa9c09293a05ffbf4b22d53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-CL/firefox-80.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f"; + sha256 = "a2fd6bfce565cebfae759dcbb7b3cc3f504f0bee5324849a63a39fc65c36724c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-ES/firefox-80.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7"; + sha256 = "c15751d3f0dc389d2a2e9cd40e8da88f1710a6f64999d106bee1dcab09daed5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-MX/firefox-80.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592"; + sha256 = "070a68c0893d63c5663252e52664cbeabbbf0d31542499575507644e003664ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/et/firefox-80.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68"; + sha256 = "2eecd4ff182a25ba4e1a1edb78a8a9b1881321cea2740207795351700af1f4a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eu/firefox-80.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112"; + sha256 = "5fa2531712b5dff1d9931a369e774dfe15d2fc74078ed65ced0196b80faf2c8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fa/firefox-80.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440"; + sha256 = "c22c673516a9837fe3d454bdecf0a59efd3b18f1e7cec51a6e742a343367aaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ff/firefox-80.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35"; + sha256 = "64de30cf7241daa09cbf7b027017c6411fbe01aa84c8bcb62d4cfac0eb86b540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fi/firefox-80.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6"; + sha256 = "549743b069385b594c78f8732f28cdae1a73324d3662f671e9721b566629ea01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fr/firefox-80.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8"; + sha256 = "abfb9e7c89fed1a4553bdd7cdbaab84f7f5221d31df404af0143bed0e6b817c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fy-NL/firefox-80.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6"; + sha256 = "97accf68261aa9b04cbbcf424afeb7a3aea92853c70a4f0a52d10fc408d5e83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ga-IE/firefox-80.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e"; + sha256 = "61f830ff111c0de73a229d12705ef6b3cc1b597abe668488c8f8ba3bf5dde217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gd/firefox-80.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931"; + sha256 = "cd4904d29ba8f649f3a960953e99a5a8ea12375d2cbe651d1bf09210a08e6400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gl/firefox-80.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b"; + sha256 = "0589a2465fff938d88a248f4175d9c3c0ccd4602b317f403ed3b7966b1d1cdc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gn/firefox-80.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103"; + sha256 = "64f4f44b7b6b07970fe0c2f73b9e8afc5df75125a8c84f4c56b839c47899ee5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gu-IN/firefox-80.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8"; + sha256 = "46ac00838fe4775ad83a4cf6a510c7a80a6106896060bc3d6c2a94ae91004202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/he/firefox-80.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71"; + sha256 = "563abdb4e26b3bf628f14bd5ef0cb3fe326b3e0a0bd65aba67fece4460b434aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hi-IN/firefox-80.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500"; + sha256 = "828c6e01a4f2db95d36e1f8826fde98c8d762ea0e0aaff0abd50a9ade5638b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hr/firefox-80.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367"; + sha256 = "6cffbcc579f3c489e6d3e8da4bff44189851565cbe196b6f8f3e1a864ebf15d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hsb/firefox-80.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912"; + sha256 = "c2a744f2115d1e67d430dbbfc7388043a740840dbbdbc40bb34b6d7c8feda525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hu/firefox-80.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c"; + sha256 = "cb382f9253652ed6109f8ab1b90eddcb3f7a5bb56aa3b4d99faa755b09dd197a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hy-AM/firefox-80.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe"; + sha256 = "f298f1a9a427ba647d99f082a40e39be2e80dfa2388b731ed7e27a6da4efbd8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ia/firefox-80.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99"; + sha256 = "d823238dd340f45f776d73710c0cd77edca6be241aab189618f6def9d46f60e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/id/firefox-80.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc"; + sha256 = "667ec59c3743f707d4b3084a19ba09aac625794d2c7a240a04f9d932ffba9046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/is/firefox-80.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f"; + sha256 = "bfa3be98edd904965d65c1094a9b83807633867c802b605bb93dda031e979a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/it/firefox-80.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0"; + sha256 = "198aef68d51404fd37ad602e1f450afa8dd439d4ebcacffe1e920d4629593da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ja/firefox-80.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd"; + sha256 = "4a443e7b2d8169871b789ad90ca23ef8a01e7578fcf6b1af6ceccd4af93fdadf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ka/firefox-80.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19"; + sha256 = "8884da1d0c2cd6fa7aace95a8be04c8fd691b24428207eb62ffd3e7509494eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kab/firefox-80.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629"; + sha256 = "328ca68297bf281c573e6059f3cedb872396f0a7474e92caf78906d4d4089531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kk/firefox-80.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8"; + sha256 = "f632d1f23c5936bd498b695de562935a968e592013ffdfaf878516b94db9f149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/km/firefox-80.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c"; + sha256 = "8f7a5370f6108b6b7ac28c35a845378ae67929accafba911cca34c2e67dd6da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kn/firefox-80.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b"; + sha256 = "395311e396a7267baa31f74dd30cb2e2721784de4ebdaba72c44bb384e4a6aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ko/firefox-80.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650"; + sha256 = "40e0ca4c3380213a902ed08e0f7cb7feab7d45f9ac035467ac0a50cc99af771c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lij/firefox-80.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735"; + sha256 = "35ed355715f7d6263ba90a563f573a3cd6ac186727b6e982692458720dfaedb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lt/firefox-80.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a"; + sha256 = "0d0df39e1552a6e310d279f53384a8f8f8298df2f590fdb2683012499e599152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lv/firefox-80.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804"; + sha256 = "41905b366ba007d226c07064c90b104eba01be85397541e50ec7858e72c444df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mk/firefox-80.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb"; + sha256 = "3461c717fb3c1560ee383c044423874244c5fba95edbd2b8ab0ffd6223c03b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mr/firefox-80.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2"; + sha256 = "3453bbf846392782d902217a331e1b74aaa93475131a866661e233ecdb4e108f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ms/firefox-80.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d"; + sha256 = "7e3f92a4429eea8f3d79dd105164461b6e218842c3131e8a186cda71504ca3d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/my/firefox-80.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220"; + sha256 = "bb4ef9a5ea013aed6a85aad02211f744b8cbce62ae94ac815b6880b986503b9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nb-NO/firefox-80.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa"; + sha256 = "e0e6524cfc56b09bb37501acf0ba2074c8fd2d1b3e9130e8c223b0156a02ee2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ne-NP/firefox-80.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc"; + sha256 = "ed13d6e6826b14efe1e7d322e7c93243c413277cc360c2f2f6389975e8a234a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nl/firefox-80.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05"; + sha256 = "08e06314f3633a93363c79a4470fd78ae7fadb1421140da81ddf82f2cd8a1a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nn-NO/firefox-80.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90"; + sha256 = "ca2cc7cd99ae698e48bc75274811ca2e0cf92e34fead87fa4b3450d5cfeac522"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/oc/firefox-80.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58"; + sha256 = "2136473ae8be4213aa16f542014a3c2671d538792ed87d06ab205be9d3ef2bf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pa-IN/firefox-80.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73"; + sha256 = "8bcb5f76cab4a7c9635eb456ea05697c32e2eb22a4f81ff91142e0a92c9f358f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pl/firefox-80.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781"; + sha256 = "445021b7e78eb046bafe176abd466679c296ddf2795deefb2c1e325388db0876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-BR/firefox-80.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa"; + sha256 = "65212c864d33f04ad6e5250fdf674c274c696ee8d7c13a0c91f38d204b9dacda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-PT/firefox-80.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16"; + sha256 = "9e1664031ca29e5f0f9cab5bd0cddfe3a053a0737d5fae82ce42d8c4a89c3044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/rm/firefox-80.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a"; + sha256 = "7ee02dc6ae964991e4aed47bd47fdea644cf6ab98a541f59c7f72eb175a04c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ro/firefox-80.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37"; + sha256 = "932a7723262b8c3c1ee54e9e06f4301b8996eb590c6c52030b42804d18f1cbdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ru/firefox-80.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229"; + sha256 = "36727824ef047330a2448ea1c8a436dc074de60d64eec981d4cc52c3f3f6a4d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/si/firefox-80.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5"; + sha256 = "8bbda31d0e2a7cc46740b2c0545c725c881f482c300efd9baa6fb4e2e7103d0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sk/firefox-80.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf"; + sha256 = "2ac41667c392735f11b21c149b7a1f29122c4528eed7863180c5f9a3528bc6b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sl/firefox-80.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413"; + sha256 = "4f60048b39306e9da94a5205a89dcaed1a30927fe1865ce6934a1ef0b0050a71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/son/firefox-80.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8"; + sha256 = "3c83ccf6b9a037af11f9431423afada70c979cdd8d12117f0256576e56600b1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sq/firefox-80.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228"; + sha256 = "d87237e6ecdb3797c787f35f9ced339cc32380c23c3a0663cc3d46d3312aa8ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sr/firefox-80.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35"; + sha256 = "4e2a7a21e3f94b0344fa5bb471dafb11d4589ae3966799b7b4e82d8503f5e7a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sv-SE/firefox-80.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401"; + sha256 = "4b91c958b998f7f3cd59b26a27bc848aea98d5319a169684b82dfc3750ab0fc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ta/firefox-80.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12"; + sha256 = "9772ccd592e51ce71ea86b241c9bfdd78793a90b8f0156c049f1b603f1d9a8ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/te/firefox-80.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6"; + sha256 = "b7906bbb4993e1fc231e02f390af62fcd40d7e6fb0cdc5031447d97c8e29eca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/th/firefox-80.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c"; + sha256 = "dc978d91b6de96590cfd95514a9563510d4f4725a80402e2eb6b2289de1f49a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tl/firefox-80.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325"; + sha256 = "98d617fb0ca75a977b127633a8050e119a047fc881161d97a852431231ecdc67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tr/firefox-80.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb"; + sha256 = "1228b0ba249cb2b9367db532647fdd0d58057e11d1b182a0982ac12e2c8f686f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/trs/firefox-80.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d"; + sha256 = "e32783dc73b6e8d5aa2f0fc1e44fb361e07aecdacfa8a5f3dbcf0aadfa871762"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uk/firefox-80.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804"; + sha256 = "aea971a56865756e9e6cd25638051e3e8048c2110e72aad2961bad40025fec05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ur/firefox-80.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191"; + sha256 = "aa9ba0b3709ae1afc610b873877ec4b46a5ef3a801d04157c104ee985db4d9c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uz/firefox-80.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182"; + sha256 = "a3f0e1c314825ee0d8c6dfe6d5d5dabada792088342565d65cdc336fc74a8e98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/vi/firefox-80.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8"; + sha256 = "92f17fffcdbea8ca77dfc0da435ed936bd2011bb8b3bff7b565433ff281a9dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xh/firefox-80.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5"; + sha256 = "05a56d5d5abb3d0090b2bcae93a7d1ea45050da6ecbdef013916dd3b26228c16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-CN/firefox-80.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337"; + sha256 = "39231fb7720d7e35f81eb4aaf188eeda2414cc700d8e9658c776ff3bb535e418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-TW/firefox-80.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12"; + sha256 = "09d04e81464057e0ecb222b28009a255a51023ff70aab58ba4411c8457d331fc"; } ]; } From aea19ce3999c0c3485f6aa55b56e1d8f4ef11bc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 12:46:26 +0000 Subject: [PATCH 044/499] exoscale-cli: 1.16.1 -> 1.17.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index bdde2b8f24c1..41fc026092db 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "0616nvqrcvn2xdmnkr5sjf1r5qg30b24ry87hhiqi4kz9a92qdx5"; + sha256 = "01bll978dis8pqvgrbigzgszkx3kjm6acrw44z6j7algw3an352r"; }; goPackagePath = "github.com/exoscale/cli"; From f320dbae41cf875ea669b2a8b6083bf2a54f70ce Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 15:50:13 +0200 Subject: [PATCH 045/499] lib/tests: Add test for freeform option docs --- lib/tests/misc.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index b066f577f323..03eff4ce48b7 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -542,4 +542,30 @@ runTests { name = ""; expected = "unknown"; }; + + testFreeformOptions = { + expr = + let + submodule = { lib, ... }: { + freeformType = lib.types.attrsOf (lib.types.submodule { + options.bar = lib.mkOption {}; + }); + options.bar = lib.mkOption {}; + }; + + module = { lib, ... }: { + options.foo = lib.mkOption { + type = lib.types.submodule submodule; + }; + }; + + options = (evalModules { + modules = [ module ]; + }).options; + + locs = filter (o: ! o.internal) (optionAttrSetToDocList options); + in map (o: o.loc) locs; + expected = [ [ "foo" ] [ "foo" "" "bar" ] [ "foo" "bar" ] ]; + }; + } From 11a3214fe6df185f7c2a5ee72fa352dc2dd95f42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 14:33:51 +0000 Subject: [PATCH 046/499] flyctl: 0.0.137 -> 0.0.140 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 53e9400e49c2..8a2cbbe3857c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.137"; + version = "0.0.140"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0zlcfmraf5v1crfkgxjgdjshkasyngmq1jqh7kzy3csm0p1a4sxx"; + sha256 = "19yap6n3fw8cf9y6bb6yzl24m4f49jv38j7dj4hs09a5qwh85rz4"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "1gxz9pp4zl8q7pmwg9z261fjrjfr658k1sn5nq1xzz51wrlzg9ag"; + vendorSha256 = "0vxfnq9ng7ybkw1xla7m2in2sg6hzvghczqnjrj96n07fln0s9rs"; doCheck = false; From 982f1708eaa6a71cc33570d256c957d1150c34f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 14:54:30 +0000 Subject: [PATCH 047/499] ft2-clone: 1.28 -> 1.31 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 1db5644fc322..aa4f12268916 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.28"; + version = "1.31"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "1hbcl89cpx9bsafxrjyfx6vrbs4h3lnzmqm12smcvdg8ksfgzj0d"; + sha256 = "02j876d4xmbdmqairrs5190dzdm3k4s5hi3g9wvx62cxnnw7igha"; }; nativeBuildInputs = [ cmake ]; From 505c4b4065a50fe32c7b2cd334063a1c3fbb2bb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 15:56:27 +0000 Subject: [PATCH 048/499] gauge: 1.1.1 -> 1.1.3 --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index c9a462f1832e..8755466ec8ce 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.1.1"; + version = "1.1.3"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l"; + sha256 = "11qllg1alv9khkgjarpzlsqg5ygisjprg79n2jqhv1w6izx88cqc"; }; meta = with stdenv.lib; { From 863724b3f3a4727c2c9109ce6a29f6e7846089ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 4 Sep 2020 18:43:43 +0200 Subject: [PATCH 049/499] blis: init at 0.7.0 --- .../libraries/science/math/blis/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/science/math/blis/default.nix diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix new file mode 100644 index 000000000000..42ba4f25204e --- /dev/null +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, fetchFromGitHub +, perl +, python3 + +# Enable BLAS interface with 64-bit integer width. +, blas64 ? false + +# Target architecture. x86_64 builds Intel and AMD kernels. +, withArchitecture ? "x86_64" + +# Enable OpenMP-based threading. +, withOpenMP ? true +}: + +let + blasIntSize = if blas64 then "64" else "32"; +in stdenv.mkDerivation rec { + pname = "blis"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "flame"; + repo = "blis"; + rev = version; + sha256 = "13g9kg7x8j9icg4frdq3wpl2cmp0jnh93mw48daa7ym399w17423"; + }; + + inherit blas64; + + nativeBuildInputs = [ + perl + python3 + ]; + + doCheck = true; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-cblas" + "--blas-int-size=${blasIntSize}" + ] ++ stdenv.lib.optionals withOpenMP [ "--enable-threading=openmp" ] + ++ [ withArchitecture ]; + + postPatch = '' + patchShebangs configure build/flatten-headers.py + ''; + + postInstall = '' + ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblas.so.3 $out/lib/libblas.so + ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so + ''; + + meta = with stdenv.lib; { + description = "BLAS-compatible linear algebra library"; + homepage = "https://github.com/flame/blis"; + license = licenses.bsd3; + maintainers = [ maintainers.danieldk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dffd32e9bc3a..9f883fba3c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1385,6 +1385,8 @@ in blink1-tool = callPackage ../tools/misc/blink1-tool { }; + blis = callPackage ../development/libraries/science/math/blis { }; + bliss = callPackage ../applications/science/math/bliss { }; blobfuse = callPackage ../tools/filesystems/blobfuse { }; From c7227e041b6e07eff7b46109b9c4d94c73f4b249 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Sep 2020 03:56:13 +0000 Subject: [PATCH 050/499] lego: 3.8.0 -> 4.0.1 --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4b2d88cdf275..18ec4ba4636e 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "3.8.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "02p7zlrz8fp5bsvhk4jrx5x3gxnl00friay1jihlzyk3s400n9jb"; + sha256 = "1s3sh4n12g7ylkpmxqjcpdw3gqhdjbh9r09h2rsrm30xr4qaqpng"; }; - vendorSha256 = "0jh7qi422i2114198fain9nwwf8yd8vna0p3g0hvginh59svyagc"; + vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp"; doCheck = false; From 8cc592abfa34e9e45a506b679099419a336313fc Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 4 May 2020 02:10:26 +0300 Subject: [PATCH 051/499] nixos/caddy: add support for v2 --- nixos/modules/services/web-servers/caddy.nix | 43 ++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 0e6e10a5f47d..4c024985dae5 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -5,12 +5,30 @@ with lib; let cfg = config.services.caddy; configFile = pkgs.writeText "Caddyfile" cfg.config; + + # v2-specific options + isCaddy2 = versionAtLeast cfg.package.version "2.0"; + tlsConfig = { + apps.tls.automation.policies = [{ + issuer = { + inherit (cfg) ca email; + module = "acme"; + }; + }]; + }; + adaptedConfig = importJSON (pkgs.runCommand "caddy-config-adapted.json" { } '' + ${cfg.package}/bin/caddy adapt \ + --config ${configFile} --adapter ${cfg.adapter} > $out + ''); + configJSON = pkgs.writeText "caddy-config.json" (builtins.toJSON + (recursiveUpdate adaptedConfig tlsConfig)); in { options.services.caddy = { enable = mkEnableOption "Caddy web server"; config = mkOption { default = ""; + # TODO: update example text on v2.0 release example = '' example.com { gzip @@ -24,6 +42,17 @@ in { description = "Verbatim Caddyfile to use"; }; + adapter = mkOption { + default = "caddyfile"; + example = "nginx"; + type = types.str; + description = '' + Name of the config adapter to use. + + See https://caddyserver.com/docs/config-adapters for the full list. + ''; + }; + ca = mkOption { default = "https://acme-v02.api.letsencrypt.org/directory"; example = "https://acme-staging-v02.api.letsencrypt.org/directory"; @@ -56,8 +85,14 @@ in { package = mkOption { default = pkgs.caddy; defaultText = "pkgs.caddy"; + example = "pkgs.caddy2"; type = types.package; - description = "Caddy package to use."; + description = '' + Caddy package to use. + + Note: to use Caddy v2, set this to . + v2 will become the default after it is released. + ''; }; }; @@ -68,10 +103,12 @@ in { after = [ "network-online.target" ]; wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service wantedBy = [ "multi-user.target" ]; - environment = mkIf (versionAtLeast config.system.stateVersion "17.09") + environment = mkIf (versionAtLeast config.system.stateVersion "17.09" && !isCaddy2) { CADDYPATH = cfg.dataDir; }; serviceConfig = { - ExecStart = '' + ExecStart = if isCaddy2 then '' + ${cfg.package}/bin/caddy run --config ${configJSON} + '' else '' ${cfg.package}/bin/caddy -log stdout -log-timestamps=false \ -root=/var/tmp -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} From d71cadacd9bc67b0bd4dc207442a8edb5d492943 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 8 May 2020 09:35:55 +0000 Subject: [PATCH 052/499] nixos/caddy: use v2 by default --- nixos/modules/services/web-servers/caddy.nix | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 4c024985dae5..65e9f12e6648 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -20,6 +20,7 @@ let ${cfg.package}/bin/caddy adapt \ --config ${configFile} --adapter ${cfg.adapter} > $out ''); + # TODO: validate with `caddy validate`? configJSON = pkgs.writeText "caddy-config.json" (builtins.toJSON (recursiveUpdate adaptedConfig tlsConfig)); in { @@ -28,18 +29,18 @@ in { config = mkOption { default = ""; - # TODO: update example text on v2.0 release example = '' example.com { - gzip - minify - log syslog - - root /srv/http + encode gzip + log + root /srv/http } ''; type = types.lines; - description = "Verbatim Caddyfile to use"; + description = '' + Verbatim Caddyfile to use. + Caddy v2 supports multiple config formats via adapters (see ). + ''; }; adapter = mkOption { @@ -47,8 +48,7 @@ in { example = "nginx"; type = types.str; description = '' - Name of the config adapter to use. - + Name of the config adapter to use. Not applicable to Caddy v1. See https://caddyserver.com/docs/config-adapters for the full list. ''; }; @@ -79,19 +79,20 @@ in { The data directory, for storing certificates. Before 17.09, this would create a .caddy directory. With 17.09 the contents of the .caddy directory are in the specified data directory instead. + + Caddy v2 replaced CADDYPATH with XDG directories. + See https://caddyserver.com/docs/conventions#file-locations. ''; }; package = mkOption { - default = pkgs.caddy; - defaultText = "pkgs.caddy"; - example = "pkgs.caddy2"; + default = pkgs.caddy2; + defaultText = "pkgs.caddy2"; + example = "pkgs.caddy"; type = types.package; description = '' Caddy package to use. - - Note: to use Caddy v2, set this to . - v2 will become the default after it is released. + To use Caddy v1 (obsolete), set this to . ''; }; }; @@ -99,7 +100,7 @@ in { config = mkIf cfg.enable { systemd.services.caddy = { description = "Caddy web server"; - # upstream unit: https://github.com/caddyserver/caddy/blob/master/dist/init/linux-systemd/caddy.service + # upstream unit: https://github.com/caddyserver/dist/blob/master/init/caddy.service after = [ "network-online.target" ]; wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service wantedBy = [ "multi-user.target" ]; From 06d2d845190aa33013346d415271f9d045db91cf Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 8 May 2020 09:39:24 +0000 Subject: [PATCH 053/499] nixosTests.caddy: update to v2 - Update configuration syntax - Add filalex77 as a maintainer --- nixos/tests/caddy.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 144d83179a16..e9a93df4f486 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "caddy"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ xfix ]; + maintainers = [ xfix filalex77 ]; }; nodes = { @@ -9,9 +9,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { services.caddy.enable = true; services.caddy.config = '' http://localhost { - gzip + encode gzip - root ${ + root * ${ pkgs.runCommand "testdir" {} '' mkdir "$out" echo hello world > "$out/example.html" @@ -23,9 +23,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { specialisation.etag.configuration = { services.caddy.config = lib.mkForce '' http://localhost { - gzip + encode gzip - root ${ + root * ${ pkgs.runCommand "testdir2" {} '' mkdir "$out" echo changed > "$out/example.html" From 660882d8830153422a79d6cbea45f2dbe272cf21 Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Fri, 24 Jul 2020 13:41:24 +0200 Subject: [PATCH 054/499] nixos/displayManager: add XDG_SESSION_ID to systemd user environment xss-lock needs XDG_SESSION_ID to respond to loginctl lock-session(s) (and possibly other session operations such as idle hint management). This change adds XDG_SESSION_ID to the list of imported environment variables when starting systemctl. Inspired by home-manager, add importVariables configuration. Set session to XDG_SESSION_ID when running xss-lock as a service. Co-authored-by: misuzu --- nixos/modules/programs/xss-lock.nix | 2 +- .../services/x11/display-managers/default.nix | 31 ++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix index a7ad9b89db4d..83ed71386407 100644 --- a/nixos/modules/programs/xss-lock.nix +++ b/nixos/modules/programs/xss-lock.nix @@ -34,7 +34,7 @@ in partOf = [ "graphical-session.target" ]; serviceConfig.ExecStart = with lib; strings.concatStringsSep " " ([ - "${pkgs.xss-lock}/bin/xss-lock" + "${pkgs.xss-lock}/bin/xss-lock" "--session \${XDG_SESSION_ID}" ] ++ (map escapeShellArg cfg.extraOptions) ++ [ "--" cfg.lockerCommand diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index aa6a5ec42be8..2fda88a8d979 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -55,13 +55,6 @@ let exec &> >(tee ~/.xsession-errors) ''} - # Tell systemd about our $DISPLAY and $XAUTHORITY. - # This is needed by the ssh-agent unit. - # - # Also tell systemd about the dbus session bus address. - # This is required by user units using the session bus. - /run/current-system/systemd/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS - # Load X defaults. This should probably be safe on wayland too. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then @@ -70,6 +63,12 @@ let ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults fi + # Import environment variables into the systemd user environment. + ${optionalString (cfg.displayManager.importedVariables != []) ( + "/run/current-system/systemd/bin/systemctl --user import-environment " + + toString (unique cfg.displayManager.importedVariables) + )} + # Speed up application start by 50-150ms according to # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html rm -rf "$HOME/.compose-cache" @@ -289,6 +288,14 @@ in ''; }; + importedVariables = mkOption { + type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*"); + visible = false; + description = '' + Environment variables to import into the systemd user environment. + ''; + }; + job = { preStart = mkOption { @@ -360,6 +367,16 @@ in services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; + services.xserver.displayManager.importedVariables = [ + # This is required by user units using the session bus. + "DBUS_SESSION_BUS_ADDRESS" + # These are needed by the ssh-agent unit. + "DISPLAY" + "XAUTHORITY" + # This is required to specify session within user units (e.g. loginctl lock-session). + "XDG_SESSION_ID" + ]; + systemd.user.targets.graphical-session = { unitConfig = { RefuseManualStart = false; From 5ee5bbef844a0c9017682d2363c69ad37943a894 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Sun, 6 Sep 2020 10:14:30 +0200 Subject: [PATCH 055/499] palemoon: Add libpulseaudio to wrapper --- pkgs/applications/networking/browsers/palemoon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index c59d23ecdba1..ef28e9234ed6 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -11,7 +11,7 @@ let - libPath = lib.makeLibraryPath [ ffmpeg_3 ]; + libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { From 2ed8043a8e72e605365aeea7382cbd3795357759 Mon Sep 17 00:00:00 2001 From: Providence Salumu Date: Sun, 6 Sep 2020 07:06:53 -0400 Subject: [PATCH 056/499] avro-tools: 1.9.1 -> 1.9.2 --- pkgs/development/tools/avro-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index c337afa5a6d9..e78f34449974 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "0d73qbfx59pa4mgsjwgl5dvc4895rm90pdwr4sbd77biscjad94s"; + sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1"; }; dontUnpack = true; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.nequissimus ]; + maintainers = with lib.maintainers; [ nequissimus ]; }; } From ea257a8c3053ae7ca965f6ee33d470a7bb467ee6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 6 Sep 2020 13:30:38 +0200 Subject: [PATCH 057/499] linux_5_8: 5.8.6 -> 5.8.7 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 5ea15aa5a1bc..5c5f8259406c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.6"; + version = "5.8.7"; # 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 = "180bka8a0f2ykaifgb323pzgh0n909mlrsk08l08zmifggnh19cc"; + sha256 = "1zhpzlhl2ykna2nc70m72wlgyv1pkvkpfssb4k8p5pwlkh1ga2vv"; }; } // (args.argsOverride or {})) From 59410f09692acd756611d3a453b33e64565a9574 Mon Sep 17 00:00:00 2001 From: meutraa Date: Sun, 6 Sep 2020 16:14:50 +0100 Subject: [PATCH 058/499] androidStudioPackages.{dev,canary}: 4.2.0.8 -> 4.2.0.9 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e84d2e9dac1a..515d88566122 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc="; }; latestVersion = { # canary & dev - version = "4.2.0.8"; # "Android Studio 4.2 Canary 8" - build = "202.6787931"; - sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62"; + version = "4.2.0.9"; # "Android Studio 4.2 Canary 9" + build = "202.6795674"; + sha256Hash = "sha256-IL7jdGC7X8mr5eyh8YqD6z9WF8MO5AtFXVaUEf+ThiY="; }; in { # Attributes are named by their corresponding release channels From 39eaecd14f5488af2dc98331a47616adce4d7d4b Mon Sep 17 00:00:00 2001 From: elseym Date: Wed, 12 Aug 2020 13:14:45 +0200 Subject: [PATCH 059/499] unifi-poller: init at 2.0.1 --- .../monitoring/unifi-poller/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/servers/monitoring/unifi-poller/default.nix diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix new file mode 100644 index 000000000000..7ddc53f38e8f --- /dev/null +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "unifi-poller"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "unifi-poller"; + repo = "unifi-poller"; + rev = "v${version}"; + sha256 = "16q9hrbl9qgilj3vb7865l1yx0xhm7m4sx5j1ys5vi63drq59g93"; + }; + + vendorSha256 = "1fgcbg34g0a0f85qv7bjanv2lpnnszcrspfppp2lnj9kv52j4c1w"; + + buildFlagsArray = '' + -ldflags=-w -s + -X github.com/prometheus/common/version.Branch=master + -X github.com/prometheus/common/version.BuildDate=unknown + -X github.com/prometheus/common/version.Revision=${src.rev} + -X github.com/prometheus/common/version.Version=${version}-0 + ''; + + meta = with stdenv.lib; { + description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; + homepage = "https://github.com/unifi-poller/unifi-poller"; + license = licenses.mit; + maintainers = with maintainers; [ elseym ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5120b333ce0..e6d4bf81a612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27826,4 +27826,7 @@ in navidrome = callPackage ../servers/misc/navidrome {}; zettlr = callPackage ../applications/misc/zettlr { }; + + unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; + } From b381aacbba16789700d6486963805715cd3b59ad Mon Sep 17 00:00:00 2001 From: elseym Date: Wed, 12 Aug 2020 14:08:14 +0200 Subject: [PATCH 060/499] nixos/unifi-poller: init unifi-poller service --- nixos/modules/module-list.nix | 1 + .../services/monitoring/unifi-poller.nix | 242 ++++++++++++++++++ 2 files changed, 243 insertions(+) create mode 100644 nixos/modules/services/monitoring/unifi-poller.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b516b1785195..c54bc6098d3e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -554,6 +554,7 @@ ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix ./services/monitoring/tuptime.nix + ./services/monitoring/unifi-poller.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/vnstat.nix diff --git a/nixos/modules/services/monitoring/unifi-poller.nix b/nixos/modules/services/monitoring/unifi-poller.nix new file mode 100644 index 000000000000..208f5e4875b4 --- /dev/null +++ b/nixos/modules/services/monitoring/unifi-poller.nix @@ -0,0 +1,242 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.unifi-poller; + + configFile = pkgs.writeText "unifi-poller.json" (generators.toJSON {} { + inherit (cfg) poller influxdb prometheus unifi; + }); + +in { + options.services.unifi-poller = { + enable = mkEnableOption "unifi-poller"; + + poller = { + debug = mkOption { + type = types.bool; + default = false; + description = '' + Turns on line numbers, microsecond logging, and a per-device log. + This may be noisy if you have a lot of devices. It adds one line per device. + ''; + }; + quiet = mkOption { + type = types.bool; + default = false; + description = '' + Turns off per-interval logs. Only startup and error logs will be emitted. + ''; + }; + plugins = mkOption { + type = with types; listOf str; + default = []; + description = '' + Load additional plugins. + ''; + }; + }; + + prometheus = { + disable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to disable the prometheus ouput plugin. + ''; + }; + http_listen = mkOption { + type = types.str; + default = "[::]:9130"; + description = '' + Bind the prometheus exporter to this IP or hostname. + ''; + }; + report_errors = mkOption { + type = types.bool; + default = false; + description = '' + Whether to report errors. + ''; + }; + }; + + influxdb = { + disable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to disable the influxdb ouput plugin. + ''; + }; + url = mkOption { + type = types.str; + default = "http://127.0.0.1:8086"; + description = '' + URL of the influxdb host. + ''; + }; + user = mkOption { + type = types.str; + default = "unifipoller"; + description = '' + Username for the influxdb. + ''; + }; + pass = mkOption { + type = types.path; + default = pkgs.writeText "unifi-poller-influxdb-default.password" "unifipoller"; + defaultText = "unifi-poller-influxdb-default.password"; + description = '' + Path of a file containing the password for influxdb. + This file needs to be readable by the unifi-poller user. + ''; + apply = v: "file://${v}"; + }; + db = mkOption { + type = types.str; + default = "unifi"; + description = '' + Database name. Database should exist. + ''; + }; + verify_ssl = mkOption { + type = types.bool; + default = true; + description = '' + Verify the influxdb's certificate. + ''; + }; + interval = mkOption { + type = types.str; + default = "30s"; + description = '' + Setting this lower than the Unifi controller's refresh + interval may lead to zeroes in your database. + ''; + }; + }; + + unifi = let + controllerOptions = { + user = mkOption { + type = types.str; + default = "unifi"; + description = '' + Unifi service user name. + ''; + }; + pass = mkOption { + type = types.path; + default = pkgs.writeText "unifi-poller-unifi-default.password" "unifi"; + defaultText = "unifi-poller-unifi-default.password"; + description = '' + Path of a file containing the password for the unifi service user. + This file needs to be readable by the unifi-poller user. + ''; + apply = v: "file://${v}"; + }; + url = mkOption { + type = types.str; + default = "https://unifi:8443"; + description = '' + URL of the Unifi controller. + ''; + }; + sites = mkOption { + type = with types; either (enum [ "default" "all" ]) (listOf str); + default = "all"; + description = '' + List of site names for which statistics should be exported. + Or the string "default" for the default site or the string "all" for all sites. + ''; + apply = toList; + }; + save_ids = mkOption { + type = types.bool; + default = false; + description = '' + Collect and save data from the intrusion detection system to influxdb. + ''; + }; + save_dpi = mkOption { + type = types.bool; + default = false; + description = '' + Collect and save data from deep packet inspection. + Adds around 150 data points and impacts performance. + ''; + }; + save_sites = mkOption { + type = types.bool; + default = true; + description = '' + Collect and save site data. + ''; + }; + hash_pii = mkOption { + type = types.bool; + default = false; + description = '' + Hash, with md5, client names and MAC addresses. This attempts + to protect personally identifiable information. + ''; + }; + verify_ssl = mkOption { + type = types.bool; + default = true; + description = '' + Verify the Unifi controller's certificate. + ''; + }; + }; + + in { + dynamic = mkOption { + type = types.bool; + default = false; + description = '' + Let prometheus select which controller to poll when scraping. + Use with default credentials. See unifi-poller wiki for more. + ''; + }; + + defaults = controllerOptions; + + controllers = mkOption { + type = with types; listOf (submodule { options = controllerOptions; }); + default = []; + description = '' + List of Unifi controllers to poll. Use defaults if empty. + ''; + apply = map (flip removeAttrs [ "_module" ]); + }; + }; + }; + + config = mkIf cfg.enable { + users.groups.unifi-poller = { }; + users.users.unifi-poller = { + description = "unifi-poller Service User"; + group = "unifi-poller"; + isSystemUser = true; + }; + + systemd.services.unifi-poller = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}"; + Restart = "always"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + DevicePolicy = "closed"; + NoNewPrivileges = true; + User = "unifi-poller"; + WorkingDirectory = "/tmp"; + }; + }; + }; +} From 8c49e5a78c6226d4dd88cd886d36519158d997ec Mon Sep 17 00:00:00 2001 From: elseym Date: Mon, 31 Aug 2020 13:38:54 +0200 Subject: [PATCH 061/499] tests/prometheus-exporters: allow overriding test-node-name allows the prometheus-exporters test abstraction to work with e.g. hyphenated exporter-names --- nixos/tests/prometheus-exporters.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index b912e3425e0e..7327dcae87d2 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -22,6 +22,9 @@ let * `metricProvider` (optional) * this attribute contains additional machine config * + * `nodeName` (optional) + * override an incompatible testnode name + * * Example: * exporterTests. = { * exporterConfig = { @@ -646,24 +649,27 @@ let }; }; in -mapAttrs (exporter: testConfig: (makeTest { +mapAttrs (exporter: testConfig: (makeTest (let + nodeName = testConfig.nodeName or exporter; + +in { name = "prometheus-${exporter}-exporter"; - nodes.${exporter} = mkMerge [{ + nodes.${nodeName} = mkMerge [{ services.prometheus.exporters.${exporter} = testConfig.exporterConfig; } testConfig.metricProvider or {}]; testScript = '' - ${exporter}.start() + ${nodeName}.start() ${concatStringsSep "\n" (map (line: if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")") then line - else "${exporter}.${line}" + else "${nodeName}.${line}" ) (splitString "\n" (removeSuffix "\n" testConfig.exporterTest)))} - ${exporter}.shutdown() + ${nodeName}.shutdown() ''; meta = with maintainers; { - maintainers = [ willibutz ]; + maintainers = [ willibutz elseym ]; }; -})) exporterTests +}))) exporterTests From aaf0002f68d3f8235006b813d763b9e14b3259cd Mon Sep 17 00:00:00 2001 From: elseym Date: Wed, 12 Aug 2020 14:10:08 +0200 Subject: [PATCH 062/499] prometheus-unifi-poller-exporter: init module --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/unifi-poller.nix | 34 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 13 +++++++ 3 files changed, 48 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 59748efe0ded..7e9b0e48bbcc 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -46,6 +46,7 @@ let "surfboard" "tor" "unifi" + "unifi-poller" "varnish" "wireguard" ] (name: diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix new file mode 100644 index 000000000000..394e6e201f03 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi-poller.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.unifi-poller; + + configFile = pkgs.writeText "prometheus-unifi-poller-exporter.json" (generators.toJSON {} { + poller = { inherit (cfg.log) debug quiet; }; + unifi = { inherit (cfg) controllers; }; + influxdb.disable = true; + prometheus = { + http_listen = "${cfg.listenAddress}:${toString cfg.port}"; + report_errors = cfg.log.prometheusErrors; + }; + }); + +in { + port = 9130; + + extraOpts = { + inherit (options.services.unifi-poller.unifi) controllers; + log = { + debug = mkEnableOption "debug logging including line numbers, high resolution timestamps, per-device logs."; + quiet = mkEnableOption "startup and error logs only."; + prometheusErrors = mkEnableOption "emitting errors to prometheus."; + }; + }; + + serviceOpts.serviceConfig = { + ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}"; + DynamicUser = false; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 7327dcae87d2..fdcc40721324 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -593,6 +593,19 @@ let ''; }; + unifi-poller = { + nodeName = "unifi_poller"; + exporterConfig.enable = true; + exporterConfig.controllers = [ { } ]; + exporterTest = '' + wait_for_unit("prometheus-unifi-poller-exporter.service") + wait_for_open_port(9130) + succeed( + "curl -sSf localhost:9130/metrics | grep -q 'unifipoller_build_info{.\\+} 1'" + ) + ''; + }; + varnish = { exporterConfig = { enable = true; From fd196452f03f77aea5f2cd5babda21534e3c7f2d Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sun, 6 Sep 2020 17:56:44 +0200 Subject: [PATCH 063/499] systemd-confinement: handle ExecStarts etc being lists systemd-confinement's automatic package extraction does not work correctly if ExecStarts ExecReload etc are lists. Add an extra flatten to make things smooth. Fixes #96840. --- nixos/modules/security/systemd-confinement.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index 0a400f1d535b..2927d424a8a2 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -135,7 +135,7 @@ in { ]; execPkgs = lib.concatMap (opt: let isSet = config.serviceConfig ? ${opt}; - in lib.optional isSet config.serviceConfig.${opt}) execOpts; + in lib.flatten (lib.optional isSet config.serviceConfig.${opt})) execOpts; unitAttrs = toplevelConfig.systemd.units."${name}.service"; allPkgs = lib.singleton (builtins.toJSON unitAttrs); unitPkgs = if fullUnit then allPkgs else execPkgs; From 74b3d66baf2f3effb4702832fc45828291a358d8 Mon Sep 17 00:00:00 2001 From: davidak Date: Sat, 5 Sep 2020 02:12:43 +0200 Subject: [PATCH 064/499] nixos/config: add defaultPackages option readd perl (used in shell scripts), rsync (needed for NixOps) and strace (common debugging tool) they where previously removed in https://github.com/NixOS/nixpkgs/pull/91213 Co-authored-by: Timo Kaufmann Co-authored-by: 8573 <8573@users.noreply.github.com> --- nixos/doc/manual/release-notes/rl-2009.xml | 6 +++++- nixos/modules/config/system-path.nix | 23 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index ce78bda85051..3b5cb470df01 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -1016,7 +1016,11 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; Nginx module nginxModules.fastcgi-cache-purge renamed to official name nginxModules.cache-purge. Nginx module nginxModules.ngx_aws_auth renamed to official name nginxModules.aws-auth. - The packages perl, rsync and strace were removed from . If you need them, install them again with = with pkgs; [ perl rsync strace ]; in your configuration.nix. + + + + + The option was added. It installs the packages perl, rsync and strace for now. They were added unconditionally to before, but are not strictly necessary for a minimal NixOS install. You can set it to an empty list to have a more minimal system. Be aware that some functionality might still have an impure dependency on those packages, so things might break. diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index b3c5c6f93f36..67305e8499cb 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -41,6 +41,12 @@ let pkgs.zstd ]; + defaultPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) + [ pkgs.perl + pkgs.rsync + pkgs.strace + ]; + in { @@ -63,6 +69,21 @@ in ''; }; + defaultPackages = mkOption { + type = types.listOf types.package; + default = defaultPackages; + example = literalExample "[]"; + description = '' + Set of packages users expect from a minimal linux istall. + Like systemPackages, they appear in + /run/current-system/sw. These packages are + automatically available to all users, and are + automatically updated every time you rebuild the system + configuration. + If you want a more minimal system, set it to an empty list. + ''; + }; + pathsToLink = mkOption { type = types.listOf types.str; # Note: We need `/lib' to be among `pathsToLink' for NSS modules @@ -102,7 +123,7 @@ in config = { - environment.systemPackages = requiredPackages; + environment.systemPackages = requiredPackages ++ config.environment.defaultPackages; environment.pathsToLink = [ "/bin" From a5872edf2f61d97a4ada2734d543eaaefe25c916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 3 Sep 2020 05:00:53 +0200 Subject: [PATCH 065/499] nixos/installer: enable sshd by default Right now the UX for installing NixOS on a headless system is very bad. To enable sshd without physical steps users have to have either physical access or need to be very knowledge-able to figure out how to modify the installation image by hand to put an `sshd.service` symlink in the right directory in /nix/store. This is in particular a problem on ARM SBCs (single board computer) but also other hardware where network is the only meaningful way to access the hardware. This commit enables sshd by default. This does not give anyone access to the NixOS installer since by default. There is no user with a non-empty password or key. It makes it easy however to add ssh keys to the installation image (usb stick, sd-card on arm boards) by simply mounting it and adding a keys to `/root/.ssh/authorized_keys`. Importantly this should not require nix/nixos on the machine that prepare the installation device and even feasiable on non-linux systems by using ext4 third party drivers. Potential new threats: Since this enables sshd by default a potential bug in openssh could lead to remote code execution. Openssh has a very good track-record over the last 20 years, which makes it far more likely that Linux itself would have a remote code execution vulnerability. It is trusted by millions of servers on many operating systems to be exposed to the internet by default. Co-authored-by: Samuel Dionne-Riel --- nixos/doc/manual/installation/installing.xml | 10 +++++++--- nixos/doc/manual/release-notes/rl-2009.xml | 4 ++++ nixos/modules/profiles/installation-device.nix | 15 ++++++++------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index c7ed3b3c0c97..a9f60df92488 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -70,9 +70,13 @@ If you would like to continue the installation from a different machine you - need to activate the SSH daemon via systemctl start - sshd. You then must set a password for either root or - nixos with passwd to be able to login. + can use activated SSH daemon. You need to copy your ssh key to either + /home/nixos/.ssh/authorized_keys or + /root/.ssh/authorized_keys (Tip: For installers with a + modifyable filesystem such as the sd-card installer image a key can be be manual + placed by mounting the image on a different machine). Alternatively you must set + a password for either root or nixos with + passwd to be able to login. diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index ce78bda85051..ddbd38fac019 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -864,6 +864,10 @@ CREATE ROLE postgres LOGIN SUPERUSER; Default algorithm for ZRAM swap was changed to zstd. + + The installer now enables sshd by default. This improves installation on headless machines especially ARM single-board-computer. + To login through ssh, either a password or an ssh key must be set for the root user or the nixos user. + The scripted networking system now uses .link files in diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index d05c0c50e82c..e68ea1b08776 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -51,22 +51,23 @@ with lib; services.mingetty.helpLine = '' The "nixos" and "root" accounts have empty passwords. - Type `sudo systemctl start sshd` to start the SSH daemon. - You then must set a password for either "root" or "nixos" - with `passwd` to be able to login. + An ssh daemon is running. You then must set a password + for either "root" or "nixos" with `passwd` or add an ssh key + to /home/nixos/.ssh/authorized_keys be able to login. '' + optionalString config.services.xserver.enable '' Type `sudo systemctl start display-manager' to start the graphical user interface. ''; - # Allow sshd to be started manually through "systemctl start sshd". + # We run sshd by default. Login via root is only possible after adding a + # password via "passwd" or by adding a ssh key to /home/nixos/.ssh/authorized_keys. + # The latter one is particular useful if keys are manually added to + # installation device for head-less systems i.e. arm boards by manually + # mounting the storage in a different system. services.openssh = { enable = true; - # Allow password login to the installation, if the user sets a password via "passwd" - # It is safe as root doesn't have a password by default and SSH is disabled by default permitRootLogin = "yes"; }; - systemd.services.sshd.wantedBy = mkOverride 50 []; # Enable wpa_supplicant, but don't start it by default. networking.wireless.enable = mkDefault true; From 068400bdfcbbc3a0343a40311b01632cc132283e Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Sun, 6 Sep 2020 20:31:59 +0200 Subject: [PATCH 066/499] tdm: 2.07 -> 2.08 --- pkgs/games/tdm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index d0133df59ddf..055ab9d38e8c 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -4,7 +4,7 @@ let pname = "tdm"; - version = "2.07"; + version = "2.08"; desktop = makeDesktopItem { desktopName = pname; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z"; - sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; + sha256 = "0bmv07j6s6q3m7hnpx7cwrycjkbvlf0y9sg9migakni0jg9yz5ps"; }; nativeBuildInputs = [ p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper @@ -39,13 +39,15 @@ in stdenv.mkDerivation { preBuild = '' pushd tdm_update scons BUILD=release TARGET_ARCH=x64 - install -Dm755 tdm_update.linux $out/share/libexec/tdm_update.linux + install -Dm755 bin/tdm_update.linux64 $out/share/libexec/tdm_update.linux popd ''; # why oh why can it find ld but not strip? postPatch = '' sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct + # This adds math.h needed for math::floor + sed -i 's|#include "Util.h"|#include "Util.h"\n#include |' tdm_update/ConsoleUpdater.cpp ''; installPhase = '' From 60d30e13f7fef6faec53a411340f0f151b32a2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 6 Sep 2020 19:44:30 +0100 Subject: [PATCH 067/499] Update nixos/doc/manual/installation/installing.xml Co-authored-by: Samuel Dionne-Riel --- nixos/doc/manual/installation/installing.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index a9f60df92488..e14b6fd07c7e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -73,7 +73,7 @@ can use activated SSH daemon. You need to copy your ssh key to either /home/nixos/.ssh/authorized_keys or /root/.ssh/authorized_keys (Tip: For installers with a - modifyable filesystem such as the sd-card installer image a key can be be manual + modifiable filesystem such as the sd-card installer image a key can be be manually placed by mounting the image on a different machine). Alternatively you must set a password for either root or nixos with passwd to be able to login. From 8ec4d97e9ca2abfbeb68a2ddd9514967cf7c4ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 6 Sep 2020 15:50:54 -0300 Subject: [PATCH 068/499] ubuntu-themes: 19.04 -> 20.10 --- pkgs/data/themes/ubuntu-themes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index 6be3ce1d80bd..14779e8d7a38 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -7,21 +7,21 @@ , gtk3 , hicolor-icon-theme , humanity-icon-theme -, python2Packages +, python3Packages }: stdenv.mkDerivation rec { pname = "ubuntu-themes"; - version = "19.04"; + version = "20.10"; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}.orig.tar.gz"; - sha256 = "1dy2dmiq2dj80nl2y4mf4ks0c7qmmnpk25wzv2rynwa3s2gkxgih"; + sha256 = "00frn2dd4kjhlmwkasrx4a820fwrg8f8hmiwh51m63bpj00vwn0r"; }; nativeBuildInputs = [ gtk3 - python2Packages.python + python3Packages.python ]; propagatedBuildInputs = [ From e10228defa08877593ca31d50e38a430e3cb3c64 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Wed, 2 Sep 2020 23:55:05 +0100 Subject: [PATCH 069/499] suitesparse: remove custom fixDarwinDylibNames postInstall This shadows the regular fixDarwinDylibNames function, which is a nativeBuildInput, and prevents it from converting some relative paths to absolute. According to the comment this can be removed as of 5.7.2. --- .../science/math/suitesparse/default.nix | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index f0480e1e2381..d50e065efc61 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -57,29 +57,6 @@ stdenv.mkDerivation rec { "library" ]; - # Likely fixed after 5.7.2 - # https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/f6daae26ee391e475e2295e77c839aa7c1a8b784 - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries. - # We manually fix them up here. - fixDarwinDylibNames() { - local flags=() - local old_id - - for fn in "$@"; do - flags+=(-change "$PWD/lib/$(basename "$fn")" "$fn") - done - - for fn in "$@"; do - if [ -L "$fn" ]; then continue; fi - echo "$fn: fixing dylib" - install_name_tool -id "$fn" "''${flags[@]}" "$fn" - done - } - - fixDarwinDylibNames $(find "$out" -name "*.dylib") - ''; - meta = with stdenv.lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; From 1cb7ba32623e4b9de730dfebac546b3573af25a5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 6 Sep 2020 23:20:00 -0500 Subject: [PATCH 070/499] the-way: 0.6.1 -> 0.7.0 --- pkgs/development/tools/the-way/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index a41c7283b0f8..24418a42d420 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0h33jsai8gvfp0js06qa8cqpzfbjkd001kfj6p24d08ds2i00asx"; + sha256 = "1whmvzpqm8x1q45mzrp4p40nj251drcryj9z4qjxgjlfsd5d1fxq"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "1r0mv1q1bz67zbxnd5qmji4svcbln8h5h0gysfddpn4dy9424fp3"; + cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; #checkFlags = "--test-threads=1"; doCheck = false; From 746e63ddf88c6c708d7a8d43c4ead0ee2f79a021 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 7 Sep 2020 04:20:00 +0000 Subject: [PATCH 071/499] noti: 3.4.0 -> 3.5.0 https://github.com/variadico/noti/releases/tag/3.5.0 --- pkgs/tools/misc/noti/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 3a3a1a77037d..883e353b0b0b 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "noti"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; rev = version; - sha256 = "0bcwfyd93fx0rzjc9jgg4pvvqbpxwizr044yqqa5rx70gaasz7qa"; + sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd"; }; buildInputs = lib.optional stdenv.isDarwin Cocoa; From 22cf34bc2516e01c5f6ccf4074db8947d81f4b15 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 7 Sep 2020 04:20:00 +0000 Subject: [PATCH 072/499] gitAndTools.git-subtrac: 0.03 -> 0.04 --- .../git-and-tools/git-subtrac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 75ca58d43316..4e9c3b7a5ccc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.03"; + version = "0.04"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1ky04h18vg1yl9lykbhkmf25qslg0z2qzziy8c7afmvzvvvhm2v5"; + sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx"; }; - vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf"; + vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny"; doCheck = false; From d1b9bc601980e5a92124d168db587f14719506da Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 7 Sep 2020 04:20:00 +0000 Subject: [PATCH 073/499] the-way: install completions --- pkgs/development/tools/the-way/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 24418a42d420..dce18580577c 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, AppKit, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "the-way"; @@ -11,12 +11,22 @@ rustPlatform.buildRustPackage rec { sha256 = "1whmvzpqm8x1q45mzrp4p40nj251drcryj9z4qjxgjlfsd5d1fxq"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; #checkFlags = "--test-threads=1"; doCheck = false; + postInstall = '' + $out/bin/the-way config default tmp.toml + for shell in bash fish zsh; do + THE_WAY_CONFIG=tmp.toml $out/bin/the-way complete $shell > the-way.$shell + installShellCompletion the-way.$shell + done + ''; + meta = with stdenv.lib; { description = "Terminal code snippets manager"; homepage = "https://github.com/out-of-cheese-error/the-way"; From 3dc4a826cb7671b30c2ee719d64568c799642ddf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 06:02:31 +0000 Subject: [PATCH 074/499] windowchef: 0.5.0 -> 0.5.1 --- pkgs/applications/window-managers/windowchef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix index 08a30b6085c5..efba3863276d 100644 --- a/pkgs/applications/window-managers/windowchef/default.nix +++ b/pkgs/applications/window-managers/windowchef/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "windowchef"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "tudurom"; repo = "windowchef"; rev = "v${version}"; - sha256 = "02fvb8fxnkpzb0vpbsl6rf7ssdrvw6mlm43qvl2sxq7zb88zdw96"; + sha256 = "0fs5ss2z6qjxvmls0g2f3gmv8hshi81xsmmcjn9x7651rv9552pl"; }; buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto]; From bbde0265f82a713d65ecf02eddac98a33c66f8c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 06:37:40 +0000 Subject: [PATCH 075/499] yder: 1.4.11 -> 1.4.12 --- pkgs/development/libraries/yder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index b6f60ede98c2..df36f48648d4 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -4,13 +4,13 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.11"; + version = "1.4.12"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "0gm6l9y4jkxbq6vskdv1ivlq795ic28nhiyq21mzk3mx6j8klwip"; + sha256 = "1cmla7rpwvsj1b3jhp9q8y3ni5n8rsqxib87yhh07b7xnlhy0gcj"; }; patches = [ From 6322325a53cc7c681992fe5899fbfaf4f007957f Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 8 May 2020 22:23:33 +0300 Subject: [PATCH 076/499] caddy: 1.0.5 -> 2.0.0 Rename legacy v1 to `caddy1` --- nixos/modules/services/web-servers/caddy.nix | 8 ++--- pkgs/servers/caddy/default.nix | 22 ++++-------- pkgs/servers/caddy/v1.nix | 36 ++++++++++++++++++++ pkgs/servers/caddy/v2.nix | 26 -------------- pkgs/top-level/all-packages.nix | 8 ++--- 5 files changed, 48 insertions(+), 52 deletions(-) create mode 100644 pkgs/servers/caddy/v1.nix delete mode 100644 pkgs/servers/caddy/v2.nix diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 65e9f12e6648..e5f1df774bbc 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -86,13 +86,13 @@ in { }; package = mkOption { - default = pkgs.caddy2; - defaultText = "pkgs.caddy2"; - example = "pkgs.caddy"; + default = pkgs.caddy; + defaultText = "pkgs.caddy"; + example = "pkgs.caddy1"; type = types.package; description = '' Caddy package to use. - To use Caddy v1 (obsolete), set this to . + To use Caddy v1 (obsolete), set this to pkgs.caddy1. ''; }; }; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 05b69c30e6ce..5a7ac8f086f9 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,35 +2,25 @@ buildGoModule rec { pname = "caddy"; - version = "1.0.5"; + version = "2.0.0"; - subPackages = [ "caddy" ]; + subPackages = [ "cmd/caddy" ]; src = fetchFromGitHub { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; + sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; }; + vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; - doCheck = false; - - preBuild = '' - cat << EOF > caddy/main.go - package main - import "github.com/caddyserver/caddy/caddy/caddymain" - func main() { - caddymain.EnableTelemetry = false - caddymain.Run() - } - EOF - ''; + modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; + maintainers = with maintainers; [ filalex77 ]; }; } diff --git a/pkgs/servers/caddy/v1.nix b/pkgs/servers/caddy/v1.nix new file mode 100644 index 000000000000..bcd4b7065b58 --- /dev/null +++ b/pkgs/servers/caddy/v1.nix @@ -0,0 +1,36 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "caddy"; + version = "1.0.5"; + + goPackagePath = "github.com/caddyserver/caddy"; + + subPackages = [ "caddy" ]; + + src = fetchFromGitHub { + owner = "caddyserver"; + repo = pname; + rev = "v${version}"; + sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; + }; + modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; + + preBuild = '' + cat << EOF > caddy/main.go + package main + import "github.com/caddyserver/caddy/caddy/caddymain" + func main() { + caddymain.EnableTelemetry = false + caddymain.Run() + } + EOF + ''; + + meta = with stdenv.lib; { + homepage = "https://caddyserver.com"; + description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + license = licenses.asl20; + maintainers = with maintainers; [ rushmorem fpletz zimbatm filalex77 ]; + }; +} diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix deleted file mode 100644 index 4021e8298003..000000000000 --- a/pkgs/servers/caddy/v2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "caddy"; - version = "2.1.1"; - - subPackages = [ "cmd/caddy" ]; - - src = fetchFromGitHub { - owner = "caddyserver"; - repo = pname; - rev = "v${version}"; - sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; - }; - - vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; - - doCheck = false; - - meta = with stdenv.lib; { - homepage = "https://caddyserver.com"; - description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; - license = licenses.asl20; - maintainers = with maintainers; [ filalex77 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a5414477e9d..dba9d0c793b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1507,12 +1507,8 @@ in ''; }); - caddy = callPackage ../servers/caddy { - buildGoModule = buildGo114Module; - }; - caddy2 = callPackage ../servers/caddy/v2.nix { - buildGoModule = buildGo114Module; - }; + caddy = callPackage ../servers/caddy { }; + caddy1 = callPackage ../servers/caddy/v1.nix { }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { From c3a7c89a20fbb602a176cd6e82bd6609d2eb9bf7 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 8 May 2020 22:36:31 +0300 Subject: [PATCH 077/499] release-notes/rl-2009: add item about Caddy v2 --- nixos/doc/manual/release-notes/rl-2009.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7d11d422e302..bf805ab9858f 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -782,6 +782,15 @@ CREATE ROLE postgres LOGIN SUPERUSER; config.systemd.services.${name}.path now returns a list of paths instead of a colon-separated string. + + + Caddy module now uses Caddy v2 by default. Caddy v1 can still be used by setting + to pkgs.caddy1. + + + New option has been added. + + From 6781a5f7848847cef958d85465e29263c8224240 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 7 Sep 2020 00:42:00 -0700 Subject: [PATCH 078/499] k3s: 1.18.2 -> 1.18.8 --- .../applications/networking/cluster/k3s/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index eedc34d7d488..9b1170ca57e0 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -42,9 +42,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.18.2+k3s1"; # k3s git tag + k3sVersion = "1.18.8+k3s1"; # k3s git tag traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.3.0"; # taken from .s/cripts/download at the above k3s tag + k3sRootVersion = "0.4.1"; # taken from ./scripts/download at the above k3s tag + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag # bundled into the k3s binary traefikChart = fetchurl { url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; @@ -62,12 +63,12 @@ let k3sRoot = fetchzip { # Note: marked as apache 2.0 license url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; - sha256 = "12xafn5jivl8lqdcs25b28xrc4mf7yf1xif5np169nvvxgvmpdxp"; + sha256 = "0ppj8y9g410hn6mjkfgfsi2j9yv7rcpic21znpmbrkx8b2070hf0"; stripRoot = false; }; k3sPlugins = buildGoPackage rec { name = "k3s-cni-plugins"; - version = "0.7.6-k3s1"; # from ./scripts/version.sh 'VERSION_CNIPLUGINS'; update when k3s's repo is updated. + version = k3sCNIVersion; goPackagePath = "github.com/containernetworking/plugins"; subPackages = [ "." ]; @@ -76,7 +77,7 @@ let owner = "rancher"; repo = "plugins"; rev = "v${version}"; - sha256 = "0ax72z1ziann352bp6khfds8vlf3bbkqckrkpx4l4jxgqks45izs"; + sha256 = "13kx9msn5y9rw8v1p717wx0wbjqln59g6y3qfb1760aiwknva35q"; }; meta = { @@ -93,7 +94,7 @@ let url = "https://github.com/rancher/k3s"; rev = "v${k3sVersion}"; leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "01ww3d71mlri2fk6z54rbd697aqwj942kbg323k0hfsnx7flkhps"; + sha256 = "17qsvbj1lvgxqdkxayyqnjwsjs3cx06nfv2hqvixjszn4vf30qlg"; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. From f7e0ff0f3533778154a9c08fc5073bc2fc9947fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 7 Sep 2020 10:32:01 +0200 Subject: [PATCH 079/499] flashrom: fix aarch64 build --- pkgs/tools/misc/flashrom/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 6b190fcf842e..ab0fa0846ea1 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; + mesonFlags = lib.optional stdenv.isAarch64 [ "-Dpciutils=false" ]; nativeBuildInputs = [ meson pkgconfig ninja ]; buildInputs = [ libftdi1 libusb1 pciutils ]; @@ -27,7 +28,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; platforms = platforms.all; - # https://github.com/flashrom/flashrom/issues/125 - badPlatforms = [ "aarch64-linux" ]; }; } From 5200ee8cc06155860f9e5e9e97cdec2feaff12ff Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Mon, 7 Sep 2020 11:09:32 +0200 Subject: [PATCH 080/499] bpytop: 1.0.21 -> 1.0.25 --- pkgs/tools/system/bpytop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index a408f44ec10c..a4505360b5b1 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.21"; + version = "1.0.25"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "10cygn4srmzk1b279hrlp4rjbldkzq7354fhm0jbmd3rp15b454p"; + sha256 = "0sxwrckv2j1283h888pyyxply2g93x6jn6cghqh207igmcg4iaj3"; }; buildInputs = [ makeWrapper ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e "s#/usr/\[local/\]#$out/#g" \ -e "s#/usr/{td}#$out/#g" \ + -e "s#THEME_DIR: str = \"\"#THEME_DIR: str = \"$out/share/bpytop/themes\"#" \ ./bpytop.py ''; From 9123308be5f45a1ff2bc0d93ed095dafc6ca0630 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 7 Sep 2020 13:08:42 +0800 Subject: [PATCH 081/499] nixos/mailhog: run with DynamicUser --- nixos/modules/services/mail/mailhog.nix | 68 +++++++++++++++++++------ 1 file changed, 53 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix index 0f998c6d0ea6..b113f4ff3dec 100644 --- a/nixos/modules/services/mail/mailhog.nix +++ b/nixos/modules/services/mail/mailhog.nix @@ -4,17 +4,59 @@ with lib; let cfg = config.services.mailhog; -in { + + args = lib.concatStringsSep " " ( + [ + "-api-bind-addr :${toString cfg.apiPort}" + "-smtp-bind-addr :${toString cfg.smtpPort}" + "-ui-bind-addr :${toString cfg.uiPort}" + "-storage ${cfg.storage}" + ] ++ lib.optional (cfg.storage == "maildir") + "-maildir-path $STATE_DIRECTORY" + ++ cfg.extraArgs + ); + +in +{ ###### interface + imports = [ + (mkRemovedOptionModule [ "services" "mailhog" "user" ] "") + ]; + options = { services.mailhog = { enable = mkEnableOption "MailHog"; - user = mkOption { - type = types.str; - default = "mailhog"; - description = "User account under which mailhog runs."; + + storage = mkOption { + type = types.enum [ "maildir" "memory" ]; + default = "memory"; + description = "Store mails on disk or in memory."; + }; + + apiPort = mkOption { + type = types.port; + default = 8025; + description = "Port on which the API endpoint will listen."; + }; + + smtpPort = mkOption { + type = types.port; + default = 1025; + description = "Port on which the SMTP endpoint will listen."; + }; + + uiPort = mkOption { + type = types.port; + default = 8025; + description = "Port on which the HTTP UI will listen."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = "List of additional arguments to pass to the MailHog process."; }; }; }; @@ -24,20 +66,16 @@ in { config = mkIf cfg.enable { - users.users.mailhog = { - name = cfg.user; - description = "MailHog service user"; - isSystemUser = true; - }; - systemd.services.mailhog = { - description = "MailHog service"; + description = "MailHog - Web and API based SMTP testing"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.mailhog}/bin/MailHog"; - User = cfg.user; + Type = "exec"; + ExecStart = "${pkgs.mailhog}/bin/MailHog ${args}"; + DynamicUser = true; + Restart = "on-failure"; + StateDirectory = "mailhog"; }; }; }; From d6264419f5c2ea3601f65f607f5ea8b187548bc7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 1 Sep 2020 00:01:30 +0800 Subject: [PATCH 082/499] nixos/nfsd: run rpc-statd as a normal user --- .../services/network-filesystems/nfsd.nix | 62 ++++++++++--------- nixos/modules/tasks/filesystems/nfs.nix | 9 +-- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 1b62bfa82035..398ef73449fa 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -8,6 +8,8 @@ let exports = pkgs.writeText "exports" cfg.exports; + rpcUser = "statd"; + in { @@ -140,36 +142,40 @@ in environment.etc.exports.source = exports; - systemd.services.nfs-server = - { enable = true; - wantedBy = [ "multi-user.target" ]; + systemd.services.nfs-server = { + enable = true; + wantedBy = [ "multi-user.target" ]; + }; - preStart = - '' - mkdir -p /var/lib/nfs/v4recovery - ''; + systemd.services.nfs-mountd = { + enable = true; + restartTriggers = [ exports ]; + + preStart = optionalString cfg.createMountPoints '' + # create export directories: + # skip comments, take first col which may either be a quoted + # "foo bar" or just foo (-> man export) + sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \ + | xargs -d '\n' mkdir -p + ''; + }; + + # rpc-statd will drop privileges by changing user from root to the owner of + # /var/lib/nfs + systemd.tmpfiles.rules = [ + "d /var/lib/nfs 0700 ${rpcUser} ${rpcUser} - -" + ] ++ map (e: + "d /var/lib/nfs/${e} 0755 root root - -" + ) [ "recovery" "v4recovery" "sm" "sm.bak" ]; + + users = { + groups."${rpcUser}" = {}; + users."${rpcUser}" = { + description = "NFS RPC user"; + group = rpcUser; + isSystemUser = true; }; - - systemd.services.nfs-mountd = - { enable = true; - restartTriggers = [ exports ]; - - preStart = - '' - mkdir -p /var/lib/nfs - - ${optionalString cfg.createMountPoints - '' - # create export directories: - # skip comments, take first col which may either be a quoted - # "foo bar" or just foo (-> man export) - sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \ - | xargs -d '\n' mkdir -p - '' - } - ''; - }; - + }; }; } diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index ddcc0ed8f5a4..67e5aa0bd58f 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -101,13 +101,6 @@ in }; systemd.services.rpc-statd = - { restartTriggers = [ nfsConfFile ]; - - preStart = - '' - mkdir -p /var/lib/nfs/{sm,sm.bak} - ''; - }; - + { restartTriggers = [ nfsConfFile ]; }; }; } From ecb73fd5557d6d438aa7c155e5b1aad89373c6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Mon, 7 Sep 2020 12:26:28 +0200 Subject: [PATCH 083/499] test-driver.py: fix VM state directory deletion The previous version of the code would only kick in if the state directory path pointed at a *file*, which never occurs. Making that codepath actually work reveals an ordering bug, which this patch fixes as well. It also replaces the confusing, imperative case log message "delete VM state directory" with "deleting VM state directory". Finally, we hint the user about how to prevent this deletion. IE. by passing the --keep-vm-state flag. Bug report: https://github.com/NixOS/nixpkgs/pull/91046#issuecomment-685568750 Credit goes to Edef for the rebase on top of a recent nixpkgs commit and for writing most of this commit message. Co-authored-by: edef --- nixos/lib/test-driver/test-driver.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 93f94587c0a5..5d3e632fac2c 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -217,7 +217,7 @@ class Machine: match = re.search("run-(.+)-vm$", cmd) if match: self.name = match.group(1) - + self.logger = args["log"] self.script = args.get("startCommand", self.create_startcommand(args)) tmp_dir = os.environ.get("TMPDIR", tempfile.gettempdir()) @@ -227,7 +227,10 @@ class Machine: os.makedirs(path, mode=0o700, exist_ok=True) return path - self.state_dir = create_dir("vm-state-{}".format(self.name)) + self.state_dir = os.path.join(tmp_dir, f"vm-state-{self.name}") + if not args["keepVmState"]: + self.cleanup_statedir() + os.makedirs(self.state_dir, mode=0o700, exist_ok=True) self.shared_dir = create_dir("shared-xchg") self.booted = False @@ -235,7 +238,6 @@ class Machine: self.pid: Optional[int] = None self.socket = None self.monitor: Optional[socket.socket] = None - self.logger: Logger = args["log"] self.allow_reboot = args.get("allowReboot", False) @staticmethod @@ -780,9 +782,10 @@ class Machine: self.log("QEMU running (pid {})".format(self.pid)) def cleanup_statedir(self) -> None: - self.log("delete the VM state directory") - if os.path.isfile(self.state_dir): + if os.path.isdir(self.state_dir): shutil.rmtree(self.state_dir) + self.logger.log(f"deleting VM state directory {self.state_dir}") + self.logger.log("if you want to keep the VM state, pass --keep-vm-state") def shutdown(self) -> None: if not self.booted: @@ -940,10 +943,10 @@ if __name__ == "__main__": for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket - machines = [create_machine({"startCommand": s}) for s in vm_scripts] - for machine in machines: - if not cli_args.keep_vm_state: - machine.cleanup_statedir() + machines = [ + create_machine({"startCommand": s, "keepVmState": cli_args.keep_vm_state}) + for s in vm_scripts + ] machine_eval = [ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) ] From 9bf4524e15319d0bc579954a29d5ca01c360bc6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 10:29:59 +0000 Subject: [PATCH 084/499] armadillo: 9.900.2 -> 9.900.3 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 90a17b6ad8d4..a4d359b985b2 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.900.2"; + version = "9.900.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "01bdw8y2nhj296px6vfh0ibc4gpfa08qh1gb33vzgp9a8k4mi1np"; + sha256 = "02pwhf3y2qq50dswjvfcijaw938d1zi1hxr17msv2x1ahlvff5fn"; }; nativeBuildInputs = [ cmake ]; From 1d4656225d4f1e93ea9801c72eb0b1b0bffa245d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 13:39:27 +0200 Subject: [PATCH 085/499] lib/types: Allow types to emit a deprecation warning Previously the only way to deprecate a type was using theType = lib.warn "deprecated" (mkOptionType ...) This caused the warning to be emitted when the type was evaluated, but the error didn't include which option actually used that type. With this commit, types can specify a deprecationMessage, which when non-null, is printed along with the option that uses the type --- lib/modules.nix | 6 +++++- lib/types.nix | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index decb96ffe111..412c7f1df712 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -457,7 +457,11 @@ rec { # yield a value computed from the definitions value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue; - in opt // + warnDeprecation = + if opt.type.deprecationMessage == null then id + else warn "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"; + + in warnDeprecation opt // { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; diff --git a/lib/types.nix b/lib/types.nix index 17e7a939fe3d..f999805e1a98 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -91,9 +91,12 @@ rec { # combinable with the binOp binary operation. # binOp: binary operation that merge two payloads of the same type. functor ? defaultFunctor name + , # The deprecation message to display when this type is used by an option + # If null, the type isn't deprecated + deprecationMessage ? null }: { _type = "option-type"; - inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor; + inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor deprecationMessage; description = if description == null then name else description; }; From 14095f8f480d850d146341abb72bb81d9952248c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 13:45:11 +0200 Subject: [PATCH 086/499] lib/types: Remove types.list, it's been deprecated long enough Has been deprecated since fd803fce606a007403ba6d05f09ed2e6a3371830 (2013-08-22) --- lib/types.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index f999805e1a98..caeb688fd908 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -255,9 +255,6 @@ rec { merge = mergeEqualOption; }; - # TODO: drop this in the future: - list = builtins.trace "`types.list` has been removed; please use `types.listOf` instead" types.listOf; - listOf = elemType: mkOptionType rec { name = "listOf"; description = "list of ${elemType.description}s"; From 2bed3b2ad7e671f75580c0df7d2b644bde0181b7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 13:47:04 +0200 Subject: [PATCH 087/499] lib/types: Set deprecationMessage for types.string --- lib/types.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index caeb688fd908..005be5123e7e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -225,8 +225,10 @@ rec { # Deprecated; should not be used because it quietly concatenates # strings, which is usually not what you want. - string = warn "types.string is deprecated because it quietly concatenates strings" - (separatedString ""); + string = separatedString "" // { + name = "string"; + deprecationMessage = "See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."; + }; attrs = mkOptionType { name = "attrs"; From 3b7aca47e0d2523da3158a6522e768a461b08e9f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 13:53:03 +0200 Subject: [PATCH 088/499] lib/types: Set deprecationMessage for types.loaOf --- lib/types.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 005be5123e7e..a8f744685f9b 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -329,14 +329,12 @@ rec { }; # TODO: drop this in the future: - loaOf = - let msg = - '' - `types.loaOf` has been removed and mixing lists with attribute values - is no longer possible; please use `types.attrsOf` instead. - See https://github.com/NixOS/nixpkgs/issues/1800 for the motivation. - ''; - in builtins.trace msg types.attrsOf; + loaOf = elemType: types.attrsOf elemType // { + name = "loaOf"; + deprecationMessage = "Mixing lists with attribute values is no longer" + + " possible; please use `types.attrsOf` instead. See" + + " https://github.com/NixOS/nixpkgs/issues/1800 for the motivation."; + }; # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { From a582f6adde8f4345582c80fc3ccfe0de3aa89480 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 4 Sep 2020 13:56:18 +0200 Subject: [PATCH 089/499] lib/types: Set deprecationMessage for types.optionSet --- lib/types.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index a8f744685f9b..d3469450963d 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -529,8 +529,9 @@ rec { # declarations from the ‘options’ attribute of containing option # declaration. optionSet = mkOptionType { - name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet"; + name = "optionSet"; description = "option set"; + deprecationMessage = "Use `types.submodule' instead"; }; # Augment the given type with an additional type check function. addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; From 93654504351f27066a71ce82f0dacf3f56a59626 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 13:01:54 +0000 Subject: [PATCH 090/499] acme-sh: 2.8.6 -> 2.8.7 --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 2254f2e22d9d..30badb175a96 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n"; + sha256 = "0bwzrrm07v2lpsja0r0z7nj3jrf814w57mmk8lbdk9dsb3i07x4w"; }; nativeBuildInputs = [ makeWrapper ]; From eb919fa71299edbb7776ecf16ffba177cb4d3e98 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 24 Jul 2020 19:26:29 -0600 Subject: [PATCH 091/499] qt5: 5.14.2 -> 5.15.0 --- .../libraries/qt-5/5.15/default.nix | 176 +++++++ pkgs/development/libraries/qt-5/5.15/fetch.sh | 1 + .../0001-qtbase-mkspecs-mac.patch | 411 ++++++++++++++++ .../5.15/qtbase.patch.d/0002-qtbase-mac.patch | 118 +++++ .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 ++++++++++++++++++ .../0004-qtbase-replace-libdir.patch | 68 +++ .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 ++++++++ .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 ++ .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 ++ .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 +++ .../0009-qtbase-qtpluginpath.patch | 33 ++ .../qtbase.patch.d/0010-qtbase-assert.patch | 32 ++ .../0011-fix-header_module.patch | 25 + .../libraries/qt-5/5.15/qtdeclarative.patch | 114 +++++ .../libraries/qt-5/5.15/qtscript.patch | 13 + .../libraries/qt-5/5.15/qtserialport.patch | 22 + .../libraries/qt-5/5.15/qttools.patch | 15 + ...qtwebengine-darwin-no-platform-check.patch | 33 ++ .../5.15/qtwebkit-darwin-no-qos-classes.patch | 11 + .../5.15/qtwebkit-darwin-no-readline.patch | 45 ++ .../libraries/qt-5/5.15/qtwebkit.patch | 12 + pkgs/development/libraries/qt-5/5.15/srcs.nix | 342 +++++++++++++ .../libraries/qt-5/modules/qtbase.nix | 3 - pkgs/top-level/all-packages.nix | 21 +- 24 files changed, 2289 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.15/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.15/fetch.sh create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtscript.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtserialport.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qttools.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebkit.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix new file mode 100644 index 000000000000..1a90c610a5b5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -0,0 +1,176 @@ +/* + +# 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, fetchFromGitHub, 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; } // { + # qtwebkit does not have an official release tarball on the qt mirror and is + # mostly maintained by the community. + qtwebkit = rec { + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebkit"; + rev = "v${version}"; + sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; + }; + version = "5.212.0-alpha4"; + }; + }; + + patches = { + qtbase = + optionals stdenv.isDarwin [ + ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch + ./qtbase.patch.d/0002-qtbase-mac.patch + ] + ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch + ./qtbase.patch.d/0004-qtbase-replace-libdir.patch + ./qtbase.patch.d/0005-qtbase-cmake.patch + ./qtbase.patch.d/0006-qtbase-gtk3.patch + ./qtbase.patch.d/0007-qtbase-xcursor.patch + ./qtbase.patch.d/0008-qtbase-tzdir.patch + ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch + ./qtbase.patch.d/0010-qtbase-assert.patch + ./qtbase.patch.d/0011-fix-header_module.patch + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; + qttools = [ ./qttools.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 {}; + qtscxml = callPackage ../modules/qtscxml.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.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh new file mode 100644 index 000000000000..97829a133ca5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch new file mode 100644 index 000000000000..ba4c54b228c8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -0,0 +1,411 @@ +From 5ec1d1009d9943f20e82ffc087deabb31d447e75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:07:58 +0200 +Subject: [PATCH 01/11] qtbase-mkspecs-mac + +--- + mkspecs/common/mac.conf | 2 +- + mkspecs/features/mac/default_post.prf | 206 -------------------------- + mkspecs/features/mac/default_pre.prf | 58 -------- + mkspecs/features/mac/sdk.mk | 25 ---- + mkspecs/features/mac/sdk.prf | 61 -------- + 5 files changed, 1 insertion(+), 351 deletions(-) + delete mode 100644 mkspecs/features/mac/sdk.mk + delete mode 100644 mkspecs/features/mac/sdk.prf + +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index 92a9112bca..b80ec1e801 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -68,212 +68,6 @@ 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 { +- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks +- else: 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 +- +- bundle_version = $$VERSION +- isEmpty(bundle_version): bundle_version = 1.0.0 +- +- l = $$split(bundle_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} \ +- -isysroot$$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 +- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) +- } else { +- version_identifier = $$device.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) +- } +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_LFLAGS += -isysroot $$sysroot_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} +-} +- +-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { +- # Explicit SDK version has been set, respect that +- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version +-} +- +-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 +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS + generate_xcode_project.target = xcodeproj +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -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 --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +deleted file mode 100644 +index c40f58c987..0000000000 +--- a/mkspecs/features/mac/sdk.mk ++++ /dev/null +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +deleted file mode 100644 +index 3a9c2778bb..0000000000 +--- a/mkspecs/features/mac/sdk.prf ++++ /dev/null +@@ -1,61 +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"): \ +- 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) +- +-isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { +- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL +- 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) +-} +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch new file mode 100644 index 000000000000..4271b64679d7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch @@ -0,0 +1,118 @@ +From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:15:27 +0200 +Subject: [PATCH 02/11] qtbase-mac + +--- + src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- + src/testlib/qappletestlogger.cpp | 2 +- + src/testlib/qappletestlogger_p.h | 2 +- + src/testlib/qtestcase.cpp | 2 +- + src/testlib/qtestlog.cpp | 2 +- + src/testlib/qtestlog_p.h | 4 ++-- + 6 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h +index 535d3579b2..3d70bf39c1 100644 +--- a/src/corelib/kernel/qcore_mac_p.h ++++ b/src/corelib/kernel/qcore_mac_p.h +@@ -225,7 +225,7 @@ private: + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp +index dfeadebdef..2a74330c1d 100644 +--- a/src/testlib/qappletestlogger.cpp ++++ b/src/testlib/qappletestlogger.cpp +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h +index 62c6d95c5a..f8e0a3b767 100644 +--- a/src/testlib/qappletestlogger_p.h ++++ b/src/testlib/qappletestlogger_p.h +@@ -57,7 +57,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + class QAppleTestLogger : public QAbstractTestLogger + { + public: +diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp +index f45999c7fa..d5b525dc12 100644 +--- a/src/testlib/qtestcase.cpp ++++ b/src/testlib/qtestcase.cpp +@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool + + bool addFallbackLogger = !explicitLoggerRequested; + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + // Any explicitly requested loggers will be added by now, so we can check if they use stdout + const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); + if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { +diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp +index a388780532..63ab965101 100644 +--- a/src/testlib/qtestlog.cpp ++++ b/src/testlib/qtestlog.cpp +@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) + case QTestLog::TAP: + logger = new QTapTestLogger(filename); + break; +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + case QTestLog::Apple: + logger = new QAppleTestLogger; + break; +diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h +index ddaf14ed9b..0c49c93a88 100644 +--- a/src/testlib/qtestlog_p.h ++++ b/src/testlib/qtestlog_p.h +@@ -74,8 +74,8 @@ public: + Q_DISABLE_COPY_MOVE(QTestLog) + + enum LogMode { +- Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++ Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + , Apple + #endif + #if defined(HAVE_XCTEST) +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch new file mode 100644 index 000000000000..9f8ef67ab5d9 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -0,0 +1,464 @@ +From 82771c437957b3684ce296997d795432756aa8b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:25:52 +0200 +Subject: [PATCH 03/11] qtbase-mkspecs + +--- + mkspecs/features/create_cmake.prf | 51 +++--------- + .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ + mkspecs/features/qml_module.prf | 2 +- + mkspecs/features/qml_plugin.prf | 2 +- + mkspecs/features/qt_app.prf | 2 +- + mkspecs/features/qt_build_paths.prf | 4 +- + mkspecs/features/qt_docs.prf | 10 +-- + mkspecs/features/qt_example_installs.prf | 2 +- + mkspecs/features/qt_functions.prf | 2 +- + mkspecs/features/qt_installs.prf | 22 ++--- + mkspecs/features/qt_plugin.prf | 2 +- + 11 files changed, 38 insertions(+), 141 deletions(-) + +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 24ed125f12..f0666a1986 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 +@@ -77,45 +77,20 @@ 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 + +-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 +-} ++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 + +@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { + + cmake_qt5_plugin_file.files = $$cmake_target_file.output + static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_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() +@@ -400,7 +375,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 309798a767..b6c3ab8609 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -2,30 +2,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") + endif() + +-!!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)") +@@ -145,11 +121,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + IsDebugAndRelease) + 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(_deps + ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +@@ -209,11 +181,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + !!ENDIF + + !!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 +@@ -229,24 +197,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}$${CMAKE_QT_STEM}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.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}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.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}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -262,7 +219,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 +@@ -499,25 +455,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}\" \"\" $${CMAKE_DEBUG_AND_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_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}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -536,25 +480,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}\" \"\" $${CMAKE_DEBUG_AND_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}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -581,11 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + 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/qml_module.prf b/mkspecs/features/qml_module.prf +index c0b50416c9..cabe39b22e 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -51,7 +51,7 @@ builtin_resources { + # Install rules + qmldir.base = $$qmldir_path + qmldir.files = $$qmldir_file +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH + + qmlfiles.base = $$_PRO_FILE_PWD_ + qmlfiles.files = $$fq_aux_qml_files +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index 1b67435787..24a1f78c17 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -50,7 +50,7 @@ load(qt_build_paths) + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++target.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += target + + # Some final setup +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { + 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 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- 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_docs.prf b/mkspecs/features/qt_docs.prf +index 095bf15dac..4cc977bea5 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -65,7 +65,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) { +@@ -84,8 +84,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 +@@ -108,12 +108,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 15b373ba40..5c373fe1d5 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -91,7 +91,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 7777e615bd..abeb03a663 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -87,7 +87,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 1ebca17366..a8f958eae8 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,35 +23,35 @@ + #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 + generated_privates: \ + private_headers.CONFIG += no_check_exist + 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 573d717eea..024c624cb6 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 + + qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch new file mode 100644 index 000000000000..bbfc93897873 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -0,0 +1,68 @@ +From 30d3906ff5e8671e9c97c5336c6c549656c0e293 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:27:41 +0200 +Subject: [PATCH 04/11] qtbase-replace-libdir + +--- + mkspecs/features/qt_common.prf | 20 ++------------------ + mkspecs/features/qt_module.prf | 5 +---- + 2 files changed, 3 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 8df94aa4ee..414029f31c 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +- host_build { +- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] +- qt_libdir = $$[QT_HOST_LIBS] +- } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] +- } ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { +- lib_replace0.match = $$rplbase/lib/ +- lib_replace0.replace = $$qqt_libdir/ +- lib_replace0.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 + lib_replace.match = "[^ ']*$$rplbase/lib" + lib_replace.replace = + } else { + lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$qqt_libdir ++ lib_replace.replace = $$qt_libdir + } + lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace +- !equals(qt_libdir, $$rplbase/lib) { +- qtlibdir_replace.match = $$qt_libdir +- qtlibdir_replace.replace = $$qqt_libdir +- qtlibdir_replace.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace +- } + } + contains(TEMPLATE, .*lib)|darwin { + if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 828a9621b9..b9e5d35026 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -305,10 +305,7 @@ load(qt_targets) + } + !lib_bundle:unix { + CONFIG += create_libtool +- host_build: \ +- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] +- else: \ +- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" ++ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib + !isEmpty(lib_replace0.match) { + ltlib_replace0.match = $$lib_replace0.match + ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch new file mode 100644 index 000000000000..19646df1666f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch @@ -0,0 +1,194 @@ +From 7871fbcefc7596a458cec005edafd9d4962baea3 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:34:28 -0500 +Subject: [PATCH 05/11] qtbase-cmake + +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- + mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- + src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- + src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- + .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- + src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- + src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 8 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index b6c3ab8609..edb6a89316 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -513,7 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + 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 b550a52c60..dbd3243885 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES + !!ENDIF + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 4c1c3a612b..bb8ab08143 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -6,7 +6,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 +@@ -21,7 +21,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 +@@ -38,7 +38,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 +@@ -121,7 +121,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 +@@ -135,7 +135,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/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index a814678f7b..b13b964ec8 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 84dbbfebd4..8ad0720c5c 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/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 83d8004a08..ca0b8e4bfb 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 +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch new file mode 100644 index 000000000000..48f4c9b3f99e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch @@ -0,0 +1,48 @@ +From 7a9f4f875053aed8ab387161eea623bf8325cfa8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:33 -0500 +Subject: [PATCH 06/11] qtbase-gtk3 + +--- + src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index 860fc3a26e..8cd4663d49 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + 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 nullptr; + } +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch new file mode 100644 index 000000000000..617b0684df65 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch @@ -0,0 +1,29 @@ +From 707098eada20ba074e642a73248de74407bc261c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:58 -0500 +Subject: [PATCH 07/11] qtbase-xcursor + +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index 42c7a52bd4..ba670ddb44 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -317,10 +317,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) { +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch new file mode 100644 index 000000000000..319de315bfb7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch @@ -0,0 +1,64 @@ +From da003b582ee8823b29b1ff5c0aca8e06e7741b94 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:36:25 -0500 +Subject: [PATCH 08/11] qtbase-tzdir + +--- + src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 01f9a6cce0..910338205a 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -77,7 +77,11 @@ typedef QHash 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"); + +@@ -672,20 +676,23 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return ret; + } 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)); ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- const QByteArray zoneInfo = ianaId.split(',').at(0); +- const char *begin = zoneInfo.constBegin(); +- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() +- && (begin == zoneInfo.constEnd() +- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { +- ret.m_posixRule = ianaId; ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ const QByteArray zoneInfo = ianaId.split(',').at(0); ++ const char *begin = zoneInfo.constBegin(); ++ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() ++ && (begin == zoneInfo.constEnd() ++ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { ++ ret.m_posixRule = ianaId; ++ } ++ return ret; + } +- return ret; + } + } + } +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch new file mode 100644 index 000000000000..28013ec10482 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch @@ -0,0 +1,33 @@ +From 9fc6efaf774a8716932c98c0b0ea6408ed2614c2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sun, 10 May 2020 12:47:28 +0200 +Subject: [PATCH 09/11] qtbase-qtpluginpath + +--- + src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 5fdcc9b914..1a126ef359 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2691,6 +2691,16 @@ QStringList QCoreApplication::libraryPathsLocked() + 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)); ++ } ++ } ++ ++ + auto setPathsFromEnv = [&](QString libPathEnv) { + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts); +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch new file mode 100644 index 000000000000..c5b099c4ca35 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch @@ -0,0 +1,32 @@ +From 015845b3c320d02691f28373097d1e6dbbac79f7 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:37:04 -0500 +Subject: [PATCH 10/11] qtbase-assert + +--- + src/testlib/qtestassert.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +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 + +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch new file mode 100644 index 000000000000..98738656114d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch @@ -0,0 +1,25 @@ +From 2bce8511877db1db532e1437e7140b1d55633f86 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 30 Sep 2019 20:15:40 -0500 +Subject: [PATCH 11/11] fix header_module + +--- + mkspecs/features/qt_module.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index b9e5d35026..9924271042 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -84,7 +84,7 @@ header_module { + CONFIG += qt_no_install_library + + # Allow creation of .prl, .la and .pc files. +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + target.CONFIG += dummy_install + INSTALLS += target + } else { +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch new file mode 100644 index 000000000000..d9c721e6946c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch @@ -0,0 +1,114 @@ +diff --git a/src/particles/particles.pro b/src/particles/particles.pro +index aaaa83419a..58aee00036 100644 +--- a/src/particles/particles.pro ++++ b/src/particles/particles.pro +@@ -20,6 +20,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles.2 + QML_IMPORT_NAME = QtQuick.Particles + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index e39a8319b6..90c0331278 100644 +--- a/src/qml/qml.pro ++++ b/src/qml/qml.pro +@@ -72,6 +72,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml + QML_IMPORT_NAME = QtQml + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro +index 4ac093556d..112e2c2be0 100644 +--- a/src/qmlmodels/qmlmodels.pro ++++ b/src/qmlmodels/qmlmodels.pro +@@ -68,6 +68,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models.2 + QML_IMPORT_NAME = QtQml.Models + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro +index c2e8068fc6..79dba368f7 100644 +--- a/src/qmltest/qmltest.pro ++++ b/src/qmltest/qmltest.pro +@@ -34,7 +34,7 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/Qt/test/qtestroot + QML_IMPORT_NAME = Qt.test.qtestroot + QML_IMPORT_VERSION = 1.0 +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + # Install qmldir + qmldir.files = $$PWD/qmldir +diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro +index 84466062e1..79885455cc 100644 +--- a/src/qmlworkerscript/qmlworkerscript.pro ++++ b/src/qmlworkerscript/qmlworkerscript.pro +@@ -23,6 +23,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript.2 + QML_IMPORT_NAME = QtQml.WorkerScript + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/quick/quick.pro b/src/quick/quick.pro +index f2d49cf939..c401b04c4e 100644 +--- a/src/quick/quick.pro ++++ b/src/quick/quick.pro +@@ -52,4 +52,4 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick.2 + QML_IMPORT_NAME = QtQuick + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes +diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro +index 4dbd3e5e46..0c6b186fc8 100644 +--- a/src/quickshapes/quickshapes.pro ++++ b/src/quickshapes/quickshapes.pro +@@ -36,4 +36,4 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Shapes + QML_IMPORT_NAME = QtQuick.Shapes + IMPORT_VERSION = 1.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes +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/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf +index 537eaf62ea..e21de58f64 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.15/qtscript.patch b/pkgs/development/libraries/qt-5/5.15/qtscript.patch new file mode 100644 index 000000000000..5508dec1280e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtscript.patch @@ -0,0 +1,13 @@ +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 + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/development/libraries/qt-5/5.15/qtserialport.patch b/pkgs/development/libraries/qt-5/5.15/qtserialport.patch new file mode 100644 index 000000000000..f25524e80bcf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtserialport.patch @@ -0,0 +1,22 @@ +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.15/qttools.patch b/pkgs/development/libraries/qt-5/5.15/qttools.patch new file mode 100644 index 000000000000..8ae12198ca25 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qttools.patch @@ -0,0 +1,15 @@ +--- 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.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..546e753144d0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,33 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +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.15/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 000000000000..a7087f517623 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch new file mode 100644 index 000000000000..26d189d86019 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch new file mode 100644 index 000000000000..b94a4b76cbab --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch @@ -0,0 +1,12 @@ +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.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix new file mode 100644 index 000000000000..c88e896286ee --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -0,0 +1,342 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.15 +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd"; + name = "qt3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz"; + sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51"; + name = "qtactiveqt-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671"; + name = "qtandroidextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtbase = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz"; + sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5"; + name = "qtbase-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz"; + sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7"; + name = "qtcharts-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz"; + sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd"; + name = "qtconnectivity-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3"; + name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz"; + sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699"; + name = "qtdeclarative-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz"; + sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f"; + name = "qtdoc-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz"; + sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a"; + name = "qtgamepad-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda"; + name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz"; + sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8"; + name = "qtimageformats-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz"; + sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f"; + name = "qtlocation-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtlottie = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz"; + sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833"; + name = "qtlottie-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439"; + name = "qtmacextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz"; + sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7"; + name = "qtmultimedia-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85"; + name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz"; + sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16"; + name = "qtpurchasing-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquick3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb"; + name = "qtquick3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee"; + name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f"; + name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquicktimeline = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00"; + name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf"; + name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtscript = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz"; + sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373"; + name = "qtscript-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz"; + sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72"; + name = "qtscxml-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz"; + sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da"; + name = "qtsensors-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz"; + sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379"; + name = "qtserialbus-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz"; + sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67"; + name = "qtserialport-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtspeech = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz"; + sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61"; + name = "qtspeech-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz"; + sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d"; + name = "qtsvg-everywhere-src-5.15.0.tar.xz"; + }; + }; + qttools = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz"; + sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437"; + name = "qttools-everywhere-src-5.15.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz"; + sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe"; + name = "qttranslations-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be"; + name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz"; + sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb"; + name = "qtwayland-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz"; + sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f"; + name = "qtwebchannel-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz"; + sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df"; + name = "qtwebengine-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15"; + name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz"; + sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092"; + name = "qtwebsockets-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz"; + sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660"; + name = "qtwebview-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0"; + name = "qtwinextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz"; + sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1"; + name = "qtx11extras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507"; + name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 3cbcaaacefb8..9e7d6ae4c235 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -295,7 +295,6 @@ stdenv.mkDerivation { "-make tools" ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' - "-v" ] ++ ( @@ -312,7 +311,6 @@ stdenv.mkDerivation { [ "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - "-system-xcb" "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -327,7 +325,6 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" - "-system-libjpeg" "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c58a40adf2..69358e30cd72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14842,11 +14842,28 @@ in inherit llvmPackages_5; }); + qt515 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.15) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); + # TODO bump to 5.14 on darwin once it's not broken; see #95199 - qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt514; - libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt514; + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; From 2a5f800520e0d03f77558962a609a7e112917d15 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 24 Jul 2020 20:27:00 -0600 Subject: [PATCH 092/499] qt514: remove --- .../libraries/qt-5/5.14/default.nix | 182 ------- pkgs/development/libraries/qt-5/5.14/fetch.sh | 1 - .../0001-qtbase-mkspecs-mac.patch | 411 ---------------- .../5.14/qtbase.patch.d/0002-qtbase-mac.patch | 116 ----- .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 ------------------ .../0004-qtbase-replace-libdir.patch | 68 --- .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 -------- .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 -- .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 -- .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 --- .../0009-qtbase-qtpluginpath.patch | 19 - .../qtbase.patch.d/0010-qtbase-assert.patch | 32 -- .../0011-fix-header_module.patch | 25 - .../libraries/qt-5/5.14/qtdeclarative.patch | 33 -- .../libraries/qt-5/5.14/qtscript.patch | 13 - .../libraries/qt-5/5.14/qtserialport.patch | 22 - .../libraries/qt-5/5.14/qttools.patch | 15 - ...qtwebengine-darwin-no-platform-check.patch | 33 -- .../5.14/qtwebkit-darwin-no-qos-classes.patch | 11 - .../5.14/qtwebkit-darwin-no-readline.patch | 45 -- .../libraries/qt-5/5.14/qtwebkit.patch | 12 - pkgs/development/libraries/qt-5/5.14/srcs.nix | 342 ------------- pkgs/top-level/all-packages.nix | 17 - 23 files changed, 2196 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.14/default.nix delete mode 100644 pkgs/development/libraries/qt-5/5.14/fetch.sh delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtscript.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtserialport.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qttools.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix deleted file mode 100644 index 469157a5f727..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ /dev/null @@ -1,182 +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, fetchFromGitHub, 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; } // { - # qtwebkit does not have an official release tarball on the qt mirror and is - # mostly maintained by the community. - qtwebkit = rec { - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebkit"; - rev = "v${version}"; - sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; - }; - version = "5.212.0-alpha4"; - }; - }; - - patches = { - qtbase = - optionals stdenv.isDarwin [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - ./qtbase.patch.d/0002-qtbase-mac.patch - ] - ++ [ - ./qtbase.patch.d/0003-qtbase-mkspecs.patch - ./qtbase.patch.d/0004-qtbase-replace-libdir.patch - ./qtbase.patch.d/0005-qtbase-cmake.patch - ./qtbase.patch.d/0006-qtbase-gtk3.patch - ./qtbase.patch.d/0007-qtbase-xcursor.patch - ./qtbase.patch.d/0008-qtbase-tzdir.patch - ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch - ./qtbase.patch.d/0010-qtbase-assert.patch - ./qtbase.patch.d/0011-fix-header_module.patch - ]; - qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ ./qtscript.patch ]; - qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ - (fetchpatch { - name = "qtwebkit-bison-3.7-build.patch"; - url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; - sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; - }) - ./qtwebkit.patch - ] ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; - qttools = [ ./qttools.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 {}; - qtscxml = callPackage ../modules/qtscxml.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.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh deleted file mode 100644 index 2d266b529776..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch deleted file mode 100644 index 0951b6646ab7..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ /dev/null @@ -1,411 +0,0 @@ -From a5848991db270ffdd9f2fa05220475bb3194d12f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:07:58 +0200 -Subject: [PATCH 01/10] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 206 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 -------- - mkspecs/features/mac/sdk.mk | 25 ---- - mkspecs/features/mac/sdk.prf | 61 -------- - 5 files changed, 1 insertion(+), 351 deletions(-) - delete mode 100644 mkspecs/features/mac/sdk.mk - delete mode 100644 mkspecs/features/mac/sdk.prf - -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index ba163efc18..b80ec1e801 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -68,212 +68,6 @@ 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 { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: 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 -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_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 -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -Wl,-syslibroot,$$sysroot_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} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --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 -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -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 --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -deleted file mode 100644 -index c40f58c987..0000000000 ---- a/mkspecs/features/mac/sdk.mk -+++ /dev/null -@@ -1,25 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -deleted file mode 100644 -index 3a9c2778bb..0000000000 ---- a/mkspecs/features/mac/sdk.prf -+++ /dev/null -@@ -1,61 +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"): \ -- 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) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- 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) --} --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch deleted file mode 100644 index 2e28466c5032..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:15:27 +0200 -Subject: [PATCH 02/10] qtbase-mac - ---- - src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- - src/testlib/qappletestlogger.cpp | 2 +- - src/testlib/qappletestlogger_p.h | 2 +- - src/testlib/qtestcase.cpp | 2 +- - src/testlib/qtestlog.cpp | 2 +- - src/testlib/qtestlog_p.h | 2 +- - 6 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index 535d3579b2..3d70bf39c1 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -225,7 +225,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include -@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index dfeadebdef..2a74330c1d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h -index 62c6d95c5a..f8e0a3b767 100644 ---- a/src/testlib/qappletestlogger_p.h -+++ b/src/testlib/qappletestlogger_p.h -@@ -57,7 +57,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - class QAppleTestLogger : public QAbstractTestLogger - { - public: -diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp -index 70733a692a..8bcda17858 100644 ---- a/src/testlib/qtestcase.cpp -+++ b/src/testlib/qtestcase.cpp -@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool - - bool addFallbackLogger = !explicitLoggerRequested; - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Any explicitly requested loggers will be added by now, so we can check if they use stdout - const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); - if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index f3ebf343c5..9b4f526b2e 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - case QTestLog::TAP: - logger = new QTapTestLogger(filename); - break; --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - case QTestLog::Apple: - logger = new QAppleTestLogger; - break; -diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h -index fff36f290d..f737ccf064 100644 ---- a/src/testlib/qtestlog_p.h -+++ b/src/testlib/qtestlog_p.h -@@ -72,7 +72,7 @@ public: - - enum LogMode { - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - , Apple - #endif - #if defined(HAVE_XCTEST) --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch deleted file mode 100644 index b704d0dc8722..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch +++ /dev/null @@ -1,464 +0,0 @@ -From 1cb5581d7f20bf87ac8d67a7295447a78a1d9645 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Sat, 4 Apr 2020 00:25:52 +0200 -Subject: [PATCH 03/10] qtbase-mkspecs - ---- - mkspecs/features/create_cmake.prf | 51 +++--------- - .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ - mkspecs/features/qml_module.prf | 2 +- - mkspecs/features/qml_plugin.prf | 2 +- - mkspecs/features/qt_app.prf | 2 +- - mkspecs/features/qt_build_paths.prf | 4 +- - mkspecs/features/qt_docs.prf | 10 +-- - mkspecs/features/qt_example_installs.prf | 2 +- - mkspecs/features/qt_functions.prf | 2 +- - mkspecs/features/qt_installs.prf | 22 ++--- - mkspecs/features/qt_plugin.prf | 2 +- - 11 files changed, 38 insertions(+), 141 deletions(-) - -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 0e71fd0015..ba071d9a70 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 -@@ -77,45 +77,20 @@ 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 - --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 --} -+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 - -@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { - - cmake_qt5_plugin_file.files = $$cmake_target_file.output - static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_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() -@@ -396,7 +371,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 1099a761ce..87679b7e68 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") - endif() - --!!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)") -@@ -146,11 +122,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - IsDebugAndRelease) - 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(_deps - ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -210,11 +182,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - !!ENDIF - - !!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 -@@ -230,24 +198,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}$${CMAKE_QT_STEM}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.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}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.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}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -263,7 +220,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 -@@ -465,25 +421,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}\" \"\" $${CMAKE_DEBUG_AND_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_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}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -502,25 +446,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}\" \"\" $${CMAKE_DEBUG_AND_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}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -542,11 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - IsDebugAndRelease) - 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/qml_module.prf b/mkspecs/features/qml_module.prf -index c0b50416c9..cabe39b22e 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -51,7 +51,7 @@ builtin_resources { - # Install rules - qmldir.base = $$qmldir_path - qmldir.files = $$qmldir_file --qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH - - qmlfiles.base = $$_PRO_FILE_PWD_ - qmlfiles.files = $$fq_aux_qml_files -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index f1c5658b04..029595e721 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -50,7 +50,7 @@ load(qt_build_paths) - - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH - --target.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH - INSTALLS += target - - # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { - 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 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ - !force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. -- 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_docs.prf b/mkspecs/features/qt_docs.prf -index 095bf15dac..4cc977bea5 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -65,7 +65,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) { -@@ -84,8 +84,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 -@@ -108,12 +108,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 72b47bce27..d59e949e78 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -90,7 +90,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 7777e615bd..abeb03a663 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -87,7 +87,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 1ebca17366..a8f958eae8 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,35 +23,35 @@ - #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 - generated_privates: \ - private_headers.CONFIG += no_check_exist - 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 573d717eea..024c624cb6 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 - - qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch deleted file mode 100644 index 86ea2e75d9be..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1cae0c31c9849615190ee175ebf929b3aca13fe0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Sat, 4 Apr 2020 00:27:41 +0200 -Subject: [PATCH 04/10] qtbase-replace-libdir - ---- - mkspecs/features/qt_common.prf | 20 ++------------------ - mkspecs/features/qt_module.prf | 5 +---- - 2 files changed, 3 insertions(+), 22 deletions(-) - -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index c24f2c6062..0d72ce7286 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib) { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -- host_build { -- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] -- qt_libdir = $$[QT_HOST_LIBS] -- } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -- } -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { -- lib_replace0.match = $$rplbase/lib/ -- lib_replace0.replace = $$qqt_libdir/ -- lib_replace0.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 - lib_replace.match = "[^ ']*$$rplbase/lib" - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qqt_libdir -+ lib_replace.replace = $$qt_libdir - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace -- !equals(qt_libdir, $$rplbase/lib) { -- qtlibdir_replace.match = $$qt_libdir -- qtlibdir_replace.replace = $$qqt_libdir -- qtlibdir_replace.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace -- } - } - - # The remainder of this file must not apply to host tools/libraries, -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 828a9621b9..b9e5d35026 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -305,10 +305,7 @@ load(qt_targets) - } - !lib_bundle:unix { - CONFIG += create_libtool -- host_build: \ -- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] -- else: \ -- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" -+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib - !isEmpty(lib_replace0.match) { - ltlib_replace0.match = $$lib_replace0.match - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch deleted file mode 100644 index 85a729563417..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 7e93d1330e1f8c8cd68334201ad100b8c05c9ab5 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:34:28 -0500 -Subject: [PATCH 05/10] qtbase-cmake - ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- - mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- - src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- - src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- - .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- - src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- - src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 8 files changed, 16 insertions(+), 24 deletions(-) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 87679b7e68..57060e6470 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -474,7 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - IsDebugAndRelease) - 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 7b70cfed09..e700cfa539 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES - !!ENDIF - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 9b672327ef..319ba94d6d 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 -@@ -118,7 +118,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 -@@ -132,7 +132,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/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 84dbbfebd4..8ad0720c5c 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/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 --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch deleted file mode 100644 index 6ce0e5d0c433..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ad04525cdd342e3c8a750323fb3a61b93fee753 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:33 -0500 -Subject: [PATCH 06/10] qtbase-gtk3 - ---- - src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp -@@ -39,6 +39,7 @@ - - #include - #include "qgtk3theme.h" -+#include - - 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; - } --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch deleted file mode 100644 index 6a92a9528303..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:58 -0500 -Subject: [PATCH 07/10] qtbase-xcursor - ---- - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index fbadab4d50..c83ce0af5b 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -317,10 +317,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) { --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch deleted file mode 100644 index 71653a0e36e0..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 882343ea200fe28810bf217a820816affe885a39 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:36:25 -0500 -Subject: [PATCH 08/10] qtbase-tzdir - ---- - src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- - 1 file changed, 19 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 3c2695a789..e75735f88f 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -75,7 +75,11 @@ typedef QHash 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"); - -@@ -658,20 +662,23 @@ 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)); -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- const QByteArray zoneInfo = ianaId.split(',').at(0); -- const char *begin = zoneInfo.constBegin(); -- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() -- && (begin == zoneInfo.constEnd() -- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { -- m_id = m_posixRule = ianaId; -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ const QByteArray zoneInfo = ianaId.split(',').at(0); -+ const char *begin = zoneInfo.constBegin(); -+ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() -+ && (begin == zoneInfo.constEnd() -+ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { -+ m_id = m_posixRule = ianaId; -+ } -+ return; - } -- return; - } - } - } --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch deleted file mode 100644 index 009fe14838e7..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp 2020-03-27 10:49:31.000000000 +0100 -+++ qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp.patched 2020-05-09 15:03:03.968084088 +0200 -@@ -2691,6 +2691,16 @@ - 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)); -+ } -+ } -+ -+ - auto setPathsFromEnv = [&](QString libPathEnv) { - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch deleted file mode 100644 index e10f97607326..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c8893a4e0a1b46796e39b4a338358fdb45685cba Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:37:04 -0500 -Subject: [PATCH 09/10] qtbase-assert - ---- - src/testlib/qtestassert.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -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 - --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch deleted file mode 100644 index 4358097dddf2..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4c488fdb457e63924383fb7f8ad45bed3df49480 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Mon, 30 Sep 2019 20:15:40 -0500 -Subject: [PATCH 10/10] fix header_module - ---- - mkspecs/features/qt_module.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 16b39031bc..1ac3d6fe59 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -84,7 +84,7 @@ header_module { - CONFIG += qt_no_install_library - - # Allow creation of .prl, .la and .pc files. -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - target.CONFIG += dummy_install - INSTALLS += target - } else { --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch deleted file mode 100644 index 8f5b5d4790fb..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch +++ /dev/null @@ -1,33 +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/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.14/qtscript.patch b/pkgs/development/libraries/qt-5/5.14/qtscript.patch deleted file mode 100644 index 5508dec1280e..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/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 - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch deleted file mode 100644 index f25524e80bcf..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/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.14/qttools.patch b/pkgs/development/libraries/qt-5/5.14/qttools.patch deleted file mode 100644 index 8ae12198ca25..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qttools.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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.14/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch deleted file mode 100644 index 546e753144d0..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { - } else:osx { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !isMinXcodeVersion(8, 3, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") -- return(false) - } - !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") -@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { - return(false) - } - !isMinOSXSDKVersion(10, 12): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") -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.14/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch deleted file mode 100644 index a7087f517623..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake ---- a/Source/cmake/OptionsQt.cmake -+++ b/Source/cmake/OptionsQt.cmake -@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) - endif () - - if (APPLE) -- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) - endif () - - if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch deleted file mode 100644 index 26d189d86019..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -9,7 +9,6 @@ set(JSC_LIBRARIES - ) - - if (WTF_OS_MAC_OS_X) -- list(APPEND JSC_LIBRARIES edit) - endif () - - if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -563,7 +563,6 @@ - #if PLATFORM(IOS) - - #define HAVE_NETWORK_EXTENSION 1 --#define HAVE_READLINE 1 - #if USE(APPLE_INTERNAL_SDK) - #define USE_CFNETWORK 1 - #endif -@@ -650,7 +649,6 @@ - #define HAVE_MADV_DONTNEED 1 - #define HAVE_MERGESORT 1 - #define HAVE_PTHREAD_SETNAME_NP 1 --#define HAVE_READLINE 1 - #define HAVE_SYS_TIMEB_H 1 - - #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch deleted file mode 100644 index b94a4b76cbab..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/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.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix deleted file mode 100644 index 6ac958442f49..000000000000 --- a/pkgs/development/libraries/qt-5/5.14/srcs.nix +++ /dev/null @@ -1,342 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.14 -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; - name = "qt3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; - sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; - name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; - name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtbase = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; - sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; - name = "qtbase-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtcharts = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; - sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; - name = "qtcharts-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; - sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; - name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; - name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; - sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; - name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdoc = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; - sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; - name = "qtdoc-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtgamepad = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; - sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; - name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; - sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; - name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtimageformats = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; - sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; - name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtlocation = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; - sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; - name = "qtlocation-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtlottie = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; - sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; - name = "qtlottie-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtmacextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; - name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; - sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; - name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtnetworkauth = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; - sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; - name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; - sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; - name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquick3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; - name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; - sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; - name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; - sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; - name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquicktimeline = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; - sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; - name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtremoteobjects = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; - sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; - name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtscript = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; - sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; - name = "qtscript-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtscxml = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; - sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; - name = "qtscxml-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtsensors = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; - sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; - name = "qtsensors-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtserialbus = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; - sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; - name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtserialport = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; - sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; - name = "qtserialport-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtspeech = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; - sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; - name = "qtspeech-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtsvg = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; - sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; - name = "qtsvg-everywhere-src-5.14.2.tar.xz"; - }; - }; - qttools = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; - sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; - name = "qttools-everywhere-src-5.14.2.tar.xz"; - }; - }; - qttranslations = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; - sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; - name = "qttranslations-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; - sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; - name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwayland = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; - sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; - name = "qtwayland-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; - sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; - name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebengine = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; - sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; - name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebglplugin = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; - sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; - name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; - sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; - name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebview = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; - sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; - name = "qtwebview-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwinextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; - name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtx11extras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; - sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; - name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; - sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; - name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69358e30cd72..a77fe01f3f9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14827,21 +14827,6 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt514 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.14) { - inherit newScope; - inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; - }); - qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; @@ -14857,8 +14842,6 @@ in inherit llvmPackages_5; }); - libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); - libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); # TODO bump to 5.14 on darwin once it's not broken; see #95199 From f299399edb954836e52fa83626dc23b7f52af4d0 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 24 Jul 2020 19:48:25 -0600 Subject: [PATCH 093/499] python.pkgs.pyqt5: 5.14.2 -> 5.15.0 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- pkgs/development/python-modules/sip/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ece9ad5b4a3f..2af28bef0c95 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.14.2"; + version = "5.15.0"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; + sha256 = "sha256-xvdUiP/VNlpliTvGTqgqaVfbEm+/4zZUvNQ64cMMUvk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 2bc8b70e4ca5..760c5bca9ee1 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.22"; + version = "4.19.23"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; + sha256 = "sha256-IsqbzsU4gRTkDUqv18zQxP4HIpe2KNDFzfovAQwLx+c="; }; configurePhase = '' From 4c0c44c9359d497d88618beb29c46875062ee29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 25 Jul 2020 07:04:00 +0200 Subject: [PATCH 094/499] tipp10: 3.2.0 -> unstable-20200616 --- pkgs/applications/misc/tipp10/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 4782b90b4a1f..689c5aa3a9ef 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "3.2.0"; + version = "unstable-20200616"; src = fetchFromGitLab { owner = "tipp10"; - repo = pname; - rev = "v${version}"; - sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7"; + repo = "tipp10"; + rev = "2dd6d45c8a91cff7075675d8875721456cdd5f1b"; + sha256 = "16x51rv4r6cz5vsmrfbakqzbfxy456h82ibzacknp35f41cjdqq4"; }; nativeBuildInputs = [ cmake qttools ]; From 01bcfd3579219d60e5d07df309a000f96b2b658b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 4 Sep 2020 05:13:16 -0500 Subject: [PATCH 095/499] qtwebkit: mark broken with Qt 5.15 --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 1133623483af..b31e57f38065 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -71,5 +71,8 @@ qtModule { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; - meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + meta = { + broken = lib.versionAtLeast qtbase.version "5.15"; + maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + }; } From 017e498d023695ae98e418f04ee33dc372473a57 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 4 Sep 2020 05:13:36 -0500 Subject: [PATCH 096/499] Revert "qt514: remove" This reverts commit bec5405fc5449f5eb9103249bf2c5dfed9fdcce9. Qt 5.14 is still supported upstream, so we will not remove it yet. --- .../libraries/qt-5/5.14/default.nix | 182 +++++++ pkgs/development/libraries/qt-5/5.14/fetch.sh | 1 + .../0001-qtbase-mkspecs-mac.patch | 411 ++++++++++++++++ .../5.14/qtbase.patch.d/0002-qtbase-mac.patch | 116 +++++ .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 ++++++++++++++++++ .../0004-qtbase-replace-libdir.patch | 68 +++ .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 ++++++++ .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 ++ .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 ++ .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 +++ .../0009-qtbase-qtpluginpath.patch | 19 + .../qtbase.patch.d/0010-qtbase-assert.patch | 32 ++ .../0011-fix-header_module.patch | 25 + .../libraries/qt-5/5.14/qtdeclarative.patch | 33 ++ .../libraries/qt-5/5.14/qtscript.patch | 13 + .../libraries/qt-5/5.14/qtserialport.patch | 22 + .../libraries/qt-5/5.14/qttools.patch | 15 + ...qtwebengine-darwin-no-platform-check.patch | 33 ++ .../5.14/qtwebkit-darwin-no-qos-classes.patch | 11 + .../5.14/qtwebkit-darwin-no-readline.patch | 45 ++ .../libraries/qt-5/5.14/qtwebkit.patch | 12 + pkgs/development/libraries/qt-5/5.14/srcs.nix | 342 +++++++++++++ pkgs/top-level/all-packages.nix | 17 + 23 files changed, 2196 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.14/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.14/fetch.sh create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtscript.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtserialport.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qttools.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix new file mode 100644 index 000000000000..469157a5f727 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -0,0 +1,182 @@ +/* + +# 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, fetchFromGitHub, 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; } // { + # qtwebkit does not have an official release tarball on the qt mirror and is + # mostly maintained by the community. + qtwebkit = rec { + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebkit"; + rev = "v${version}"; + sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; + }; + version = "5.212.0-alpha4"; + }; + }; + + patches = { + qtbase = + optionals stdenv.isDarwin [ + ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch + ./qtbase.patch.d/0002-qtbase-mac.patch + ] + ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch + ./qtbase.patch.d/0004-qtbase-replace-libdir.patch + ./qtbase.patch.d/0005-qtbase-cmake.patch + ./qtbase.patch.d/0006-qtbase-gtk3.patch + ./qtbase.patch.d/0007-qtbase-xcursor.patch + ./qtbase.patch.d/0008-qtbase-tzdir.patch + ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch + ./qtbase.patch.d/0010-qtbase-assert.patch + ./qtbase.patch.d/0011-fix-header_module.patch + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; + qttools = [ ./qttools.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 {}; + qtscxml = callPackage ../modules/qtscxml.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.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh new file mode 100644 index 000000000000..2d266b529776 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch new file mode 100644 index 000000000000..0951b6646ab7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -0,0 +1,411 @@ +From a5848991db270ffdd9f2fa05220475bb3194d12f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:07:58 +0200 +Subject: [PATCH 01/10] qtbase-mkspecs-mac + +--- + mkspecs/common/mac.conf | 2 +- + mkspecs/features/mac/default_post.prf | 206 -------------------------- + mkspecs/features/mac/default_pre.prf | 58 -------- + mkspecs/features/mac/sdk.mk | 25 ---- + mkspecs/features/mac/sdk.prf | 61 -------- + 5 files changed, 1 insertion(+), 351 deletions(-) + delete mode 100644 mkspecs/features/mac/sdk.mk + delete mode 100644 mkspecs/features/mac/sdk.prf + +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index ba163efc18..b80ec1e801 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -68,212 +68,6 @@ 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 { +- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks +- else: 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 +- +- bundle_version = $$VERSION +- isEmpty(bundle_version): bundle_version = 1.0.0 +- +- l = $$split(bundle_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 +- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) +- } else { +- version_identifier = $$device.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) +- } +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$sysroot_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} +-} +- +-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { +- # Explicit SDK version has been set, respect that +- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version +-} +- +-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 +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS + generate_xcode_project.target = xcodeproj +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -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 --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +deleted file mode 100644 +index c40f58c987..0000000000 +--- a/mkspecs/features/mac/sdk.mk ++++ /dev/null +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +deleted file mode 100644 +index 3a9c2778bb..0000000000 +--- a/mkspecs/features/mac/sdk.prf ++++ /dev/null +@@ -1,61 +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"): \ +- 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) +- +-isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { +- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL +- 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) +-} +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch new file mode 100644 index 000000000000..2e28466c5032 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch @@ -0,0 +1,116 @@ +From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:15:27 +0200 +Subject: [PATCH 02/10] qtbase-mac + +--- + src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- + src/testlib/qappletestlogger.cpp | 2 +- + src/testlib/qappletestlogger_p.h | 2 +- + src/testlib/qtestcase.cpp | 2 +- + src/testlib/qtestlog.cpp | 2 +- + src/testlib/qtestlog_p.h | 2 +- + 6 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h +index 535d3579b2..3d70bf39c1 100644 +--- a/src/corelib/kernel/qcore_mac_p.h ++++ b/src/corelib/kernel/qcore_mac_p.h +@@ -225,7 +225,7 @@ private: + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp +index dfeadebdef..2a74330c1d 100644 +--- a/src/testlib/qappletestlogger.cpp ++++ b/src/testlib/qappletestlogger.cpp +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h +index 62c6d95c5a..f8e0a3b767 100644 +--- a/src/testlib/qappletestlogger_p.h ++++ b/src/testlib/qappletestlogger_p.h +@@ -57,7 +57,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + class QAppleTestLogger : public QAbstractTestLogger + { + public: +diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp +index 70733a692a..8bcda17858 100644 +--- a/src/testlib/qtestcase.cpp ++++ b/src/testlib/qtestcase.cpp +@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool + + bool addFallbackLogger = !explicitLoggerRequested; + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + // Any explicitly requested loggers will be added by now, so we can check if they use stdout + const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); + if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { +diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp +index f3ebf343c5..9b4f526b2e 100644 +--- a/src/testlib/qtestlog.cpp ++++ b/src/testlib/qtestlog.cpp +@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) + case QTestLog::TAP: + logger = new QTapTestLogger(filename); + break; +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + case QTestLog::Apple: + logger = new QAppleTestLogger; + break; +diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h +index fff36f290d..f737ccf064 100644 +--- a/src/testlib/qtestlog_p.h ++++ b/src/testlib/qtestlog_p.h +@@ -72,7 +72,7 @@ public: + + enum LogMode { + Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + , Apple + #endif + #if defined(HAVE_XCTEST) +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch new file mode 100644 index 000000000000..b704d0dc8722 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -0,0 +1,464 @@ +From 1cb5581d7f20bf87ac8d67a7295447a78a1d9645 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:25:52 +0200 +Subject: [PATCH 03/10] qtbase-mkspecs + +--- + mkspecs/features/create_cmake.prf | 51 +++--------- + .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ + mkspecs/features/qml_module.prf | 2 +- + mkspecs/features/qml_plugin.prf | 2 +- + mkspecs/features/qt_app.prf | 2 +- + mkspecs/features/qt_build_paths.prf | 4 +- + mkspecs/features/qt_docs.prf | 10 +-- + mkspecs/features/qt_example_installs.prf | 2 +- + mkspecs/features/qt_functions.prf | 2 +- + mkspecs/features/qt_installs.prf | 22 ++--- + mkspecs/features/qt_plugin.prf | 2 +- + 11 files changed, 38 insertions(+), 141 deletions(-) + +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 0e71fd0015..ba071d9a70 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 +@@ -77,45 +77,20 @@ 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 + +-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 +-} ++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 + +@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { + + cmake_qt5_plugin_file.files = $$cmake_target_file.output + static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_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() +@@ -396,7 +371,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 1099a761ce..87679b7e68 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") + endif() + +-!!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)") +@@ -146,11 +122,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + IsDebugAndRelease) + 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(_deps + ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +@@ -210,11 +182,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + !!ENDIF + + !!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 +@@ -230,24 +198,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}$${CMAKE_QT_STEM}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.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}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.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}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -263,7 +220,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 +@@ -465,25 +421,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}\" \"\" $${CMAKE_DEBUG_AND_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_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}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -502,25 +446,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}\" \"\" $${CMAKE_DEBUG_AND_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}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -542,11 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + 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/qml_module.prf b/mkspecs/features/qml_module.prf +index c0b50416c9..cabe39b22e 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -51,7 +51,7 @@ builtin_resources { + # Install rules + qmldir.base = $$qmldir_path + qmldir.files = $$qmldir_file +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH + + qmlfiles.base = $$_PRO_FILE_PWD_ + qmlfiles.files = $$fq_aux_qml_files +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index f1c5658b04..029595e721 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -50,7 +50,7 @@ load(qt_build_paths) + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++target.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += target + + # Some final setup +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { + 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 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- 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_docs.prf b/mkspecs/features/qt_docs.prf +index 095bf15dac..4cc977bea5 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -65,7 +65,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) { +@@ -84,8 +84,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 +@@ -108,12 +108,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 72b47bce27..d59e949e78 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -90,7 +90,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 7777e615bd..abeb03a663 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -87,7 +87,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 1ebca17366..a8f958eae8 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,35 +23,35 @@ + #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 + generated_privates: \ + private_headers.CONFIG += no_check_exist + 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 573d717eea..024c624cb6 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 + + qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch new file mode 100644 index 000000000000..86ea2e75d9be --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -0,0 +1,68 @@ +From 1cae0c31c9849615190ee175ebf929b3aca13fe0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:27:41 +0200 +Subject: [PATCH 04/10] qtbase-replace-libdir + +--- + mkspecs/features/qt_common.prf | 20 ++------------------ + mkspecs/features/qt_module.prf | 5 +---- + 2 files changed, 3 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index c24f2c6062..0d72ce7286 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib) { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +- host_build { +- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] +- qt_libdir = $$[QT_HOST_LIBS] +- } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] +- } ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { +- lib_replace0.match = $$rplbase/lib/ +- lib_replace0.replace = $$qqt_libdir/ +- lib_replace0.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 + lib_replace.match = "[^ ']*$$rplbase/lib" + lib_replace.replace = + } else { + lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$qqt_libdir ++ lib_replace.replace = $$qt_libdir + } + lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace +- !equals(qt_libdir, $$rplbase/lib) { +- qtlibdir_replace.match = $$qt_libdir +- qtlibdir_replace.replace = $$qqt_libdir +- qtlibdir_replace.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace +- } + } + + # The remainder of this file must not apply to host tools/libraries, +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 828a9621b9..b9e5d35026 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -305,10 +305,7 @@ load(qt_targets) + } + !lib_bundle:unix { + CONFIG += create_libtool +- host_build: \ +- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] +- else: \ +- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" ++ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib + !isEmpty(lib_replace0.match) { + ltlib_replace0.match = $$lib_replace0.match + ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch new file mode 100644 index 000000000000..85a729563417 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch @@ -0,0 +1,194 @@ +From 7e93d1330e1f8c8cd68334201ad100b8c05c9ab5 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:34:28 -0500 +Subject: [PATCH 05/10] qtbase-cmake + +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- + mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- + src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- + src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- + .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- + src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- + src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 8 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 87679b7e68..57060e6470 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -474,7 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + 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 7b70cfed09..e700cfa539 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES + !!ENDIF + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 9b672327ef..319ba94d6d 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 +@@ -118,7 +118,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 +@@ -132,7 +132,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/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 84dbbfebd4..8ad0720c5c 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/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 +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch new file mode 100644 index 000000000000..6ce0e5d0c433 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch @@ -0,0 +1,48 @@ +From 1ad04525cdd342e3c8a750323fb3a61b93fee753 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:33 -0500 +Subject: [PATCH 06/10] qtbase-gtk3 + +--- + src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index fb1c425d8e..bb8bab9795 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + 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; + } +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch new file mode 100644 index 000000000000..6a92a9528303 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch @@ -0,0 +1,29 @@ +From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:58 -0500 +Subject: [PATCH 07/10] qtbase-xcursor + +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index fbadab4d50..c83ce0af5b 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -317,10 +317,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) { +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch new file mode 100644 index 000000000000..71653a0e36e0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch @@ -0,0 +1,64 @@ +From 882343ea200fe28810bf217a820816affe885a39 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:36:25 -0500 +Subject: [PATCH 08/10] qtbase-tzdir + +--- + src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 3c2695a789..e75735f88f 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -75,7 +75,11 @@ typedef QHash 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"); + +@@ -658,20 +662,23 @@ 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)); ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- const QByteArray zoneInfo = ianaId.split(',').at(0); +- const char *begin = zoneInfo.constBegin(); +- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() +- && (begin == zoneInfo.constEnd() +- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { +- m_id = m_posixRule = ianaId; ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ const QByteArray zoneInfo = ianaId.split(',').at(0); ++ const char *begin = zoneInfo.constBegin(); ++ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() ++ && (begin == zoneInfo.constEnd() ++ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { ++ m_id = m_posixRule = ianaId; ++ } ++ return; + } +- return; + } + } + } +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch new file mode 100644 index 000000000000..009fe14838e7 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch @@ -0,0 +1,19 @@ +--- qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp 2020-03-27 10:49:31.000000000 +0100 ++++ qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp.patched 2020-05-09 15:03:03.968084088 +0200 +@@ -2691,6 +2691,16 @@ + 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)); ++ } ++ } ++ ++ + auto setPathsFromEnv = [&](QString libPathEnv) { + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch new file mode 100644 index 000000000000..e10f97607326 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch @@ -0,0 +1,32 @@ +From c8893a4e0a1b46796e39b4a338358fdb45685cba Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:37:04 -0500 +Subject: [PATCH 09/10] qtbase-assert + +--- + src/testlib/qtestassert.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +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 + +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch new file mode 100644 index 000000000000..4358097dddf2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch @@ -0,0 +1,25 @@ +From 4c488fdb457e63924383fb7f8ad45bed3df49480 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 30 Sep 2019 20:15:40 -0500 +Subject: [PATCH 10/10] fix header_module + +--- + mkspecs/features/qt_module.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 16b39031bc..1ac3d6fe59 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -84,7 +84,7 @@ header_module { + CONFIG += qt_no_install_library + + # Allow creation of .prl, .la and .pc files. +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + target.CONFIG += dummy_install + INSTALLS += target + } else { +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch new file mode 100644 index 000000000000..8f5b5d4790fb --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch @@ -0,0 +1,33 @@ +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/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.14/qtscript.patch b/pkgs/development/libraries/qt-5/5.14/qtscript.patch new file mode 100644 index 000000000000..5508dec1280e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtscript.patch @@ -0,0 +1,13 @@ +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 + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch new file mode 100644 index 000000000000..f25524e80bcf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch @@ -0,0 +1,22 @@ +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.14/qttools.patch b/pkgs/development/libraries/qt-5/5.14/qttools.patch new file mode 100644 index 000000000000..8ae12198ca25 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qttools.patch @@ -0,0 +1,15 @@ +--- 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.14/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..546e753144d0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,33 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +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.14/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 000000000000..a7087f517623 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch new file mode 100644 index 000000000000..26d189d86019 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch new file mode 100644 index 000000000000..b94a4b76cbab --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch @@ -0,0 +1,12 @@ +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.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix new file mode 100644 index 000000000000..6ac958442f49 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/srcs.nix @@ -0,0 +1,342 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.14 +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; + sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; + name = "qt3d-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; + sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; + name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; + sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; + name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtbase = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; + sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; + name = "qtbase-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtcharts = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; + sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; + name = "qtcharts-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; + sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; + name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; + sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; + name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; + sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; + name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtdoc = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; + sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; + name = "qtdoc-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtgamepad = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; + sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; + name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; + sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; + name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtimageformats = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; + sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; + name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtlocation = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; + sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; + name = "qtlocation-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtlottie = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; + sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; + name = "qtlottie-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtmacextras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; + sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; + name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; + sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; + name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; + sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; + name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; + sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; + name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquick3d = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; + sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; + name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; + sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; + name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; + sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; + name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquicktimeline = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; + sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; + name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; + sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; + name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtscript = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; + sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; + name = "qtscript-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtscxml = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; + sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; + name = "qtscxml-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtsensors = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; + sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; + name = "qtsensors-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtserialbus = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; + sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; + name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtserialport = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; + sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; + name = "qtserialport-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtspeech = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; + sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; + name = "qtspeech-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtsvg = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; + sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; + name = "qtsvg-everywhere-src-5.14.2.tar.xz"; + }; + }; + qttools = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; + sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; + name = "qttools-everywhere-src-5.14.2.tar.xz"; + }; + }; + qttranslations = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; + sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; + name = "qttranslations-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; + sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; + name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwayland = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; + sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; + name = "qtwayland-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; + sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; + name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebengine = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; + sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; + name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; + sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; + name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; + sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; + name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebview = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; + sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; + name = "qtwebview-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwinextras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; + sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; + name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtx11extras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; + sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; + name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; + sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; + name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a77fe01f3f9b..69358e30cd72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14827,6 +14827,21 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); + qt514 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.14) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; @@ -14842,6 +14857,8 @@ in inherit llvmPackages_5; }); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); # TODO bump to 5.14 on darwin once it's not broken; see #95199 From a1f4287e36daa8ff88c9b71e8999a27582392d07 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 11:36:20 -0500 Subject: [PATCH 097/499] Keep Qt 5.14 for Plasma and KDE Applications --- pkgs/top-level/all-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69358e30cd72..8fca0d773b31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13030,7 +13030,7 @@ in let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { - inherit libsForQt5; + libsForQt5 = libsForQt514; inherit lib fetchurl; }; in @@ -21293,7 +21293,8 @@ in let mkApplications = import ../applications/kde; attrs = { - inherit lib libsForQt5 fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; inherit okteta; }; in @@ -25475,7 +25476,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { - inherit libsForQt5 lib fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; gconf = gnome2.GConf; inherit gsettings-desktop-schemas; }; From cedb5ff8a3b7c124d3ed645e561c3ffe9fe41e55 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 15:37:05 -0500 Subject: [PATCH 098/499] synfigstudio: use libsForQt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fca0d773b31..c11d3f7a69f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22106,7 +22106,7 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - mlt-qt5 = libsForQt5.mlt; + mlt-qt5 = libsForQt514.mlt; }; typora = callPackage ../applications/editors/typora { }; From ef97866598b6dbf57730f36af20551e995f91ec7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 15:41:07 -0500 Subject: [PATCH 099/499] minizincide: use qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c11d3f7a69f9..eda5a23bbbf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11184,7 +11184,7 @@ in minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; + minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; From d6a57a8f4d079d69b9160569cbf55a87067d1e36 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 15:41:21 -0500 Subject: [PATCH 100/499] pcl: broken with qtbase >= 5.15 --- pkgs/development/libraries/pcl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index d1c39b42a9d5..cb1bcdd1bf75 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pointclouds.org/"; + broken = stdenv.lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; From b3d72930d81aefd7964c7a7ad17a7d775592436d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 16:22:24 -0500 Subject: [PATCH 101/499] qtbase: Preserve configuration options on Qt < 5.15 --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 9e7d6ae4c235..cc6e45e3ebde 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -296,6 +296,7 @@ stdenv.mkDerivation { ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( if stdenv.isDarwin @@ -310,7 +311,9 @@ stdenv.mkDerivation { else [ "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" + ++ [ "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -325,6 +328,9 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" + ++ [ "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" From 91bee6f06ce227266e6bd271b6d9f6ece1153da4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 18:36:52 -0500 Subject: [PATCH 102/499] mlt: broken with Qt 5.15 --- pkgs/development/libraries/mlt/qt-5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f0b45753df01..6b41affb126f 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + broken = versionAtLeast qtbase.version "5.15"; }; } From 22167ae45fb27fac1e6aec7d1bf6ce82516fcb12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 08:06:15 -0500 Subject: [PATCH 103/499] Pin broken packages to Qt 5.14 # Conflicts: # pkgs/top-level/all-packages.nix --- pkgs/top-level/all-packages.nix | 384 ++++++++++++++++---------------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eda5a23bbbf8..76f0a6d59c80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -228,7 +228,7 @@ in archiver = callPackage ../applications/misc/archiver { }; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; grsync = callPackage ../applications/misc/grsync { }; @@ -749,7 +749,7 @@ in arduino-mk = callPackage ../development/arduino/arduino-mk {}; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; arguments = callPackage ../development/libraries/arguments { }; @@ -837,7 +837,7 @@ in brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; boxes = callPackage ../tools/text/boxes { }; @@ -1336,7 +1336,7 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; - birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; + birdtray = libsForQt514.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1517,7 +1517,7 @@ in }; traefik = callPackage ../servers/traefik { }; - calamares = libsForQt5.callPackage ../tools/misc/calamares { + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; }; @@ -2188,7 +2188,7 @@ in medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { }; + megasync = libsForQt514.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2677,14 +2677,14 @@ in cksfv = callPackage ../tools/networking/cksfv { }; - clementine = libsForQt5.callPackage ../applications/audio/clementine { + clementine = libsForQt514.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; clementineUnfree = clementine.unfree; - mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; + mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -3211,7 +3211,7 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -3317,7 +3317,7 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + strawberry = libsForQt514.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; @@ -4291,7 +4291,7 @@ in hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; + hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -4359,7 +4359,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -4442,11 +4442,11 @@ in i2pd = callPackage ../tools/networking/i2pd { }; - i-score = libsForQt5.callPackage ../applications/audio/i-score { }; + i-score = libsForQt514.callPackage ../applications/audio/i-score { }; iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + iannix = libsForQt514.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; @@ -4787,31 +4787,31 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; + krename = libsForQt514.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt514.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt5.callPackage ../tools/misc/peruse { }; + peruse = libsForQt514.callPackage ../tools/misc/peruse { }; - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; - kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = libsForQt514.callPackage ../tools/graphics/kst { gsl = gsl_1; }; - kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { }; kytea = callPackage ../tools/text/kytea { }; @@ -5049,7 +5049,7 @@ in ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; nodejs = hiPrio nodejs-12_x; @@ -5706,7 +5706,7 @@ in inherit (callPackage ../servers/nextcloud {}) nextcloud17 nextcloud18 nextcloud19; - nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -5794,7 +5794,7 @@ in graphicalSupport = true; }; - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -5896,7 +5896,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -6047,7 +6047,7 @@ in overmind = callPackage ../applications/misc/overmind { }; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6460,7 +6460,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = libsForQt5.callPackage ../applications/video/qarte { }; + qarte = libsForQt514.callPackage ../applications/video/qarte { }; qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; @@ -6486,7 +6486,7 @@ in qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; + qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -6498,7 +6498,7 @@ in qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { }; quickjs = callPackage ../development/interpreters/quickjs { }; @@ -6564,7 +6564,7 @@ in reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt5.callPackage ../applications/editors/retext { }; + retext = libsForQt514.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -6678,7 +6678,7 @@ in rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -6700,7 +6700,7 @@ in rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; @@ -6916,7 +6916,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + sigil = libsForQt514.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -6965,7 +6965,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -7123,7 +7123,7 @@ in subberthehut = callPackage ../tools/misc/subberthehut { }; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; + subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -7276,7 +7276,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -7310,7 +7310,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + texworks = libsForQt514.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -8017,7 +8017,7 @@ in wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -9215,7 +9215,7 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -9450,7 +9450,7 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -10273,7 +10273,7 @@ in ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt514.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -11088,7 +11088,7 @@ in kati = callPackage ../development/tools/build-managers/kati { }; - kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kcc = libsForQt514.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; @@ -11162,7 +11162,7 @@ in lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; @@ -11287,7 +11287,7 @@ in phantomjs = callPackage ../development/tools/phantomjs { }; - phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; + phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -11342,7 +11342,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -11353,7 +11353,7 @@ in lua = lua5; } // (config.radare or {}))) radare2 r2-for-cutter; - radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; @@ -12806,7 +12806,7 @@ in hdt = callPackage ../misc/hdt {}; - herqq = libsForQt5.callPackage ../development/libraries/herqq { }; + herqq = libsForQt514.callPackage ../development/libraries/herqq { }; heyefi = haskellPackages.heyefi; @@ -14777,7 +14777,7 @@ in qoauth = callPackage ../development/libraries/qoauth { }; - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12; @@ -15082,7 +15082,7 @@ in qrupdate = callPackage ../development/libraries/qrupdate { }; - qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + qgnomeplatform = libsForQt514.callPackage ../development/libraries/qgnomeplatform { }; randomx = callPackage ../development/libraries/randomx { }; @@ -15654,7 +15654,7 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; - vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { + vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16571,7 +16571,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; + qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { }; pulseaudioFull = pulseaudio.override { x11Support = true; @@ -17322,7 +17322,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { + ffado = libsForQt514.callPackage ../os-specific/linux/ffado { inherit (pkgs.linuxPackages) kernel; }; libffado = ffado; @@ -18863,7 +18863,7 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; @@ -19170,7 +19170,7 @@ in qgo = libsForQt5.callPackage ../games/qgo { }; - qmc2 = libsForQt5.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -19360,7 +19360,7 @@ in zafiro-icons = callPackage ../data/icons/zafiro-icons { }; - zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal = libsForQt514.callPackage ../data/documentation/zeal { }; zilla-slab = callPackage ../data/fonts/zilla-slab { }; @@ -19428,7 +19428,7 @@ in msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; + amarok = libsForQt514.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; @@ -19449,7 +19449,7 @@ in antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt514.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; @@ -19528,7 +19528,7 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = qt5.callPackage ../applications/audio/cadence { }; + cadence = libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -19606,7 +19606,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; @@ -19718,13 +19718,13 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; + calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; + calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; calibre = calibre-py3; - calligra = libsForQt5.callPackage ../applications/office/calligra { + calligra = libsForQt514.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; poppler = poppler_0_61; @@ -19738,7 +19738,7 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = qt5.callPackage ../applications/audio/carla { }; + carla = libsForQt514.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; @@ -19748,7 +19748,7 @@ in cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -19812,7 +19812,7 @@ in clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = qt5.callPackage ../applications/video/clipgrab { }; + clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -19839,11 +19839,11 @@ in cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt514.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = libsForQt514.callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; @@ -19860,7 +19860,7 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt { python = python27; }; @@ -19881,7 +19881,7 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -19901,7 +19901,7 @@ in curseradio = callPackage ../applications/audio/curseradio { }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt514.callPackage ../tools/misc/cutecom { }; cvs = callPackage ../applications/version-management/cvs { }; @@ -19957,7 +19957,7 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; @@ -20028,8 +20028,8 @@ in drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; @@ -20093,13 +20093,13 @@ in ekho = callPackage ../applications/audio/ekho { }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; - electrum = libsForQt5.callPackage ../applications/misc/electrum { }; + electrum = libsForQt514.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -20231,7 +20231,7 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -20341,7 +20341,7 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -20364,7 +20364,7 @@ in geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; - ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; + ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; @@ -20399,7 +20399,7 @@ in gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { + goldendict = libsForQt514.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -20436,7 +20436,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = qt5.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -20563,7 +20563,7 @@ in redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; + flameshot = libsForQt514.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); @@ -20587,7 +20587,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { + freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; # pyside2 5.12 is broken under python 3.8 python3Packages = python37Packages; @@ -20613,7 +20613,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { }; + friture = libsForQt514.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { }; @@ -20707,17 +20707,17 @@ in opencv = python37Packages.opencv3; }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt514.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; moe = callPackage ../applications/editors/moe { }; - multibootusb = qt5.callPackage ../applications/misc/multibootusb {}; + multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb {}; praat = callPackage ../applications/audio/praat { }; @@ -20821,11 +20821,11 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; - gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -21172,7 +21172,7 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inkcut = libsForQt514.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; @@ -21182,13 +21182,13 @@ in lcms = lcms2; }; - inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = libsForQt514.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -21279,7 +21279,7 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; + k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; kail = callPackage ../tools/networking/kail { }; @@ -21310,18 +21310,18 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; + kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { }; inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -21335,7 +21335,7 @@ in kermit = callPackage ../tools/misc/kermit { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; + kexi = libsForQt514.callPackage ../applications/office/kexi { }; khronos = callPackage ../applications/office/khronos { }; @@ -21343,7 +21343,7 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; @@ -21371,7 +21371,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { inherit (kdeApplications) kidentitymanagement; inherit (kdeFrameworks) kdewebkit; }; @@ -21380,23 +21380,23 @@ in kondo = callPackage ../applications/misc/kondo { }; - konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { }; - kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { + krita = libsForQt514.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; - krusader = libsForQt5.callPackage ../applications/misc/krusader { }; + krusader = libsForQt514.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; @@ -21430,7 +21430,7 @@ in python3Packages = python36Packages; }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -21464,11 +21464,11 @@ in legit = gitAndTools.legit; - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; - librecad = libsForQt5.callPackage ../applications/misc/librecad { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; @@ -21492,7 +21492,7 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt5.callPackage ../applications/office/libreoffice + libreoffice = libsForQt514.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; @@ -21565,13 +21565,13 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -21654,7 +21654,7 @@ in mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; - mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; + mapmap = libsForQt514.callPackage ../applications/video/mapmap { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; @@ -21700,7 +21700,7 @@ in meme = callPackage ../applications/graphics/meme { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { + mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -21715,7 +21715,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -21744,7 +21744,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; + minitube = libsForQt514.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { }; @@ -21949,7 +21949,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -22001,7 +22001,7 @@ in ostinato = callPackage ../applications/networking/ostinato { }; p4 = callPackage ../applications/version-management/p4 { }; - p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; + p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; @@ -22050,7 +22050,7 @@ in i3GapsSupport = false; }; - polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; @@ -22060,11 +22060,11 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; - rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; + rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { + shotcut = libsForQt514.callPackage ../applications/video/shotcut { libmlt = mlt; }; @@ -22085,7 +22085,7 @@ in smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube {}; + smtube = libsForQt514.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; @@ -22163,7 +22163,7 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt514.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -22206,7 +22206,7 @@ in nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; notbit = callPackage ../applications/networking/mailreaders/notbit { }; @@ -22235,11 +22235,11 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; - obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; @@ -22281,7 +22281,7 @@ in openjump = callPackage ../applications/misc/openjump { }; - openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; + openorienteering-mapper = libsForQt514.callPackage ../applications/gis/openorienteering-mapper { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; @@ -22550,9 +22550,9 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -22566,7 +22566,7 @@ in pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; - pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; + pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; @@ -22599,7 +22599,7 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { + qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -22611,11 +22611,11 @@ in qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {}; garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; @@ -22631,7 +22631,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; + qnotero = libsForQt514.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {}; @@ -22644,7 +22644,7 @@ in qsstv = qt5.callPackage ../applications/radio/qsstv { }; - qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { guvcview = guvcview.override { @@ -22692,9 +22692,9 @@ in quilter = callPackage ../applications/editors/quilter { }; - quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -22725,7 +22725,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -22743,9 +22743,9 @@ in raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -22761,7 +22761,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -22781,7 +22781,7 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; rgp = libsForQt5.callPackage ../development/tools/rgp { }; @@ -22807,11 +22807,11 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt5.callPackage ../applications/editors/rstudio { + rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; }; @@ -22849,13 +22849,13 @@ in sakura = callPackage ../applications/misc/sakura { }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; + sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = qt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = libsForQt514.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { }; @@ -22865,9 +22865,9 @@ in inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; + scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { protobuf = protobuf3_1; @@ -22993,7 +22993,7 @@ in maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; + maestral-gui = libsForQt514.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; @@ -23030,11 +23030,11 @@ in curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = libsForQt514.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; + curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -23052,7 +23052,7 @@ in sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; - skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; @@ -23068,11 +23068,11 @@ in sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; + skanlite = libsForQt514.callPackage ../applications/office/skanlite { }; soci = callPackage ../development/libraries/soci { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; @@ -23171,7 +23171,7 @@ in swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { + swift-im = libsForQt514.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; boost = boost168; }; @@ -23384,7 +23384,7 @@ in todoman = callPackage ../applications/office/todoman { }; - toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; + toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { }; topydo = callPackage ../applications/misc/topydo {}; @@ -23396,7 +23396,7 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; - tony = libsForQt5.callPackage ../applications/audio/tony { }; + tony = libsForQt514.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -23442,7 +23442,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { + trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { inherit (kdeApplications) akonadi-contacts; }; @@ -23502,7 +23502,7 @@ in utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt5.callPackage ../applications/misc/valentina { }; + valentina = libsForQt514.callPackage ../applications/misc/valentina { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -23539,7 +23539,7 @@ in vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; @@ -23558,7 +23558,7 @@ in neovim = wrapNeovim neovim-unwrapped { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + neovim-qt = libsForQt514.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -23586,7 +23586,7 @@ in system-libvirt = libvirt; }; - virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; @@ -23596,7 +23596,7 @@ in virtual-ans = callPackage ../applications/audio/virtual-ans {}; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; }; @@ -23733,9 +23733,9 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -23813,7 +23813,7 @@ in worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -24198,7 +24198,7 @@ in inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt5.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -24238,7 +24238,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { + zanshin = libsForQt514.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; @@ -24281,7 +24281,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -24309,7 +24309,7 @@ in withGui = false; }; - bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; @@ -24318,10 +24318,10 @@ in withGui = false; }; - bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-gold = libsForQt5.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; + bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; btc1 = callPackage ../applications/blockchains/btc1.nix { @@ -24339,7 +24339,7 @@ in dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; - digibyte = libsForQt5.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; @@ -24359,7 +24359,7 @@ in ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; @@ -24382,7 +24382,7 @@ in namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivx = libsForQt514.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; @@ -24393,7 +24393,7 @@ in tessera = callPackage ../applications/blockchains/tessera.nix { }; - vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; @@ -24525,7 +24525,7 @@ in chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt5.callPackage ../games/chiaki { }; + chiaki = libsForQt514.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -24577,7 +24577,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt5.callPackage ../applications/graphics/digikam { + digikam = libsForQt514.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; @@ -24758,7 +24758,7 @@ in hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt5.callPackage ../games/hedgewars { + hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -24956,7 +24956,7 @@ in papermc = callPackage ../games/papermc { }; - pentobi = libsForQt5.callPackage ../games/pentobi { }; + pentobi = libsForQt514.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { boost = boost166; @@ -25101,7 +25101,7 @@ in solarus = libsForQt5.callPackage ../games/solarus { }; - solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; + solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -25944,7 +25944,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING @@ -26163,7 +26163,7 @@ in adms = callPackage ../applications/science/electronics/adms { }; - appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; + appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { }; # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. @@ -26172,7 +26172,7 @@ in openssl = openssl_1_0_2; }; - eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; + eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; @@ -26209,7 +26209,7 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; - qcsxcad = libsForQt5.callPackage ../applications/science/electronics/qcsxcad { }; + qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; qucs = callPackage ../applications/science/electronics/qucs { }; @@ -26438,7 +26438,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -26478,7 +26478,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; @@ -26752,7 +26752,7 @@ in mamba = callPackage ../applications/audio/mamba{ }; - mame = libsForQt5.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -27264,7 +27264,7 @@ in prow = callPackage ../applications/networking/cluster/prow { }; - tellico = libsForQt5.callPackage ../applications/misc/tellico { }; + tellico = libsForQt514.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -27313,7 +27313,7 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; + vnote = libsForQt514.callPackage ../applications/office/vnote { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -27395,7 +27395,7 @@ in vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; From 6e8bef3067fff08739019c013048523f836e65c3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 08:44:44 -0500 Subject: [PATCH 104/499] appstream-qt: build library with all Qt versions --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76f0a6d59c80..7b25ed63ee2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11744,8 +11744,6 @@ in appstream-glib = callPackage ../development/libraries/appstream-glib { }; - appstream-qt = libsForQt5.callPackage ../development/libraries/appstream/qt.nix { }; - apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { @@ -14901,6 +14899,8 @@ in alkimia = callPackage ../development/libraries/alkimia { }; + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; From b32b655ce92c7b110a05257d86e4efbaeec3e363 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:21:53 -0500 Subject: [PATCH 105/499] plasma-wayland-protocols: add ttuegel as maintainer --- pkgs/development/libraries/plasma-wayland-protocols/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index a84c3518c4a8..2d3a5239d7b7 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -20,5 +20,6 @@ mkDerivation rec { description = "Plasma Wayland Protocols"; license = lib.licenses.lgpl21Plus; platforms = qtbase.meta.platforms; + maintainers = [ lib.maintainers.ttuegel ]; }; } From f021cb4a83560dad8360592b5369059cc993d789 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:22:45 -0500 Subject: [PATCH 106/499] plasma-wayland-protocols: build with all Qt versions --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b25ed63ee2e..d75fb5b570b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14949,6 +14949,8 @@ in phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -22031,8 +22033,6 @@ in planner = callPackage ../applications/office/planner { }; - plasma-wayland-protocols = libsForQt5.callPackage ../development/libraries/plasma-wayland-protocols { }; - playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; From 521fe0290aeee2a20219d2ffd7808d6e7cf0ba0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:14:57 -0500 Subject: [PATCH 107/499] plasma5.thirdParty: move third-party addons here --- .../plasma-5/{ => 3rdparty}/addons/caffeine-plus.nix | 0 .../kwin/scripts/dynamic-workspaces.nix | 0 .../{ => 3rdparty}/kwin/scripts/krohnkite.nix | 0 .../plasma-5/{ => 3rdparty}/kwin/scripts/tiling.nix | 0 pkgs/desktops/plasma-5/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 12 +++++------- 6 files changed, 13 insertions(+), 7 deletions(-) rename pkgs/desktops/plasma-5/{ => 3rdparty}/addons/caffeine-plus.nix (100%) rename pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/dynamic-workspaces.nix (100%) rename pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/krohnkite.nix (100%) rename pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/tiling.nix (100%) diff --git a/pkgs/desktops/plasma-5/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix similarity index 100% rename from pkgs/desktops/plasma-5/addons/caffeine-plus.nix rename to pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/tiling.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 07b464258149..265c22b55655 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -138,6 +138,14 @@ let systemsettings = callPackage ./systemsettings.nix {}; user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; + + thirdParty = let inherit (libsForQt5) callPackage; in { + plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; + kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; + kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; + krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + }; + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d75fb5b570b9..cc6ec4d348a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25495,13 +25495,11 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; - plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; - - kwin-dynamic-workspaces = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix { }; - - kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; - - krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite; ### SCIENCE From 4fd58aa4e18c06ead397ad45d68b76d0930c6cbb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:23:24 -0500 Subject: [PATCH 108/499] lxqt: pin to Qt 5.14 --- pkgs/desktops/lxqt/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 45714260381b..9105cb0c9c37 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -53,14 +53,14 @@ let preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT - pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel - pkgs.libsForQt5.libkscreen # provides plugins for screen management software + libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + libsForQt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc6ec4d348a1..ca4c69c80961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25440,7 +25440,8 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5; + libsForQt5 = libsForQt514; + inherit pkgs; inherit (lib) makeScope; }); From 20bfb27eaf6b1ebc796dae9eb9a1017a2e0aa534 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:36:47 -0500 Subject: [PATCH 109/499] nixos/plasma5: Use Qt 5.14 --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 75bf55a26396..869adee5552b 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,8 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; + inherit (pkgs) kdeApplications plasma5; + libsForQt5 = pkgs.libsForQt514; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; From 282aadbd36c6f75cde7abf62562020f7d1c15341 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:50:29 -0500 Subject: [PATCH 110/499] Revert "python.pkgs.pyqt5: 5.14.2 -> 5.15.0" This reverts commit 3977fed49ee33e3c42bca884a4872fdd1857ead3. --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- pkgs/development/python-modules/sip/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2af28bef0c95..ece9ad5b4a3f 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.15.0"; + version = "5.14.2"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "sha256-xvdUiP/VNlpliTvGTqgqaVfbEm+/4zZUvNQ64cMMUvk="; + sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 760c5bca9ee1..2bc8b70e4ca5 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.23"; + version = "4.19.22"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "sha256-IsqbzsU4gRTkDUqv18zQxP4HIpe2KNDFzfovAQwLx+c="; + sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; }; configurePhase = '' From 65b0805f8f38b3d2a6585f4217f026c011cd2cbf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:54:34 -0500 Subject: [PATCH 111/499] pyqt5: Use Qt 5.14 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e17ccce7f27f..2ef6bdebe862 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5187,7 +5187,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt514.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5200,7 +5200,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt514.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; From 575b3a053aacd5630b44cc73c4e5505baebfe6d5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 13:50:50 -0500 Subject: [PATCH 112/499] plasma5: mark broken with Qt >= 5.15 --- pkgs/desktops/plasma-5/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 265c22b55655..8ab4b60156c6 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -36,6 +36,7 @@ let }; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {}; packages = self: with self; let @@ -82,6 +83,7 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { + broken = lib.versionAtLeast qtbase.version "5.15"; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; From da7588178814b26b505f61023969236504e16ab5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 14:33:28 -0500 Subject: [PATCH 113/499] lxqt: fix qtsvg import --- pkgs/desktops/lxqt/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 9105cb0c9c37..90e466f7471e 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeScope, libsForQt5 }: +{ pkgs, makeScope, libsForQt5, qt5 }: let packages = self: with self; { @@ -60,7 +60,7 @@ let pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - libsForQt5.qtsvg # provides QT5 plugins for svg icons + qt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca4c69c80961..49b4dec866a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25440,6 +25440,7 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { + qt5 = qt514; libsForQt5 = libsForQt514; inherit pkgs; inherit (lib) makeScope; From 3cbcc14eef897607c50be4a9918d88614ea9881e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 07:59:07 -0500 Subject: [PATCH 114/499] pythonPackages: synchronize Qt 5 version --- pkgs/top-level/python-packages.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef6bdebe862..4702a2ad0630 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14,6 +14,11 @@ with pkgs.lib; +let + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; +in + let packages = ( self: @@ -3576,7 +3581,7 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage isPy27 fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -4162,7 +4167,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); owslib = callPackage ../development/python-modules/owslib { }; @@ -4483,8 +4488,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; + inherit (qt5) qtbase; + inherit (libsForQt5) poppler; inherit (pkgs) pkgconfig; }; @@ -5187,7 +5192,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = pkgs.libsForQt514.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5200,7 +5205,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt514.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -5901,7 +5906,7 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; From e0cb1ac4a7b6eee41ca971797213271114be5377 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 13:07:34 +0000 Subject: [PATCH 115/499] anydesk: 6.0.0 -> 6.0.1 --- pkgs/applications/networking/remote/anydesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 46221ac14789..643efd0f0f27 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "19c6blkkqpyjf330v16mdmsh7q6x087p6gw5ag8r2mc6jwq5ixlx"; + x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp"; i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { urls = [ From eb174d1f4b1f0e66cdc2ae9231213e8dbfc8274c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 08:21:25 -0500 Subject: [PATCH 116/499] solarus: synchronize Qt version with solarus-quest-editor --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49b4dec866a0..24750fba0271 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25099,8 +25099,8 @@ in lua = lua5_1; }; - solarus = libsForQt5.callPackage ../games/solarus { }; - + # solarus and solarus-quest-editor must use the same version of Qt. + solarus = libsForQt514.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. From 487ea9d055cb75f5179c2fa00bec981d7fe89172 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:25:07 +0200 Subject: [PATCH 117/499] Update jetbrains.clion 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fa382cc88362..d9212c16f84f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1j80k6r4nbr8abwkpx78sy3jzq3jsywn2k6g4mjx6h0adwxswymm"; /* updated by script */ + sha256 = "1sma3ay02lajg6q1g3k05gi7jdja7cf9rxb9v0w62s6z87l719bv"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml From 977620b0292ca8c04cd33fab4a0dfbc744956f68 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:25:30 +0200 Subject: [PATCH 118/499] Update jetbrains.datagrip 2020.2 -> 2020.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d9212c16f84f..9766b073f94c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0d0m6v4lr6qhi79csdpcyiyd2hnhlsan9lpnjmhkdxd84i1dl15a"; /* updated by script */ + sha256 = "1bk6z6mirrykypb4j2wa4744v0m9y1n7973qgj6z3dsifrq9q7zc"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; From 120d6ed2fc92780ba8e746ba73ee68fcfd475ac5 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:25:44 +0200 Subject: [PATCH 119/499] Update jetbrains.goland 2020.2.1 -> 2020.2.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9766b073f94c..8e17543bb7a0 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "15jd2yn4g3lya54ppcp8b0bvf2pp2khdvqba2g1aml16d5z8mkq6"; /* updated by script */ + sha256 = "1r6bbx5hsg82l1pa3syfdi8nbsz6rrfszsw4dmwcnxvccp2hs3mh"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; From 70706259a44a7a1705825b09b716b9171aa567ca Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:26:22 +0200 Subject: [PATCH 120/499] Update jetbrains.idea-community 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8e17543bb7a0..b37e6e893fc8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0rymyyhgm42i487dhlxh78shyvq4hd56frgz7wrqf85hg2j5ha0y"; /* updated by script */ + sha256 = "055hy5jy5151x3gf8hn7ar36br545qr253fz9wrc3b49wydg01x1"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; From 1281a5748cd1e0d6e2b7a3cc21348baa0f9d6d92 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:26:37 +0200 Subject: [PATCH 121/499] Update jetbrains.idea-ultimate 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b37e6e893fc8..ff4ce68f562d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "00mbf8asxjdnfciz6bl8b83kqknqdnars5w5w5w38rmza53pzxsi"; /* updated by script */ + sha256 = "1g18l3malsyn7dij4w83yfcsb8msa0s89mzlld3dby8hr9bq0aqm"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; From 1ae3cac8fc6fd743e4776306a2ea1c3c79af582f Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:26:58 +0200 Subject: [PATCH 122/499] Update jetbrains.mps 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index ff4ce68f562d..43b3d0433b32 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.4"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; - sha256 = "1ncvq834vn47pmh3q875hgqi4m7h3inljp89w3jwwhjn3g985ysz"; /* updated by script */ + sha256 = "1j5n100fl8yvfla2slm95wv499azwzzxigp1kdcaj8xbc0a0mp7c"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; From d0ce498d54a68a573b4767bc643d6e2b1ec43062 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:27:13 +0200 Subject: [PATCH 123/499] Update jetbrains.phpstorm 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 43b3d0433b32..60db072d441d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1zxhb2w7nivnx8habcf5vii6bwzaihs5x8smy0zf8ngv3xwr6vjc"; /* updated by script */ + sha256 = "14hz6w5lgn8ddscicm4s9xhi07j5adsq0bmyr8amzmj5q6jgw4p9"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; From b5a8a3b87d808cac600b354e0da824a4ba90271e Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:27:29 +0200 Subject: [PATCH 124/499] Update jetbrains.pycharm-community 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 60db072d441d..5b50b7723486 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "12pp3xp74dzgjrv2nz83dnqycb250kkgqlb3skjkdx9pabmfxck0"; /* updated by script */ + sha256 = "0kml58v6clqj0j0vlvghrywxym2n9h41izazzn4srn7wjj9010fa"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; From 2fa77fecfaf3fbd05ac965e393a7ebe05b9dc3cf Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:27:45 +0200 Subject: [PATCH 125/499] Update jetbrains.pycharm-professional 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5b50b7723486..f533a997a6ae 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0xq0nba31yc7cm1lbgkmgfbr5kp5fq5k7j2n6kampm2hyx5fa0ak"; /* updated by script */ + sha256 = "0ml9fg1dlfg8sdp9n8nlsj7z88dx0ac1kvlpk61p7q5di1lyxc94"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; From fe552e4534886ae65461a5ae894d8eb523150d2e Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:28:00 +0200 Subject: [PATCH 126/499] Update jetbrains.rider 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f533a997a6ae..d236fe7e1a22 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0fxgdxsrrl659lh45slikgck6jld90rd6nnj8gj3aixq0yp5pkix"; /* updated by script */ + sha256 = "0xrk7n0mprzy7dfkx3vj5wasw5031jl61qkh89y6w031hp77vq7n"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; From 7b46916f94b67cb18f3c46f99ed81da509b6bef3 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:28:17 +0200 Subject: [PATCH 127/499] Update jetbrains.ruby-mine 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d236fe7e1a22..729150510f87 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1caxd5qcxwwrdy3ma87gnywr5czg3lam1n2gwbnc7hdxgfnvn3qz"; /* updated by script */ + sha256 = "1pkzql710bc4qdz5pdhh0yx9wkqx85qwkwm1jvvvxbvbsj299vcb"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; From ee939c9d1878183e84054b1b0766b76ff33d2c20 Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 7 Sep 2020 15:28:30 +0200 Subject: [PATCH 128/499] Update jetbrains.webstorm 2020.2 -> 2020.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 729150510f87..3c3d9fb0a5a6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "100j2q9hz0a50n3x3khk7hap7b496g6sx0y6q7n7vy2zayh5ibm5"; /* updated by script */ + sha256 = "1sx67bms90fsc1bf6pqz1rd1x9aysj0xxb8d7cnclz6bv8kzhgfp"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 5d01b6cb1789128a1125f74f2b29cb47a10f3ddb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 08:31:31 -0500 Subject: [PATCH 129/499] vlc: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24750fba0271..99966a87145f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23653,7 +23653,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt5.vlc; + vlc = libsForQt514.vlc; vlc_qt5 = vlc; From 04e5a9e9eb34d2b1a1c52f9cfccde598bb18b035 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 14:11:13 +0000 Subject: [PATCH 130/499] consul: 1.8.0 -> 1.8.3 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 196b680796c8..b2f9b27e8f80 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.0"; + version = "1.8.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1rmybh0piqlbsy5ihqy9cmg0vsgg9pnxiza2kia8ww4qx98nvh6y"; + sha256 = "172m8izv0jqvwxl8nwxdy6x7syp7gn70x4zx41h6ajy4h564l16y"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "12a2x8j4kc1vi3ip0cz81k6anfwac23iqqyz00wf7wpvgxqzcxn3"; + vendorSha256 = "1q4mvmypza2n2kqnri71y9k2qqmb34x3pa7ifql8gwlp8r0bicy7"; doCheck = false; From c6268906e7e1cdd5c98526db41255c9f6e7af5d2 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 5 Sep 2020 11:42:03 -0400 Subject: [PATCH 131/499] sparkleshare: Add git-lfs dependency. SparkleShare failed to sync some repos because it failed to find the git-lfs command. --- pkgs/applications/version-management/sparkleshare/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index d4ae8a95b3ee..ef61d518a1ec 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -3,6 +3,7 @@ coreutils, fetchFromGitHub, git, + git-lfs, glib, gtk-sharp-3_0, lib, @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { paths = [ coreutils git + git-lfs glib mono openssh From 4008f2c6ea6595c87c4c80ce57105a60ef5fdfea Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 7 Sep 2020 16:35:47 +0200 Subject: [PATCH 132/499] xwallpaper: remove libseccomp dependency --- pkgs/tools/X11/xwallpaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index ad2995b4ca60..ff33055d41ef 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkg-config, autoreconfHook, pixman, xcbutil, xcbutilimage -, libseccomp, libjpeg, libpng, libXpm }: +, libjpeg, libpng, libXpm }: stdenv.mkDerivation rec { pname = "xwallpaper"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; + buildInputs = [ pixman xcbutilimage xcbutil libjpeg libpng libXpm ]; meta = with stdenv.lib; { homepage = "https://github.com/stoeckmann/xwallpaper"; From cff6e7b161fd1cc4df9ba09374a0df0f23b34b69 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 7 Sep 2020 16:36:38 +0200 Subject: [PATCH 133/499] xwallpaper: formatting fix --- pkgs/tools/X11/xwallpaper/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index ff33055d41ef..759613553fe0 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, pixman, xcbutil, xcbutilimage -, libjpeg, libpng, libXpm }: +{ stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, pixman +, xcbutil +, xcbutilimage +, libjpeg +, libpng +, libXpm +}: stdenv.mkDerivation rec { pname = "xwallpaper"; From 3dc2c52851fd373f2ffe4ea87c86b94b575cb391 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 5 Sep 2020 01:12:08 +0200 Subject: [PATCH 134/499] exiv2: clean up - EXIV2_BUILD_PO has been replaced by EXIV2_ENABLE_NLS https://github.com/Exiv2/exiv2/commit/076585d1476283bc7cffcf08e9006fc64ffbfa10 Confusingly, the former still appears in the flag summary. - Remove enableParallelBuilding since it is on by default with CMake - Reorder the expression - Apply upstream GNUInstallDirs patch - Build stuff in build phase, not in install phase - Add maintainers field (empty at the moment) --- pkgs/development/libraries/exiv2/default.nix | 38 +++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index e7c41bcedc5e..24c39cb8cdcf 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.3"; + outputs = [ "out" "dev" "doc" "man" ]; + src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; @@ -31,21 +33,16 @@ stdenv.mkDerivation rec { url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch"; sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx"; }) - ]; - cmakeFlags = [ - "-DEXIV2_BUILD_PO=ON" - "-DEXIV2_BUILD_DOC=ON" - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - # Can probably be removed once https://github.com/Exiv2/exiv2/pull/1263 is merged. - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + # Use correct paths with multiple outputs + # https://github.com/Exiv2/exiv2/pull/1275 + (fetchpatch { + name = "cmake-fix-aarch64.patch"; + url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch"; + sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA="; + }) ]; - outputs = [ "out" "dev" "doc" "man" ]; - nativeBuildInputs = [ cmake doxygen @@ -65,7 +62,13 @@ stdenv.mkDerivation rec { which ]; + cmakeFlags = [ + "-DEXIV2_ENABLE_NLS=ON" + "-DEXIV2_BUILD_DOC=ON" + ]; + buildFlags = [ + "all" "doc" ]; @@ -102,20 +105,11 @@ stdenv.mkDerivation rec { ) ''; - # Fix CMake export paths. Can be removed once https://github.com/Exiv2/exiv2/pull/1263 is merged. - postFixup = '' - sed -i "$dev/lib/cmake/exiv2/exiv2Config.cmake" \ - -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${_IMPORT_PREFIX}@$dev@" \ - -e "/Compute the installation prefix/ a set(_IMPORT_PREFIX \"$out\")" \ - -e "/^get_filename_component(_IMPORT_PREFIX/ d" - ''; - - enableParallelBuilding = true; - meta = with stdenv.lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; + maintainers = [ ]; }; } From 210bfccb538e99529e20d9bd8afd0e9a6496a5cb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:10:27 -0500 Subject: [PATCH 135/499] qca2-qt5: remove in favor of libsForQt5.qca-qt5 --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- .../networking/instant-messengers/psi/default.nix | 4 ++-- pkgs/development/libraries/qoauth/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 430a7cc4ca77..cf7c1008a080 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca2-qt5, libsecret, libXScrnSaver, hunspell +, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtx11extras qttools qtwebengine - libidn qca2-qt5 libsecret libXScrnSaver hunspell + libidn qca-qt5 libsecret libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 19438c4d037b..c1984a218c8a 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca2-qt5, libXScrnSaver, hunspell +, libidn, qca-qt5, libXScrnSaver, hunspell }: stdenv.mkDerivation rec { pname = "psi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase qtmultimedia qtx11extras qttools qtwebengine - libidn qca2-qt5 libXScrnSaver hunspell + libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 85682e2c2a29..386019a00672 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, qca2-qt5 }: +{ stdenv, fetchurl, qt5, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation { -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' ''; - buildInputs = [ qt5.qtbase qca2-qt5 ]; + buildInputs = [ qt5.qtbase qca-qt5 ]; nativeBuildInputs = [ qt5.qmake ]; - NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; + NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99966a87145f..ac0cdd6d175e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14767,7 +14767,6 @@ in qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; From 91e0c687ac5503b2dfd665867359b3f6fc86ab3d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:13:12 -0500 Subject: [PATCH 136/499] qoauth: move to libsForQt5 --- pkgs/development/libraries/qoauth/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 386019a00672..41e4b80d9c3a 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, qca-qt5 }: +{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -15,15 +15,15 @@ stdenv.mkDerivation { -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' ''; - buildInputs = [ qt5.qtbase qca-qt5 ]; - nativeBuildInputs = [ qt5.qmake ]; + buildInputs = [ qtbase qca-qt5 ]; + nativeBuildInputs = [ qmake ]; NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; - inherit (qt5.qtbase.meta) platforms; + inherit (qtbase.meta) platforms; license = licenses.lgpl21; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac0cdd6d175e..4e549f652dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14772,8 +14772,6 @@ in qjson = callPackage ../development/libraries/qjson { }; - qoauth = callPackage ../development/libraries/qoauth { }; - qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { @@ -14963,7 +14961,10 @@ in qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; - qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { }; + + qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; + + qoauth = callPackage ../development/libraries/qoauth { }; qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; From 4b00ed2c22dc0c99ed4404b238d638f321cca93e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:13:36 -0500 Subject: [PATCH 137/499] qtpbfimageplugin: move to libsForQt5 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e549f652dde..8b995d25cceb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14978,6 +14978,8 @@ in withQt5 = true; }; + qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; + qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; @@ -14999,8 +15001,6 @@ in qtkeychain = callPackage ../development/libraries/qtkeychain { }; - qtpbfimageplugin = libsForQt5.callPackage ../development/libraries/qtpbfimageplugin { }; - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; From b8b359c3c9130ca49ec0d7a6c6907523a640862f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:13:54 -0500 Subject: [PATCH 138/499] qtstyleplugin-kvantum: libsForQt5 packages may not be pinned --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b995d25cceb..18a47d2c267a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14982,7 +14982,7 @@ in qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; - qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; quazip = callPackage ../development/libraries/quazip { }; From 817fd0f17bb4eab19ab51e88bf6859a10f10382f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:14:08 -0500 Subject: [PATCH 139/499] colmap: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18a47d2c267a..bf21f2192cb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8432,7 +8432,7 @@ in colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; colmapWithCuda = colmap.override { cudaSupport = true; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; From 9cfd788879a096e260e3197b49aff98f2fbfbea2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:27:14 -0500 Subject: [PATCH 140/499] dupeguru: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf21f2192cb2..0f8e7945b7c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -276,7 +276,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { }; + dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; dump1090 = callPackage ../applications/radio/dump1090 { }; From ad39c93e7f20a179dce5abc7ad0b01794bf905a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:28:06 -0500 Subject: [PATCH 141/499] qtcurve: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f8e7945b7c7..8a8c4ebe9d60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19107,7 +19107,7 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt5.callPackage ../data/themes/qtcurve {}; + qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; From c5059b88b58165eeff10ff9e6b0312540ae41406 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:31:25 -0500 Subject: [PATCH 142/499] gmic-qt: pin to qt514, synchronize with krita --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a8c4ebe9d60..e3e5e84f72fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2033,7 +2033,7 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { }; gmic-qt-krita = gmic-qt.override { variant = "krita"; From 76362dd7eb2622f7809961b400f357f360de537f Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 7 Sep 2020 16:39:18 +0200 Subject: [PATCH 143/499] nixos/bitwarden_rs: add environmentFile option Add the option `environmentFile` to allow passing secrets to the service without adding them to the Nix store, while keeping the current configuration via the existing environment file intact. --- .../security/bitwarden_rs/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/bitwarden_rs/default.nix b/nixos/modules/services/security/bitwarden_rs/default.nix index 903a53270377..a04bc883bf0f 100644 --- a/nixos/modules/services/security/bitwarden_rs/default.nix +++ b/nixos/modules/services/security/bitwarden_rs/default.nix @@ -81,6 +81,23 @@ in { the environment template file. ''; }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/root/bitwarden_rs.env"; + description = '' + Additional environment file as defined in + systemd.exec5 + . + + Secrets like ADMIN_TOKEN and SMTP_PASSWORD + may be passed to the service without adding them to the world-readable Nix store. + + Note that this file needs to be available on the host on which + bitwarden_rs is running. + ''; + }; }; config = mkIf cfg.enable { @@ -101,7 +118,7 @@ in { serviceConfig = { User = user; Group = group; - EnvironmentFile = configFile; + EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile; ExecStart = "${bitwarden_rs}/bin/bitwarden_rs"; LimitNOFILE = "1048576"; LimitNPROC = "64"; From 6679466fac78b5f76c8bdc97153f057fb9036cac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 15:41:00 +0000 Subject: [PATCH 144/499] clipgrab: 3.8.13 -> 3.8.14 --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 0e39ab056853..f8b74a175474 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.13"; + version = "3.8.14"; src = fetchurl { - sha256 = "0ryaha33m41y0xjrspa838qqr4iy2c8vbvhbb334qimpqn1hj3q5"; + sha256 = "19337qjxwlkpdnnh6q0y4b8askk17a8zb88gifznllrk06a6pgyf"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; From a811e37d1c7bc6e0b68e7bf391fadd371db22850 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:35:11 -0500 Subject: [PATCH 145/499] roboschool: pin to qt514 --- pkgs/development/python-modules/roboschool/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 53b909844ac9..9387f3775beb 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -4,7 +4,7 @@ , python , fetchFromGitHub , fetchpatch -, qt5 +, qtbase , boost , assimp , gym @@ -33,14 +33,14 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig - qt5.qtbase # needs the `moc` tool + qtbase # needs the `moc` tool which ]; buildInputs = [ bullet-roboschool assimp - qt5.qtbase + qtbase boost ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4702a2ad0630..d7c614b9f707 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6086,8 +6086,9 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; - }; # use normal pkgconfig, not the python package + inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (qt5) qtbase; + }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From 0368d93a9e978b90ba844d83b292178e3a8c7574 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:37:48 -0500 Subject: [PATCH 146/499] qtikz: proper Qt dependencies --- pkgs/applications/graphics/ktikz/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 4ddc2074f2f4..f817a3321606 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, wrapQtAppsHook -, poppler, qt5, gnuplot +, poppler, gnuplot +, qmake, qtbase, qttools }: # This package only builds ktikz without KDE integration because KDE4 is @@ -36,10 +37,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig qt5.qttools qt5.qmake wrapQtAppsHook ]; - QT_PLUGIN_PATH = "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"; + nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; - buildInputs = [ qt5.qtbase poppler ]; + buildInputs = [ qtbase poppler ]; enableParallelBuilding = true; qmakeFlags = [ From e865c6ffccb80452f6353bb4bd0695c3199374cb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:53:37 -0500 Subject: [PATCH 147/499] pivy: pin to qt514 --- pkgs/development/python-modules/pivy/default.nix | 14 +++++++------- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 36427f995859..de75a7d390c3 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake }: buildPythonPackage rec { pname = "pivy"; @@ -12,20 +12,20 @@ buildPythonPackage rec { }; nativeBuildInputs = with pkgs; [ - swig qt5.qmake cmake + swig qmake cmake ]; buildInputs = with pkgs; with xorg; [ - coin3d soqt qt5.qtbase + coin3d soqt qtbase libGLU libGL libXi libXext libSM libICE libX11 ]; NIX_CFLAGS_COMPILE = toString [ - "-I${pkgs.qt5.qtbase.dev}/include/QtCore" - "-I${pkgs.qt5.qtbase.dev}/include/QtGui" - "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" - "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" + "-I${qtbase.dev}/include/QtCore" + "-I${qtbase.dev}/include/QtGui" + "-I${qtbase.dev}/include/QtOpenGL" + "-I${qtbase.dev}/include/QtWidgets" ]; dontUseQmakeConfigure = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7c614b9f707..67d96f10d745 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4417,7 +4417,9 @@ in { pipx = callPackage ../development/python-modules/pipx { }; - pivy = callPackage ../development/python-modules/pivy { }; + pivy = callPackage ../development/python-modules/pivy { + inherit (qt5) qtbase qmake; + }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; From 858ccc567c3f3a5efddd875797e47909b4b821ce Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:54:55 -0500 Subject: [PATCH 148/499] soqt: add to libsForQt5 --- pkgs/development/libraries/soqt/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index ff7c670ca0dc..7a4e6c45cf2e 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: +{ fetchhg, stdenv, coin3d, qtbase, cmake, pkgconfig }: stdenv.mkDerivation { pname = "soqt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { fetchSubrepos = true; }; - buildInputs = [ coin3d qt5.qtbase ]; + buildInputs = [ coin3d qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e5e84f72fa..656daadc04b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14988,6 +14988,8 @@ in qwt = callPackage ../development/libraries/qwt/6.nix { }; + soqt = callPackage ../development/libraries/soqt { }; + telepathy = callPackage ../development/libraries/telepathy/qt { }; vlc = callPackage ../applications/video/vlc {}; @@ -15299,8 +15301,6 @@ in soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { }; - sord = callPackage ../development/libraries/sord {}; soundtouch = callPackage ../development/libraries/soundtouch {}; From 8c3cef55c5b63871179ae5439d78e58665cff2be Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:55:46 -0500 Subject: [PATCH 149/499] pivy: import soqt properly --- pkgs/development/python-modules/pivy/default.nix | 2 +- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index de75a7d390c3..8f1b7de92b9c 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67d96f10d745..b10662bb15bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4419,6 +4419,7 @@ in { pivy = callPackage ../development/python-modules/pivy { inherit (qt5) qtbase qmake; + inherit (libsForQt5) soqt; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; From 7c07beb2a9388e78343ecb37caa739b0c9bbc4d4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:58:27 -0500 Subject: [PATCH 150/499] plover: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 656daadc04b2..c4f9b25fd6af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22504,7 +22504,7 @@ in plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; From c67159fd7d553f734ff5a81ce1f3a1ad490ef56b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:07:31 -0500 Subject: [PATCH 151/499] obs-ndi: pin to qt514 --- pkgs/applications/video/obs-studio/obs-ndi.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index 79f38fa8fe40..f22ddd39ee4b 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -5,14 +5,14 @@ # mkdir -p ~/.config/obs-studio/plugins/bin # ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/ -{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5, ndi }: +{ stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: stdenv.mkDerivation rec { pname = "obs-ndi"; version = "4.7.1"; nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio qt5.qtbase ndi ]; + buildInputs = [ obs-studio qtbase ndi ]; src = fetchFromGitHub { owner = "Palakis"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4f9b25fd6af..a847b65ca458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22241,7 +22241,7 @@ in obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; - obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { }; obsidian = callPackage ../applications/misc/obsidian { }; From 85255c33f5dc5e3ba840251e4fc12a9c60a16d73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 16:12:19 +0000 Subject: [PATCH 152/499] collectd: 5.11.0 -> 5.12.0 --- pkgs/tools/system/collectd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index f625a441ba3f..278ab9056ad9 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,12 +8,12 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.11.0"; + version = "5.12.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"; + sha256 = "1mh97afgq6qgmpvpr84zngh58m0sl1b4wimqgvvk376188q09bjv"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From dde9da6f8902351701a9c28a3a6ccbe5fb044052 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:11:41 -0500 Subject: [PATCH 153/499] mumble: pin to qt514 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a847b65ca458..fd18179970d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21936,6 +21936,7 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; + qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { From c0c73c1f2105902c7fcb1a64d74cc4a785a2a70d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:14:09 -0500 Subject: [PATCH 154/499] airwave: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd18179970d4..c32886d646ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19412,7 +19412,7 @@ in ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { }; + airwave = callPackage ../applications/audio/airwave { qt5 = qt514; }; akira-unstable = callPackage ../applications/graphics/akira { }; From d1e022773d55a163a77af72e1af4a6f59452f9ed Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:20:28 -0500 Subject: [PATCH 155/499] dxflib: move to libsForQt5 --- pkgs/development/libraries/dxflib/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index e1cb8d2d9e26..1b63d8805fd9 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, qt5 +, qmake }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96"; }; nativeBuildInputs = [ - qt5.qmake + qmake ]; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro @@ -42,4 +42,3 @@ stdenv.mkDerivation rec { description = ''DXF file format library''; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c32886d646ce..1a4c0af0795c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12138,8 +12138,6 @@ in duckdb = callPackage ../development/libraries/duckdb {}; - dxflib = callPackage ../development/libraries/dxflib {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -14898,6 +14896,8 @@ in appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + dxflib = callPackage ../development/libraries/dxflib {}; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; From 77f840f14b7258fc52d06824d793f3aad9d2c288 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:22:07 -0500 Subject: [PATCH 156/499] ostinato: use wireshark with qt514 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a4c0af0795c..93a55c9af7ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22001,7 +22001,9 @@ in osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = callPackage ../applications/networking/ostinato { }; + ostinato = callPackage ../applications/networking/ostinato { + wireshark = wireshark.override { qt5 = qt514; }; + }; p4 = callPackage ../applications/version-management/p4 { }; p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; From 896c71ec6abe179b5a2926f0bcf8e80e60b61f15 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:22:55 -0500 Subject: [PATCH 157/499] sky: pin to qt514 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a55c9af7ba..9b84d44ad086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22084,7 +22084,9 @@ in }; }; - sky = callPackage ../applications/networking/instant-messengers/sky {}; + sky = callPackage ../applications/networking/instant-messengers/sky { + qt5 = qt514; + }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; From d784ee398f70ba078a45ee7b201db27b8d74b89f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:23:38 -0500 Subject: [PATCH 158/499] freeciv: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b84d44ad086..13668e82a633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24669,7 +24669,7 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { }; + freeciv = callPackage ../games/freeciv { qt5 = qt514; }; freeciv_gtk = freeciv.override { gtkClient = true; From dafc1cea57a727fe41c5fbd28b9e29ea14306dcb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:30:08 -0500 Subject: [PATCH 159/499] saga: depends on libsForQt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13668e82a633..93b09daf2776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25046,7 +25046,7 @@ in rrootage = callPackage ../games/rrootage { }; - saga = callPackage ../applications/gis/saga { + saga = libsForQt514.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From fed923247a7eca63607f8f2c4347af2f0842c61e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 7 Sep 2020 18:25:18 +0200 Subject: [PATCH 160/499] gitRepo: 2.8 -> 2.9 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index eb3f95a354f4..b4e713848261 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "00sahddplisg55zpjz4v4sc7zqbh3apx36xv77g55nabwz7han8d"; + sha256 = "1ii6vjgs5nd2hhp475mqa48165garc7ac2w9fyspajaanc7zhnik"; }; patches = [ ./import-ssl-module.patch ]; From 63cf375edc0c05de5ab9bb5fb4e99a8438020727 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:41:33 -0500 Subject: [PATCH 161/499] vlc: mark broken with Qt 5.15 --- pkgs/applications/video/vlc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e655e0fbff46..365eb8cd991d 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; + broken = versionAtLeast qtbase.version "5.15"; }; } From 60a13a2240b4cafd851a592fcdcc5f4cb90c5e5f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:43:40 -0500 Subject: [PATCH 162/499] herqq: pin to qt514 --- pkgs/development/libraries/herqq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index d3433246b780..8dc0df3a9f2f 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,11 +1,11 @@ -{ stdenv, qt5, unzip, fetchFromGitHub, qtmultimedia }: +{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: stdenv.mkDerivation rec { version = "2.1.0"; pname = "herqq"; - nativeBuildInputs = [ qt5.qmake ]; - buildInputs = [ qt5.qtbase unzip qtmultimedia ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase unzip qtmultimedia ]; preConfigure = "cd herqq"; src = fetchFromGitHub { From 2c145f45889481a0d92f7d05ba8c8bd0818502bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 7 Sep 2020 18:41:21 +0200 Subject: [PATCH 163/499] libbpf: fixup build after the last staging iteration ... and add myself into meta.maintainers :-) --- pkgs/os-specific/linux/libbpf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 0f2f9aa86f42..1c54b93e8abc 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ../scripts/check-reallocarray.sh \ --replace '/bin/rm' 'rm' + # Without patching this the config-test program will be refused by our CC wrapper. + chmod +w ../scripts + sed -e '2a NIX_ENFORCE_PURITY=0' -i ../scripts/check-reallocarray.sh ''; # FIXME: Multi-output requires some fixes to the way the pkgconfig file is @@ -37,7 +40,7 @@ stdenv.mkDerivation rec { description = "Upstream mirror of libbpf"; homepage = "https://github.com/libbpf/libbpf"; license = with licenses; [ lgpl21 /* or */ bsd2 ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice vcunat ]; platforms = platforms.linux; }; } From 1c58417138f38ba9d87d259d616ad834afba8874 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:46:41 -0500 Subject: [PATCH 164/499] kotatogram-desktop: properly depend on libdbusmenu --- .../telegram/kotatogram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index cfb41fa9fc52..190e05158969 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg_3, openalSoft +, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; From 6b4021489bc92aaebede3bfaa51b227aeacd14d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Sep 2020 16:49:32 +0000 Subject: [PATCH 165/499] dico: 2.9 -> 2.10 --- pkgs/servers/dico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index ea549cd79677..69ec2e6222b7 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "dico"; - version = "2.9"; + version = "2.10"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0i9xqhy3h5nlizcmav4mv5ay8ivdgn4l4k0k7fxix3fsc87nijyr"; + sha256 = "0qag47mzs00d53hnrmh381r0jay42766vp5xrffmzmsn2307x8vl"; }; hardeningDisable = [ "format" ]; From 844da6b948792e95101e0576739d262e4851b973 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:49:46 -0500 Subject: [PATCH 166/499] flent: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93b09daf2776..885109fb14aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3658,7 +3658,7 @@ in flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; + flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; }; flpsed = callPackage ../applications/editors/flpsed { }; From 0e3fe30d5e0349e234e9003a96bcb6271ccef4cf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 12:12:24 -0500 Subject: [PATCH 167/499] vtkWithQt5: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885109fb14aa..6dfe1e265570 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15695,7 +15695,7 @@ in }); }; - vtkWithQt5 = vtk.override { qtLib = qt5; }; + vtkWithQt5 = vtk.override { qtLib = qt514; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; From 8d52422167d000102c590435d48b6ec5ef423fcd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 12:13:53 -0500 Subject: [PATCH 168/499] opentoonz: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dfe1e265570..b05d604daa95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22292,7 +22292,7 @@ in opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentoonz = (qt5.overrideScope' (_: _: { + opentoonz = (qt514.overrideScope' (_: _: { libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; })).callPackage ../applications/graphics/opentoonz { }; From 227b210693d61b0e8f554e9f3351fa8cc5f10712 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Sep 2020 13:07:21 +0200 Subject: [PATCH 169/499] =?UTF-8?q?pythonPackages.fontparts:=200.9.2=20?= =?UTF-8?q?=E2=86=92=200.9.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/fontparts/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index dd341fef8b3c..43fdae8ccafc 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.9.2"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "0hwzdppmrrw1xz49x36h6mcsrwya1f3zpqrc206y73j4pbn7fh0k"; + sha256 = "0q8ilc1ypmasci2x1nq69hnfsnvbi1czaxgsb3zgqd8777bn5v9z"; extension = "zip"; }; @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "An API for interacting with the parts of fonts during the font development process."; homepage = "https://github.com/robotools/fontParts"; + changelog = "https://github.com/robotools/fontParts/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; }; From 0aa340b2fce773cfeca9aab9f8793d6db83122ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= Date: Sun, 6 Sep 2020 04:26:34 +0100 Subject: [PATCH 170/499] imgsize: init at 2.1 --- .../python-modules/imgsize/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/imgsize/default.nix diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix new file mode 100644 index 000000000000..d4f066b8b0b2 --- /dev/null +++ b/pkgs/development/python-modules/imgsize/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "imgsize"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "ojii"; + repo = pname; + rev = version; + sha256 = "0k24qj4i996fz7lpjrs36il6lp51rh13b0j2wip87cy5v9109m2d"; + }; + + meta = with stdenv.lib; { + description = "Pure Python image size library"; + homepage = "https://github.com/ojii/imgsize"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e17ccce7f27f..5896adcacefc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2814,6 +2814,8 @@ in { imgaug = callPackage ../development/python-modules/imgaug { }; + imgsize = callPackage ../development/python-modules/imgsize { }; + immutables = callPackage ../development/python-modules/immutables { }; impacket = callPackage ../development/python-modules/impacket { }; From 15d87cb81c61d10a641449529ab94e1a2552492c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 7 Sep 2020 19:25:45 +0200 Subject: [PATCH 171/499] nixos/xmonad: allow passing command line arguments --- nixos/modules/services/x11/window-managers/xmonad.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 070758720fe3..c834b479a46c 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -76,6 +76,15 @@ in } ''; }; + + xmonadCliArgs = mkOption { + default = []; + type = with lib.types; listOf str; + description = '' + Command line arguments passed to the xmonad binary. + ''; + }; + }; }; config = mkIf cfg.enable { @@ -85,7 +94,7 @@ in start = let xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad"; in '' - systemd-cat -t xmonad ${xmonadCommand} & + systemd-cat -t xmonad -- ${xmonadCommand} ${lib.escapeShellArgs cfg.xmonadCliArgs} & waitPID=$! ''; }]; From b20ec4f719ed8e61781427762598b77ab3b9e70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 7 Sep 2020 19:36:58 +0200 Subject: [PATCH 172/499] pkgs/build-support/writers: allow passing ghc arguments in writeHaskell --- pkgs/build-support/writers/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 4673b4e6cd87..495a56b41974 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -164,12 +164,13 @@ rec { # ''; writeHaskell = name: { libraries ? [], - ghc ? pkgs.ghc + ghc ? pkgs.ghc, + ghcArgs ? [] }: makeBinWriter { compileScript = '' cp $contentPath tmp.hs - ${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs + ${ghc.withPackages (_: libraries )}/bin/ghc ${lib.escapeShellArgs ghcArgs} tmp.hs mv tmp $out ${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out" ''; From ec1f9624dae30744c7432a206c00793e4ba8dda9 Mon Sep 17 00:00:00 2001 From: laikq <55911173+laikq@users.noreply.github.com> Date: Mon, 20 Jul 2020 18:03:17 +0200 Subject: [PATCH 173/499] python: pa_ringbuffer: init at 0.1.3 --- .../python-modules/pa-ringbuffer/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pa-ringbuffer/default.nix diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix new file mode 100644 index 000000000000..fd05e7e8052e --- /dev/null +++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix @@ -0,0 +1,20 @@ +{ fetchFromGitHub, buildPythonPackage, lib }: + +buildPythonPackage rec { + pname = "pa-ringbuffer"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "spatialaudio"; + repo = "python-pa-ringbuffer"; + rev = "${version}"; + sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv"; + }; + + meta = { + description = "Adds ring buffer functionality"; + homepage = "https://github.com/spatialaudio/python-pa-ringbuffer"; + maintainers = with lib.maintainers; [ laikq ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5896adcacefc..4b629e2a1a6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3240,6 +3240,8 @@ in { libagent = callPackage ../development/python-modules/libagent { }; + pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; + libais = callPackage ../development/python-modules/libais { }; libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; From 1f8f476ca2a2dadd44ce395b328a1f687e61b5e6 Mon Sep 17 00:00:00 2001 From: laikq <55911173+laikq@users.noreply.github.com> Date: Mon, 20 Jul 2020 18:06:16 +0200 Subject: [PATCH 174/499] python: rtmixer: init at 0.1.1 --- .../python-modules/rtmixer/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/rtmixer/default.nix diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix new file mode 100644 index 000000000000..e1115bd81800 --- /dev/null +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -0,0 +1,40 @@ +{ fetchFromGitHub +, buildPythonPackage +, isPy27 +, cython +, portaudio +, cffi +, pa-ringbuffer +, sounddevice +, lib +}: + +buildPythonPackage rec { + pname = "rtmixer"; + version = "0.1.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "spatialaudio"; + repo = "python-rtmixer"; + rev = "${version}"; + sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y"; + fetchSubmodules = true; + }; + + buildInputs = [ portaudio ]; + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ + cffi + pa-ringbuffer + sounddevice + ]; + + meta = { + description = "Reliable low-latency audio playback and recording with Python, using PortAudio via the sounddevice module"; + homepage = "https://python-rtmixer.readthedocs.io"; + maintainers = with lib.maintainers; [ laikq ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b629e2a1a6a..1c6a3686fb79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3502,6 +3502,8 @@ in { mailman-web = callPackage ../servers/mail/mailman/web.nix { }; + rtmixer = callPackage ../development/python-modules/rtmixer { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; Mako = callPackage ../development/python-modules/Mako { }; From d4b6ea979a6474a64cf5101b6bea96671d6ead8e Mon Sep 17 00:00:00 2001 From: laikq <55911173+laikq@users.noreply.github.com> Date: Mon, 20 Jul 2020 18:07:26 +0200 Subject: [PATCH 175/499] python: pyopengl-accelerate: init at 3.1.5 --- .../pyopengl-accelerate/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pyopengl-accelerate/default.nix diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix new file mode 100644 index 000000000000..23de6b2323f0 --- /dev/null +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "pyopengl-accelerate"; + version = "3.1.5"; + + src = fetchPypi { + pname = "PyOpenGL-accelerate"; + inherit version; + sha256 = "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j"; + }; + + meta = { + description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x"; + homepage = "http://pyopengl.sourceforge.net/"; + maintainers = with lib.maintainers; [ laikq ]; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c6a3686fb79..24eecdd196ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5480,6 +5480,8 @@ in { pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; + pytest-html = callPackage ../development/python-modules/pytest-html { }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; From 1ee68120ce00a6c92b2b0d39874fd33bbb575f74 Mon Sep 17 00:00:00 2001 From: laikq <55911173+laikq@users.noreply.github.com> Date: Mon, 20 Jul 2020 18:09:40 +0200 Subject: [PATCH 176/499] friture: 0.37 -> unstable --- pkgs/applications/audio/friture/default.nix | 16 +++++---- .../audio/friture/unlock_constraints.patch | 34 +++++++++++++++++++ 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/audio/friture/unlock_constraints.patch diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index eae4b6516858..b93ad14f55ee 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -4,30 +4,32 @@ let py = python3Packages; in py.buildPythonApplication rec { pname = "friture"; - version = "0.37"; + version = "unstable-2020-02-16"; src = fetchFromGitHub { owner = "tlecomte"; repo = pname; - rev = "v${version}"; - sha256 = "1ivy5qfd90w1s1icsphvvdnnqz563v3fhg5pws2zn4483cgnzc2y"; + rev = "4460b4e72a9c55310d6438f294424b5be74fc0aa"; + sha256 = "1pmxzq78ibifby3gbir1ah30mgsqv0y7zladf5qf3sl5r1as0yym"; }; - # module imports scipy.misc.factorial, but it has been removed since scipy - # 1.3.0; use scipy.special.factorial instead - patches = [ ./factorial.patch ]; - nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ [ wrapQtAppsHook ]; propagatedBuildInputs = with py; [ sounddevice pyopengl + pyopengl-accelerate docutils numpy pyqt5 appdirs pyrr + rtmixer + ]; + + patches = [ + ./unlock_constraints.patch ]; postFixup = '' diff --git a/pkgs/applications/audio/friture/unlock_constraints.patch b/pkgs/applications/audio/friture/unlock_constraints.patch new file mode 100644 index 000000000000..ab53f948a485 --- /dev/null +++ b/pkgs/applications/audio/friture/unlock_constraints.patch @@ -0,0 +1,34 @@ +diff --git a/setup.py b/setup.py +index f31eeec..ac0927b 100644 +--- a/setup.py ++++ b/setup.py +@@ -50,19 +50,19 @@ ext_modules = [LateIncludeExtension("friture_extensions.exp_smoothing_conv", + # these will be installed when calling 'pip install friture' + # they are also retrieved by 'requirements.txt' + install_requires = [ +- "sounddevice==0.3.14", +- "rtmixer==0.1.0", +- "PyOpenGL==3.1.4", +- "PyOpenGL-accelerate==3.1.4", +- "docutils==0.15.2", +- "numpy==1.17.4", +- "PyQt5==5.13.2", +- "appdirs==1.4.3", +- "pyrr==0.10.3", ++ "sounddevice>=0.3.14", ++ "rtmixer>=0.1.0", ++ "PyOpenGL>=3.1.4", ++ "PyOpenGL-accelerate>=3.1.4", ++ "docutils>=0.15.2", ++ "numpy>=1.17.4", ++ "PyQt5>=5.13.2", ++ "appdirs>=1.4.3", ++ "pyrr>=0.10.3", + ] + + # Cython and numpy are needed when running setup.py, to build extensions +-setup_requires=["numpy==1.17.4", "Cython==0.29.14"] ++setup_requires=["numpy>=1.17.4", "Cython>=0.29.14"] + + with open(join(dirname(__file__), 'README.rst')) as f: + long_description = f.read() From aeb5951978f29358bcf145d30e527398af67a463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 7 Sep 2020 19:48:35 +0200 Subject: [PATCH 177/499] doc/using/overlays.xml: add BLIS --- doc/using/overlays.xml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index 7f6ee040c7c7..f6e02b969eac 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -187,14 +187,28 @@ self: super: AMD - BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs) + xlink:href="https://github.com/flame/blis">BLIS - The AMD BLIS library, with attribute amd-blis, - provides a BLAS implementation. The complementary AMD LIBFLAME - library, with attribute amd-libflame, provides - a LAPACK implementation. + BLIS, available through the attribute + blis, is a framework for linear algebra kernels. In + addition, it implements the BLAS interface. + + + + + AMD + BLIS/LIBFLAME (optimized for modern AMD x86_64 CPUs) + + + The AMD fork of the BLIS library, with attribute + amd-blis, extends BLIS with optimizations for + modern AMD CPUs. The changes are usually submitted to + the upstream BLIS project after some time. However, AMD BLIS + typically provides some performance improvements on AMD Zen CPUs. + The complementary AMD LIBFLAME library, with attribute + amd-libflame, provides a LAPACK implementation. From 10ecd1f45bf9f7bde9d58995e96dfa77641c6965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 7 Sep 2020 20:16:25 +0200 Subject: [PATCH 178/499] nixos/xmonad: allow passing compile time options to ghc invocation --- nixos/modules/services/x11/window-managers/xmonad.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index c834b479a46c..dba25da8260c 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -16,6 +16,7 @@ let cfg.extraPackages cfg.haskellPackages ++ optionals cfg.enableContribAndExtras (with cfg.haskellPackages; [ xmonad-contrib xmonad-extras ]); + inherit (cfg) ghcArgs; } cfg.config; in @@ -85,6 +86,15 @@ in ''; }; + ghcArgs = mkOption { + default = []; + type = with lib.types; listOf str; + description = '' + Command line arguments passed to the compiler (ghc) + invocation when xmonad.config is set. + ''; + }; + }; }; config = mkIf cfg.enable { From 23bed3659d3eb978a0927feb68aaa19c79c7d20f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 13:50:44 -0500 Subject: [PATCH 179/499] python-qt: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b05d604daa95..29e8a7685b23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14755,7 +14755,7 @@ in python-qt = callPackage ../development/libraries/python-qt { python = python27; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; + inherit (qt514) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; From 31a4fd2c3b1188860bd38ba4357aac390e33f36e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 19:44:30 +0000 Subject: [PATCH 180/499] dex-oidc: 2.17.0 -> 2.23.0 --- pkgs/servers/dex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 09a3cd877ab9..5886a2ae73a3 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "dex"; - version = "2.17.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; + sha256 = "1fr5r7d0xwj0b69jhszyyif4yc4kiy7zpfcpf83zdy12mh8f96c8"; }; goPackagePath = "github.com/dexidp/dex"; From 5a9ecfbeefcbe26e25faa38f8208b727fb384d0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 14:04:35 -0500 Subject: [PATCH 181/499] pyside2: pin to qt514 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b10662bb15bc..75918b3d8b8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5314,9 +5314,9 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake qt5 ninja; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; }); pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; From e2585d78a9fd2d8e340b0e3c4df32ace5a10676f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 14:07:42 -0500 Subject: [PATCH 182/499] shiboken2: pin to qt514 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75918b3d8b8d..5aafe443a113 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6376,7 +6376,7 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake qt5 llvmPackages; }); + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; }); shippai = callPackage ../development/python-modules/shippai { }; From 204dc3a88b69e64a4882852c4cf69405f7f6bc21 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 Sep 2020 15:08:11 -0400 Subject: [PATCH 183/499] cc-wrapper: Fix for prebuilt android We don't want to use Nix-built GCC's libs with prebuilt clang in this case. --- pkgs/build-support/cc-wrapper/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index bfb15f2f7836..0e4e76d72843 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -61,6 +61,12 @@ let then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; + useGccForLibs = isClang + && libcxx == null + && !(stdenv.targetPlatform.useLLVM or false) + && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && gccForLibs != null; + # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: if isGNU then @@ -272,7 +278,7 @@ stdenv.mkDerivation { ## ## GCC libs for non-GCC support ## - + optionalString (isClang && libcxx == null && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs != null) '' + + optionalString useGccForLibs '' echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags echo "-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-ldflags @@ -316,11 +322,11 @@ stdenv.mkDerivation { # We have a libc++ directly, we have one via "smuggled" GCC, or we have one # bundled with the C compiler because it is GCC - + optionalString (libcxx != null || (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false) || (isGNU && cc.langCC or false)) '' + + optionalString (libcxx != null || (useGccForLibs && gccForLibs.langCC or false) || (isGNU && cc.langCC or false)) '' touch "$out/nix-support/libcxx-cxxflags" touch "$out/nix-support/libcxx-ldflags" '' - + optionalString (libcxx == null && (isClang && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs.langCC or false)) '' + + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) '' for dir in ${gccForLibs}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done From 32940aeec4c1c25d63bc9c75c22ee92dd05283c4 Mon Sep 17 00:00:00 2001 From: Serval Date: Tue, 8 Sep 2020 03:23:12 +0800 Subject: [PATCH 184/499] v2ray: simplify nix --- pkgs/tools/networking/v2ray/default.nix | 59 +++++++++++++++++++++++-- pkgs/tools/networking/v2ray/generic.nix | 56 ----------------------- 2 files changed, 55 insertions(+), 60 deletions(-) delete mode 100644 pkgs/tools/networking/v2ray/generic.nix diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index d362810b56c8..183156036aa8 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -1,8 +1,8 @@ -{ callPackage, fetchFromGitHub, fetchurl +{ lib, fetchFromGitHub, fetchurl, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests , assetOverrides ? {} -, ... } @ args: +}: -callPackage ./generic.nix (rec { +let version = "4.27.5"; src = fetchFromGitHub { @@ -35,4 +35,55 @@ callPackage ./generic.nix (rec { } // assetOverrides; -} // args) + assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: { + inherit name path; + }) assets); + + core = buildGoModule rec { + pname = "v2ray-core"; + inherit version src; + + inherit vendorSha256; + + doCheck = false; + + buildPhase = '' + runHook preBuild + + go build -o v2ray v2ray.com/core/main + go build -o v2ctl v2ray.com/core/infra/control/main + + runHook postBuild + ''; + + installPhase = '' + install -Dm755 v2ray v2ctl -t $out/bin + ''; + }; + +in runCommand "v2ray-${version}" { + inherit version; + + buildInputs = [ assetsDrv core ]; + nativeBuildInputs = [ makeWrapper ]; + + meta = { + homepage = "https://www.v2ray.com/en/index.html"; + description = "A platform for building proxies to bypass network restrictions"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ servalcatty ]; + }; + + passthru = { + updateScript = ./update.sh; + tests = { + simple-vmess-proxy-test = nixosTests.v2ray; + }; + }; + +} '' + for file in ${core}/bin/*; do + makeWrapper "$file" "$out/bin/$(basename "$file")" \ + --set-default V2RAY_LOCATION_ASSET ${assetsDrv} + done +'' \ No newline at end of file diff --git a/pkgs/tools/networking/v2ray/generic.nix b/pkgs/tools/networking/v2ray/generic.nix deleted file mode 100644 index 04ac482e8985..000000000000 --- a/pkgs/tools/networking/v2ray/generic.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests - -# Version specific args -, version, src, assets, vendorSha256 -, ... }: - -let - assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: { - inherit name path; - }) assets); - - core = buildGoModule rec { - pname = "v2ray-core"; - inherit version src; - - inherit vendorSha256; - - doCheck = false; - - buildPhase = '' - runHook preBuild - - go build -o v2ray v2ray.com/core/main - go build -o v2ctl v2ray.com/core/infra/control/main - - runHook postBuild - ''; - - installPhase = '' - install -Dm755 v2ray v2ctl -t $out/bin - ''; - }; - -in runCommand "v2ray-${version}" { - inherit version; - - buildInputs = [ assetsDrv core ]; - nativeBuildInputs = [ makeWrapper ]; - - meta = { - homepage = "https://www.v2ray.com/en/index.html"; - description = "A platform for building proxies to bypass network restrictions"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ servalcatty ]; - }; - - passthru.tests = { - simple-vmess-proxy-test = nixosTests.v2ray; - }; - -} '' - for file in ${core}/bin/*; do - makeWrapper "$file" "$out/bin/$(basename "$file")" \ - --set-default V2RAY_LOCATION_ASSET ${assetsDrv} - done -'' From 312e17b3299612834db46ef988a0fe0722a57516 Mon Sep 17 00:00:00 2001 From: Serval Date: Tue, 8 Sep 2020 03:35:26 +0800 Subject: [PATCH 185/499] v2ray: fix newline --- pkgs/tools/networking/v2ray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 183156036aa8..bc8a0873f784 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -86,4 +86,4 @@ in runCommand "v2ray-${version}" { makeWrapper "$file" "$out/bin/$(basename "$file")" \ --set-default V2RAY_LOCATION_ASSET ${assetsDrv} done -'' \ No newline at end of file +'' From f3ea9452fbd6583f94f2e91b6c6224f29ac20e22 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 7 Sep 2020 21:47:20 +0200 Subject: [PATCH 186/499] ell: 0.32 -> 0.33 https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.33 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index a83e02ae6be7..9faeb831b4b2 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.32"; + version = "0.33"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2"; + sha256 = "0li788l57m2ic1i33fag4nnblqghbwqjyqkgppi8s2sifcvswfbw"; }; patches = [ From a59a88cf3e9b947627031a3d388b75bc4db39d05 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 7 Sep 2020 21:47:44 +0200 Subject: [PATCH 187/499] iwd: 1.8 -> 1.9 https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=1.9 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index fd34440f6036..adf37a1b71b6 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.8"; + version = "1.9"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0ds8nhbnkhxzhnnsi7vj3y2v8wq0nxqbmidhiac7mpxgjkc684gf"; + sha256 = "193wa13i2prfz1zr7nvwbgrxgacms57zj1n7x28yy5hmm3nnwbrd"; }; outputs = [ "out" "man" ]; From 6a593a7d59d66af1d09ea8c9354bc0a57682b093 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 8 Sep 2020 04:44:45 +1000 Subject: [PATCH 188/499] castor: disable check disable until buildRustPackage supports setting test-threads in packages --- pkgs/applications/networking/browsers/castor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 2da44bd4ed96..dd8ddd2dccb8 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; # Sometimes tests fail when run in parallel - checkFlags = [ "--test-threads=1" ]; + #checkFlags = [ "--test-threads=1" ]; + doCheck = false; meta = with stdenv.lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; From e4cc68f766c470d556163b3a11d7bbc98193d653 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 7 Sep 2020 20:26:10 +1000 Subject: [PATCH 189/499] gitAndTools.git-interactive-rebase-tool: disable check disable until buildRustPackage supports setting test-threads in packages --- .../git-and-tools/git-interactive-rebase-tool/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 6d548f040541..e6185ec8ab9d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlagsArray = [ "--test-threads=1" ]; + #checkFlagsArray = [ "--test-threads=1" ]; + doCheck = false; meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; From 8b1690a77ef62abfb7dd8c9fef0d9c8b23e96c93 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 7 Sep 2020 20:26:10 +1000 Subject: [PATCH 190/499] the-way: disable check disable until buildRustPackage supports setting test-threads in packages --- pkgs/development/tools/the-way/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 3ee200a1a1fa..d6e894a7b1b5 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1a747bmc6s007ram0w4xf1y2nb3pphvqnlx59098lr3v7gllp7x3"; - checkFlags = "--test-threads=1"; + #checkFlags = "--test-threads=1"; + doCheck = false; meta = with stdenv.lib; { description = "Terminal code snippets manager"; From 8a216e785c86330ef83e39098e0301357d227bf5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 14:59:23 -0500 Subject: [PATCH 191/499] google-musicmanager: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29e8a7685b23..0f979eccd363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20410,7 +20410,7 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt5) qtbase qtwebkit; + inherit (qt514) qtbase qtwebkit; # Downgrade to 1.34 to get libidn.so.11 libidn = (libidn.overrideAttrs (oldAttrs: { src = fetchurl { From 78b8ce73c699fd77432878c08392e327509c2d8e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 15:00:56 -0500 Subject: [PATCH 192/499] Pin broken packages to Qt 5.14 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f979eccd363..4aded2267870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5293,7 +5293,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -20719,7 +20719,7 @@ in moe = callPackage ../applications/editors/moe { }; - multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb {}; + multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb { qt5 = qt514; }; praat = callPackage ../applications/audio/praat { }; @@ -25050,7 +25050,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { }; + samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; sauerbraten = callPackage ../games/sauerbraten {}; From 87b6cc6ceffa06eda47560826e42547d8bd3c23c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 6 Sep 2020 21:45:07 +0200 Subject: [PATCH 193/499] unifiStable: 5.14.22 -> 5.14.23 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 61f07f01bf2b..a43f00973eda 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.14.22"; - sha256 = "115i0gjk7higy07j3d95r21kcgmm6kb9jsvcsycdinrcn7kz2x6r"; + version = "5.14.23"; + sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; }; } From 6378df317df37b000b0f651c3266b0620381f3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Wed, 15 Jul 2020 07:14:02 +0200 Subject: [PATCH 194/499] vdr: 2.4.1 -> 2.4.4 --- pkgs/applications/video/vdr/default.nix | 18 +++++++----------- .../video/vdr/glibc2.31-compat.patch | 15 --------------- 2 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/video/vdr/glibc2.31-compat.patch diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 14ca503f2e91..bc3d54f3b5b8 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, systemd, perl, lib, fetchpatch +{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +, gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.1"; + version = "2.4.4"; - src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2"; - sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5"; + src = fetchgit { + url = "git://git.tvdr.de/vdr.git"; + rev = "V20404"; + sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa"; }; - patches = [ - # Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6 - ./glibc2.31-compat.patch - ]; - enableParallelBuilding = true; postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; diff --git a/pkgs/applications/video/vdr/glibc2.31-compat.patch b/pkgs/applications/video/vdr/glibc2.31-compat.patch deleted file mode 100644 index 9a52d4b290b1..000000000000 --- a/pkgs/applications/video/vdr/glibc2.31-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/eit.c b/eit.c -index 50d8229..373dbca 100644 ---- a/eit.c -+++ b/eit.c -@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) - if (abs(diff) > MAX_TIME_DIFF) { - mutex.Lock(); - if (abs(diff) > MAX_ADJ_DIFF) { -- if (stime(&dvbtim) == 0) -+ timespec ts = { 0 }; -+ ts.tv_sec = dvbtim; -+ if (clock_settime(CLOCK_REALTIME, &ts) == 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); - else - esyslog("ERROR while setting system time: %m"); From 7a85c05878796624fb2c8d6f69b56f9c73252e1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Jun 2020 14:24:09 +0000 Subject: [PATCH 195/499] python27Packages.graph-tool: 2.31 -> 2.32 --- pkgs/development/python-modules/graph-tool/2.x.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 2197cfd9d0f7..50d5f0f966b6 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.31"; + version = "2.32"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0z6n9xkb5yz7z6rlwl6z9gq3ac5vdsby90nhvvvskadsx2pagd7v"; + sha256 = "0jir6fhi09lf8xf56dcsdk2knx32vq8wrzh0d0zdp22n7baavq70"; }; configureFlags = [ From 1f3587cdd53443912c015dae3a7f0b948d5f7747 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Sep 2020 14:15:25 -0700 Subject: [PATCH 196/499] 21.03 is Okapi * Okapi is an artiodactyl mammal native to Central Africa * https://en.wikipedia.org/wiki/Okapi --- .version | 2 +- lib/trivial.nix | 2 +- .../manual/release-notes/release-notes.xml | 1 + nixos/doc/manual/release-notes/rl-2103.xml | 80 +++++++++++++++++++ 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 nixos/doc/manual/release-notes/rl-2103.xml diff --git a/.version b/.version index 3eea3c4c0e93..62c36bbb17f3 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -20.09 +21.03 diff --git a/lib/trivial.nix b/lib/trivial.nix index 6eb1fb3a5b11..9501a2906cae 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -171,7 +171,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Nightingale"; + codeName = "Okapi"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index e2913b8a5353..bf18457c2b38 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml new file mode 100644 index 000000000000..eccf2b69dad9 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -0,0 +1,80 @@ +
+ Release 21.03 (“Okapi”, 2021.03/??) + +
+ Highlights + + + In addition to numerous new and upgraded packages, this release has the + following highlights: + + + + + + Support is planned until the end of October 2021, handing over to 21.09. + + + +
+ +
+ New Services + + + The following new services were added since the last release: + + + + + + + + +
+ +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + + + + +
+ +
+ Other Notable Changes + + + + + + +
+
From 4689b34d4f638b2fb438a1838d5071bbbe3300fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:36:45 +0200 Subject: [PATCH 197/499] teams: add cinnamon team --- maintainers/team-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d07f602f0da1..9763c78789aa 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -29,6 +29,13 @@ with lib.maintainers; { scope = "Maintain ACME-related packages and modules."; }; + cinnamon = { + members = [ + mkg20001 + ]; + scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; + }; + freedesktop = { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; From 1e605712d2f4d0f5515e30c3f4a048e4ab6678f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 5 Sep 2020 21:36:17 +0200 Subject: [PATCH 198/499] arc-theme: enable cinnamon --- pkgs/data/themes/arc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 1e36eb2f99a1..46664eaaf583 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -8,6 +8,7 @@ , gtk-engine-murrine , optipng , inkscape_0 +, cinnamon }: stdenv.mkDerivation rec { @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--with-cinnamon=${cinnamon.cinnamon-common.version}" "--with-gnome-shell=${gnome3.gnome-shell.version}" - "--disable-cinnamon" # not equipped to test "--disable-unity" ]; From c768edfecf8f025761b02be03195c62abf472e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 5 Sep 2020 22:38:06 +0200 Subject: [PATCH 199/499] cinnamon.cinnamon-control-center: 4.4.0 -> 4.6.0 --- .../cinnamon/cinnamon-control-center/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 454d65335540..598e48cb2a8b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -6,7 +6,6 @@ , gettext , cinnamon-desktop , intltool -, libxslt , gtk3 , libnotify , gnome-menus @@ -37,22 +36,19 @@ , modemmanager , xorg , gdk-pixbuf -, cups }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "4.4.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1rxm5n2prh182rxvjs7psxgjddikrjr8492j22060gmyvq55n7kc"; + sha256 = "0ls2ys4x6qqp0j727c4n7a6319m4k1qsy1ybxkfzlzgf750v9xda"; }; - configureFlags = [ "--enable-systemd" ]; - buildInputs = [ gtk3 glib @@ -61,7 +57,6 @@ stdenv.mkDerivation rec { cinnamon-menus libxml2 dbus-glib - systemd polkit libgnomekbd libxklavier @@ -76,7 +71,6 @@ stdenv.mkDerivation rec { xorg.libXxf86misc xorg.libxkbfile gdk-pixbuf - cups ]; /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" @@ -105,13 +99,14 @@ stdenv.mkDerivation rec { rm -rfv $out ''; + doCheck = true; + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook gettext intltool - libxslt libtool ]; From 5676e96110251230ab9fb12ce177a5539355677b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 16:54:09 +0000 Subject: [PATCH 200/499] cinnamon.cinnamon-menus: 4.4.0 -> 4.6.0 --- pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 47242cdf38a5..972cc7350a43 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.4.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0q4qj28swi2y93fj7pfil68l2cf9gmhbk6jmr8d70l54xf7sigsh"; + sha256 = "00jzb3fd96ydi15lrnwnjai12wvka5zlandn9xc61s8iim48lplq"; }; buildInputs = [ From 02b2bf7396637a0a986b5965cae2cb21faf33bf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 16:07:49 +0000 Subject: [PATCH 201/499] cinnamon.cinnamon-desktop: 4.4.1 -> 4.6.1 --- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index c5beff134b3f..02f22fa59687 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.4.1"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "10db5rai8cbbzphvcwarr3hm1bd9rxchlc0hcghg7qnmvv52fq03"; + sha256 = "0299m41vy4kcsi74z793ligvqj8nyy3fbzh6xz89jd8l3p9kgrz8"; }; outputs = [ "out" "dev" ]; From d078731ce5aec8356d60f8db2b94dd8cd95a7309 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 17:02:47 +0000 Subject: [PATCH 202/499] cinnamon.cjs: 4.4.0 -> 4.6.0 --- pkgs/desktops/cinnamon/cjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index d67a5d8386a8..70ee4c9db7ae 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "cjs"; - version = "4.4.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0q5h2pbwysc6hwq5js3lwi6zn7i5qjjy070ynfhfn3z69lw5iz2d"; + sha256 = "1caa43cplb40dm1bwnwca7z4yafvnrncm96k7mih6kg3m87fxqi5"; }; propagatedBuildInputs = [ From 74b5685bba15339a39b0f20257bc221736ddf365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 5 Sep 2020 23:07:24 +0200 Subject: [PATCH 203/499] cinnamon.cinnamon-screensaver: 4.4.0 -> 4.6.0 --- .../cinnamon/cinnamon-screensaver/default.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 97f0138de980..16fdc0689280 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchFromGitHub , pkgconfig -, autoreconfHook +, meson +, ninja , glib , dbus , gettext @@ -30,32 +31,41 @@ , xapps , xorg , iso-flags-png-320x420 +, fetchpatch }: stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "4.4.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "03v41wk1gmgmyl31j7a3pav52gfv2faibj1jnpj3ycwcv4cch5w5"; + sha256 = "068lh6wcmznfyvny7hx83q2rf4j96b6mv4a5v79y02k9110m7bsm"; }; + patches = [ + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon-screensaver/pull/349/commits/4a9e5715f406bf2ca1aacddd5fd8f830102a423c.patch"; + sha256 = "0fmkmskry4c88zcw0i8vsmh6q14k3m937hqi77p5xi1p93imr46y"; + }) + ]; + nativeBuildInputs = [ pkgconfig - autoreconfHook wrapGAppsHook gettext intltool - dbus # for configure.ac + dbus # for meson.build libxslt libtool + meson + ninja ]; buildInputs = [ - # from configure.ac + # from meson.build gobject-introspection gtk3 glib @@ -79,13 +89,12 @@ stdenv.mkDerivation rec { iso-flags-png-320x420 ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; postPatch = '' - patchShebangs autogen.sh - - sed ${stdenv.lib.escapeShellArg "s&DBUS_SESSION_SERVICE_DIR=.*&DBUS_SESSION_SERVICE_DIR=`$PKG_CONFIG --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,\${datarootdir},g' | sed 's|^|$out|'`&g"} -i configure.ac - # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ @@ -97,10 +106,6 @@ stdenv.mkDerivation rec { sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py ''; - autoreconfPhase = '' - NOCONFIGURE=1 bash ./autogen.sh - ''; - meta = with stdenv.lib; { homepage = "https://github.com/linuxmint/cinnamon-screensaver"; description = "The Cinnamon screen locker and screensaver program"; From bd501a59d968fd901210d946d7577aabfb49608a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:01:36 +0200 Subject: [PATCH 204/499] cinnamon.cinnamon-session: 4.4.1 -> 4.6.1 --- .../0001-Add-dbus_glib-dependency.patch | 38 ------------------- ...001-Use-dbus_glib-instead-of-elogind.patch | 38 +++++++++++++++++++ .../cinnamon/cinnamon-session/default.nix | 6 +-- 3 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch create mode 100644 pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch deleted file mode 100644 index 156573c30e9a..000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ddc2c4faeec36675654a2f8f04c3011b807fdf79 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Sun, 22 Mar 2020 07:36:25 +0100 -Subject: [PATCH] Add dbus_glib dependency - ---- - cinnamon-session/meson.build | 2 +- - meson.build | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build -index ee8916f..9dd9283 100644 ---- a/cinnamon-session/meson.build -+++ b/cinnamon-session/meson.build -@@ -74,7 +74,7 @@ executable('cinnamon-session', - xext, - xrender, - xtest, -- # elogind, -+ dbus_glib, - ], - link_with: [ - libegg, -diff --git a/meson.build b/meson.build -index 231a448..db306dc 100644 ---- a/meson.build -+++ b/meson.build -@@ -48,6 +48,7 @@ else - gconf = dependency('', required: false) - endif - conf.set('HAVE_GCONF', gconf.found()) -+dbus_glib = dependency('dbus-glib-1') - - - gio_unix = dependency('gio-unix-2.0', required: false) --- -2.25.1 - diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch new file mode 100644 index 000000000000..1b56b3903f3b --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch @@ -0,0 +1,38 @@ +From eb4a1eae754f222b1be902c2f050704fb0511cf7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= +Date: Sat, 5 Sep 2020 23:19:23 +0200 +Subject: [PATCH] Use dbus_glib instead of elogind + +--- + cinnamon-session/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build +index d8428dc..1f15115 100644 +--- a/cinnamon-session/meson.build ++++ b/cinnamon-session/meson.build +@@ -56,6 +56,7 @@ cinnamon_session_sources = [ + gdbus_sources, + ] + ++dbus_glib = dependency('dbus-glib-1') + executable('cinnamon-session', + cinnamon_session_sources, + dependencies: [ +@@ -74,7 +75,7 @@ executable('cinnamon-session', + xext, + xrender, + xtest, +- elogind, ++ dbus_glib, + ], + link_with: [ + libegg, +@@ -98,4 +99,3 @@ foreach unit: units + dependencies: unit[2] + ) + endforeach +- +-- +2.28.0 + diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 96910052ac9f..3009e5ec89d8 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,17 +27,17 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.4.1"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1bkhzgdinsk4ahp1b4jf50phxwv2da23rh35cmg9fbm5c88701ga"; + sha256 = "13qqi3zqybz00czh0g5nqjx5iwna54cxd7mk9wkp30kj6raa4qca"; }; patches = [ - ./0001-Add-dbus_glib-dependency.patch + ./0001-Use-dbus_glib-instead-of-elogind.patch ]; buildInputs = [ From 415bed22bb7bcccbbbf4303830f707d28e75bba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:01:58 +0200 Subject: [PATCH 205/499] cinnamon.cinnamon-common: 4.4.1 -> 4.6.1 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index a67f04473c84..2680f223758e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "4.4.1"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - sha256 = "0sv7nqd1l6c727qj30dcgdkvfh1wxpszpgmbdyh58ilmc8xklnqd"; + sha256 = "149lhg953fa0glm250f76z2jzyaabh97jxiqkjnqvsk6bjk1d0bw"; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ # TODO: review if we really need this all - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss pam pexpect ])) + (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 pam pexpect distro ])) atk cacert cinnamon-control-center From 527e625fc1055fec82d69f778d16ff03b3402ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:02:14 +0200 Subject: [PATCH 206/499] cinnamon.cinnamon-session: 4.4.0 -> 4.6.4 --- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 1dc58e3c3b5b..86e9aff28113 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -27,11 +27,12 @@ , xorg , fontconfig , tzdata +, nss }: stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "4.4.0"; + version = "4.6.4"; /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory #include "csd-power-proxy.h" @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1h74d68a7hx85vv6ak26b85jq0wr56ps9rzfvqsnxwk81zxw2n7q"; + sha256 = "1xcjzjfwnzvkv9jiyw8adsjyhz92almzhyfwb91115774zgqnb7m"; }; patches = [ @@ -81,6 +82,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.libXfixes fontconfig + nss ]; nativeBuildInputs = [ From f11433c0dc01e1b810b86d8cd6d3fef97b602610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:02:36 +0200 Subject: [PATCH 207/499] cinnamon.mint-themes: 1.8.0 -> 1.8.6 --- pkgs/desktops/cinnamon/mint-themes/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 770baf77bcda..c39ba07109d8 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -7,13 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-themes"; - version = "1.8.0"; + version = "1.8.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = version; - sha256 = "0a8f2cmcl00y4607v5qr2zdcdjc0z74ixm2yakscvw6qzgsh9fac"; + # commit is named 1.8.6, tags=404 + rev = "fa0b9530f6e68c390aecd622b229072fcd08f05f"; + sha256 = "0pgv5hglsscip5s7nv0mn301vkn0j6wp4rv34vr941yai1jfk2wb"; }; nativeBuildInputs = [ From b4abc9ba35929a2d09da2ce7fdb0925756f5abe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:02:57 +0200 Subject: [PATCH 208/499] cinnamon.mint-y-icons: unstable -> 1.4.3 --- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index a7e22dc3d033..4b74a2db7b83 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { pname = "mint-y-icons"; - version = "unstable-2020-03-21"; + version = "1.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = "f169a617bc344cb0b480b2b72f54cdd06af05255"; - sha256 = "1c2a79ylk363i982czwwqcwc7cw6dyzlqphcypqm6nll7xlafq8s"; + # commit is named 1.4.3, tags=404 + rev = "c997af402d425889f2e4277966eebe473f7451f7"; + sha256 = "0yfas949xm85a28vgjqm9ym3bhhynrq256w9vfs8aiqq9nbm18mf"; }; propagatedBuildInputs = [ From 9e13c3be9cb16676bba367ab8857b08adc47b252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:03:32 +0200 Subject: [PATCH 209/499] cinnamon.muffin: 4.4.2 -> 4.6.3 --- pkgs/desktops/cinnamon/muffin/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 2913d4761ff8..0ec606195029 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,30 +35,15 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "4.4.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1kzjw4a5p69j8x55vpbpn6gy8pkbbyii6kzw2nzbypmipgnnijw8"; + sha256 = "1p8irzf20wari1id5rfx5sypywih1jsrmn0f83zlyhc5fxg02r5p"; }; - patches = [ - # backport patch that disables wayland components via build flags - # https://github.com/linuxmint/muffin/pull/548#issuecomment-578316820 - (fetchpatch { - url = "https://github.com/linuxmint/muffin/commit/f78bf5b309b3d306848f47cc241b31e9399999a7.patch"; - sha256 = "1c79aa9w2v23xlz86x3l42pavwrqx5d6nmfd9nms29hjsk8mpf4i"; - }) - # mute some warnings that caused build failures - # https://github.com/linuxmint/muffin/issues/535#issuecomment-536917143 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/muffin/raw/6b0af3a22173e374804371a1cca74e23d696dd37/f/0001-fix-warnings-when-compiling.patch"; - sha256 = "15wdbn3afn3103v7rq1icp8n0vqqwrrya03h0g2rzqlrsc7wrvzw"; - }) - ]; - buildInputs = [ gtk3 glib From 0a7e5e4d0139c8d9115847e0b129d815901ca3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:03:58 +0200 Subject: [PATCH 210/499] cinnamon.nemo: 4.4.1 -> 4.6.5 --- pkgs/desktops/cinnamon/nemo/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 419aaf249f70..8faaf6bf34c0 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "4.4.1"; + version = "4.6.5"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -28,16 +28,9 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0sskq0rssxvna937md446x1489hkhxys1zq03hvl8asjqa259w2q"; + sha256 = "04rgdph9pxdj5wzzv2i0pgyhg3s74nh9jf1ry9z6v5bvv222ili4"; }; - patches = [ - (fetchpatch { # details see https://github.com/linuxmint/nemo/pull/2303 - url = "https://github.com/linuxmint/nemo/pull/2303/commits/9c1ec7812abe712419317df07d6b64623e8f639d.patch"; - sha256 = "09dz7lq3i47rbvycawrxwgjmd9g1mhb76ibx2vq85wck6r08arml"; - }) - ]; - outputs = [ "out" "dev" ]; buildInputs = [ From 95eb753e67338e5e15f9374a1f5887725873bddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:04:25 +0200 Subject: [PATCH 211/499] cinnamon.xapps: 1.6.10 -> 1.8.9 --- pkgs/desktops/cinnamon/xapps/default.nix | 29 ++++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index ff02720e8021..399323e140fb 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -16,19 +16,28 @@ , wrapGAppsHook , inxi , mate +, dbus +, libdbusmenu-gtk3 }: stdenv.mkDerivation rec { pname = "xapps"; - version = "1.6.10"; + version = "1.8.9"; outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + url = "https://github.com/linuxmint/xapp/pull/110/commits/208563d4e2bbcfbeb4425d05f649867065c37615.patch"; + sha256 = "0brqndfgawhayrm36cjh6fkff274729jivjq3h5jx93lprvl2zih"; + }) + ]; + src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1jkxvqv9fxf9il5qfyddn4j4nkxgbxlil8vizbx99xz0kafb81vp"; + sha256 = "01jx7612p0c0pi0r7fn5g08s6zjfmq1gfm5hi0fkzl0fxf2cx7a7"; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 @@ -36,13 +45,6 @@ stdenv.mkDerivation rec { "-I${glib.dev}/include/gio-unix-2.0" ]; - patches = [ - (fetchpatch { # details see https://github.com/linuxmint/xapps/pull/65 - url = "https://github.com/linuxmint/xapps/compare/d361d9cf357fade59b4bb68df2dcb2c0c39f90e1...2dfe82ec68981ea046345b2be349bd56293579f7.diff"; - sha256 = "0sffclamvjas8ad57kxrg0vrgrd95xsk0xdl53dc3yivpxkfxrnk"; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -63,6 +65,8 @@ stdenv.mkDerivation rec { xorg.libxkbfile python3.pkgs.pygobject3 # for .pc file mate.mate-panel # for gobject-introspection + dbus + libdbusmenu-gtk3 ]; # Requires in xapp.pc @@ -79,14 +83,9 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file - # The fetchpatch hook removes the renames, so postPatch has to rename those files, remove once PR merged - mv files/usr/bin/pastebin scripts/pastebin - mv files/usr/bin/upload-system-info scripts/upload-system-info - mv files/usr/bin/xfce4-set-wallpaper scripts/xfce4-set-wallpaper - mv files/usr/share/icons/hicolor icons - patchShebangs \ libxapp/g-codegen.py \ + meson-scripts/g-codegen.py \ schemas/meson_install_schemas.py # Patch pastebin & inxi location From ec854b0c0d2e7b9eaf3715e94c82f1de09e50a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:32:05 +0200 Subject: [PATCH 212/499] cinnamon.cinnamon-common: fix nma missing --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 2680f223758e..4b3bbae5182a 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -40,6 +40,7 @@ , glib-networking , pciutils , timezonemap +, libnma }: let @@ -99,6 +100,7 @@ stdenv.mkDerivation rec { nemo libnotify accountsservice + libnma # gsi bindings gnome-online-accounts From 66f42fee473c0d952489d42b420bb8840f0dfc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 5 Sep 2020 22:22:06 +0200 Subject: [PATCH 213/499] cinnamon.cinnamon-common: patch & expose sessions --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 4b3bbae5182a..6fc5384be4d2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -6,6 +6,7 @@ , cinnamon-control-center , cinnamon-desktop , cinnamon-menus +, cinnamon-session , cjs , fetchFromGitHub , gdk-pixbuf @@ -146,8 +147,15 @@ stdenv.mkDerivation rec { sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + + sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d + sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop ''; + passthru = { + providedSessions = ["cinnamon" "cinnamon2d"]; + }; + meta = with stdenv.lib; { homepage = "https://github.com/linuxmint/cinnamon"; description = "The Cinnamon desktop environment"; From dd8233b72d073cc90f25a667fd8e1d1862a13976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 00:40:47 +0200 Subject: [PATCH 214/499] cinnamon.*: now maintained by cinnamon team --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 +- pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 2 +- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 2 +- pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 2 +- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 2 +- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 2 +- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 2 +- pkgs/desktops/cinnamon/cjs/default.nix | 2 +- pkgs/desktops/cinnamon/mint-themes/default.nix | 2 +- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 2 +- pkgs/desktops/cinnamon/muffin/default.nix | 2 +- pkgs/desktops/cinnamon/nemo/default.nix | 2 +- pkgs/desktops/cinnamon/xapps/default.nix | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 6fc5384be4d2..35ca865bc1b9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -161,6 +161,6 @@ stdenv.mkDerivation rec { description = "The Cinnamon desktop environment"; license = [ licenses.gpl2 ]; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 598e48cb2a8b..ef934d2389f9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -115,6 +115,6 @@ stdenv.mkDerivation rec { description = "A collection of configuration plugins used in cinnamon-settings"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 02f22fa59687..cdb8e6a381f9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 972cc7350a43..bae9615fb9fa 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "A menu system for the Cinnamon project"; license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 16fdc0689280..7074e6c329a4 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -111,6 +111,6 @@ stdenv.mkDerivation rec { description = "The Cinnamon screen locker and screensaver program"; license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 3009e5ec89d8..9e1420959619 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -100,6 +100,6 @@ stdenv.mkDerivation rec { description = "The Cinnamon session manager"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index a679f15887b4..142c586d8d64 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Translations files for the Cinnamon desktop"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 70ee4c9db7ae..cdbcfa9683e5 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { mpl11 ]; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index c39ba07109d8..a4bc81ec8ec9 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "Mint-X and Mint-Y themes for the cinnamon desktop"; license = licenses.gpl3; # from debian/copyright platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 4b74a2db7b83..d5f2271625c8 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "The Mint-Y icon theme"; license = licenses.gpl3; # from debian/copyright platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 0ec606195029..e16ab1eb6769 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 8faaf6bf34c0..5037f2351208 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "File browser for Cinnamon"; license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 399323e140fb..d82cb0514237 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { description = "Cross-desktop libraries and common resources"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } From a5a97c3f64e7e4d04f9c578cc23f2ef9243ad5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 16:58:51 +0200 Subject: [PATCH 215/499] cinnamon.mint-x-icons: init at 1.5.5 --- pkgs/desktops/cinnamon/default.nix | 1 + .../cinnamon/mint-x-icons/default.nix | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/desktops/cinnamon/mint-x-icons/default.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 5d054e4646de..7e1866c7df96 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -23,6 +23,7 @@ lib.makeScope pkgs.newScope (self: with self; { cjs = callPackage ./cjs { }; nemo = callPackage ./nemo { }; mint-themes = callPackage ./mint-themes { }; + mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; xapps = callPackage ./xapps { }; diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix new file mode 100644 index 000000000000..2fbb3cc67bc3 --- /dev/null +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -0,0 +1,57 @@ +{ fetchFromGitHub +, stdenv +, gnome3 +, gnome-icon-theme +, hicolor-icon-theme +, gtk3 +, humanity-icon-theme +, ubuntu-themes +}: + +stdenv.mkDerivation rec { + pname = "mint-x-icons"; + version = "1.5.5"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + # commit is named 1.5.5, tags=404 + rev = "ecfbeb62bba41e85a61099df467c4700ac63c1e0"; + sha256 = "1yxm7h7giag5hmymgxsg16vc0rhxb2vn3piaksc463mic4vwfa3i"; + }; + + propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme + hicolor-icon-theme + humanity-icon-theme + ubuntu-themes # provides ubuntu-mono-dark + ]; + + nativeBuildInputs = [ + gtk3 + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/share $out + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/mint-x-icons"; + description = "Mint/metal theme based on mintified versions of Clearlooks Revamp, Elementary and Faenza"; + license = licenses.gpl3Plus; # from debian/copyright + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} From 4da4af45f718568d8144c2f8bdda5aabca82c72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 02:02:58 +0200 Subject: [PATCH 216/499] mint-artwork: init at 1.4.3 --- pkgs/desktops/cinnamon/default.nix | 1 + .../cinnamon/mint-artwork/default.nix | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/desktops/cinnamon/mint-artwork/default.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 7e1866c7df96..cc7489597675 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -22,6 +22,7 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; cjs = callPackage ./cjs { }; nemo = callPackage ./nemo { }; + mint-artwork = callPackage ./mint-artwork { }; mint-themes = callPackage ./mint-themes { }; mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix new file mode 100644 index 000000000000..b3a542e513e8 --- /dev/null +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchurl +, glib +, nixos-artwork +}: + +stdenv.mkDerivation rec { + pname = "mint-artwork"; + version = "1.4.3"; + + src = fetchurl { + url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; + sha256 = "126asxpg722qfg2wkwcr7bhsplchq3jn6bkdwf1scpc5za8dd62j"; + }; + + nativeBuildInputs = [ + glib + ]; + + installPhase = '' + mkdir $out + + # note: we fuck up a bunch of stuff but idc + find . -type f -exec sed -i \ + -e s,/usr/share/backgrounds/linuxmint/default_background.jpg,${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png,g \ + -e s,/usr/share,$out/share,g \ + -e s,DMZ-White,Vanilla-DMZ,g \ + -e s,DMZ-Black,Vanilla-DMZ-AA,g \ + -e s,linuxmint-logo-5,cinnamon-symbolic,g \ + -e s,^theme-name=Mint-X$,theme-name=Mint-X-Dark,g \ + {} + + + # fixup broken symlink + ln -sf ./sele_ring.jpg usr/share/backgrounds/linuxmint/default_background.jpg + + mv etc $out/etc + mv usr/share $out/share + ''; +} From c08e45ff3b5d78b4fdf30159ac29b0ed4c2f4594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 13:40:38 +0200 Subject: [PATCH 217/499] cinnamon.cinnamon-gsettings-overrides: init --- .../cinnamon-gsettings-overrides/default.nix | 57 +++++++++++++++++++ pkgs/desktops/cinnamon/default.nix | 1 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix new file mode 100644 index 000000000000..7f2e260e5df3 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, runCommand +, nixos-artwork +, glib +, gtk3 +, gsettings-desktop-schemas +, extraGSettingsOverrides ? "" +, extraGSettingsOverridePackages ? [] +, mint-artwork + +, muffin +, nemo +, xapps +, cinnamon-desktop +, cinnamon-session +, cinnamon-settings-daemon +, cinnamon-common +}: + +let + + gsettingsOverridePackages = [ + # from + mint-artwork + + # on + muffin + nemo + xapps + cinnamon-desktop + cinnamon-session + cinnamon-settings-daemon + cinnamon-common + gtk3 + ] ++ extraGSettingsOverridePackages; + +in + +with stdenv.lib; + +# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this +runCommand "cinnamon-gsettings-overrides" {} + '' + schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + + mkdir -p $schema_dir + + ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages} + + chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides + + cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF + ${extraGSettingsOverrides} + EOF + + ${glib.dev}/bin/glib-compile-schemas $schema_dir + '' diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index cc7489597675..e406da2b8e56 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -15,6 +15,7 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; + cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { }; cinnamon-menus = callPackage ./cinnamon-menus { }; cinnamon-translations = callPackage ./cinnamon-translations { }; cinnamon-screensaver = callPackage ./cinnamon-screensaver { }; From b5839daf69e3cdff68200cf357fdcf2f74257c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 6 Sep 2020 16:15:25 +0200 Subject: [PATCH 218/499] vanilla-dmz: 0.4.4 -> 0.4.5 (+license fix) The package debian/copyright states Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) which is cc-by-sa-30, was wrongly cc-by-nc-sa-30 which is unfree --- pkgs/data/icons/vanilla-dmz/default.nix | 26 +++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index c92a80527000..55ba320bc988 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -1,21 +1,34 @@ -{ stdenv, lib, fetchzip, xorg, hicolor-icon-theme }: +{ stdenv +, lib +, fetchzip +, xorg +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "vanilla-dmz"; - version = "0.4.4"; + version = "0.4.5"; + src = fetchzip { - url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz"; - sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj"; + url = "mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.xz"; + sha256 = "14r8fri4byyzavzdifpga6118hxqjwpzd11xxj28s16zxcanq16m"; }; - buildInputs = [ xorg.xcursorgen ]; + + buildInputs = [ + xorg.xcursorgen + ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; + dontDropIconThemeCache = true; + buildPhase = '' cd DMZ-White/pngs; ./make.sh; cd - cd DMZ-Black/pngs; ./make.sh; cd - ''; + installPhase = '' install -d $out/share/icons/Vanilla-DMZ/cursors cp -a DMZ-White/xcursors/* $out/share/icons/Vanilla-DMZ/cursors @@ -25,11 +38,12 @@ stdenv.mkDerivation rec { cp -a DMZ-Black/xcursors/* $out/share/icons/Vanilla-DMZ-AA/cursors install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme ''; + meta = with lib; { homepage = "http://jimmac.musichall.cz"; description = "A style neutral scalable cursor theme"; platforms = platforms.all; - license = licenses.cc-by-nc-sa-30; + license = licenses.cc-by-sa-30; maintainers = with maintainers; [ cstrahan ]; }; } From 996bdf7cd41934f83d06f80a79e5a6dce9678b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 00:15:57 +0200 Subject: [PATCH 219/499] mint-x-icons: remove other package and expose from cinnamon namespace --- pkgs/data/icons/mint-x-icons/default.nix | 52 ------------------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 pkgs/data/icons/mint-x-icons/default.nix diff --git a/pkgs/data/icons/mint-x-icons/default.nix b/pkgs/data/icons/mint-x-icons/default.nix deleted file mode 100644 index 213ba877dc66..000000000000 --- a/pkgs/data/icons/mint-x-icons/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, fetchurl -, gnome-icon-theme -, gtk3 -, hicolor-icon-theme -, humanity-icon-theme -, ubuntu-themes -}: - -stdenv.mkDerivation rec { - pname = "mint-x-icons"; - version = "1.5.5"; - - src = fetchurl { - url = "http://packages.linuxmint.com/pool/main/m/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0nq3si06m98b71f33wism0bvlvib57rm96msf0wx852ginw3a5yd"; - }; - - nativeBuildInputs = [ - gtk3 - ]; - - propagatedBuildInputs = [ - gnome-icon-theme - hicolor-icon-theme - humanity-icon-theme - ubuntu-themes # provides the parent icon theme: ubuntu-mono-dark - ]; - - dontDropIconThemeCache = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/icons - cp -vai usr/share/icons/* $out/share/icons - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Mint/metal theme based on mintified versions of Clearlooks Revamp, Elementary and Faenza"; - homepage = "https://github.com/linuxmint/mint-x-icons"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8de40a13e73..c41ab34a83a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18948,8 +18948,6 @@ in medio = callPackage ../data/fonts/medio { }; - mint-x-icons = callPackage ../data/icons/mint-x-icons { }; - mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -25399,6 +25397,8 @@ in cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); + inherit (cinnamon) mint-x-icons mint-y-icons; + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; }); From 907f761b0a11c2c490a13971b515d324b2710d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 00:50:06 +0200 Subject: [PATCH 220/499] cinnamon.cinnamon-settings-daemon: add dev output --- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 86e9aff28113..418107673a35 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { pkgconfig ]; + outputs = [ "out" "dev" ]; + postPatch = '' sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h ''; From 04ea3a0ff68d371f09b872777488817f73384565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 01:44:09 +0200 Subject: [PATCH 221/499] nixos/cinnamon: init Co-Authored-By: WORLDofPEACE --- .../x11/desktop-managers/cinnamon.nix | 205 ++++++++++++++++++ .../services/x11/desktop-managers/default.nix | 1 + 2 files changed, 206 insertions(+) create mode 100644 nixos/modules/services/x11/desktop-managers/cinnamon.nix diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix new file mode 100644 index 000000000000..a9c059125e8d --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -0,0 +1,205 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.desktopManager.cinnamon; + serviceCfg = config.services.cinnamon; + + nixos-gsettings-overrides = pkgs.cinnamon.cinnamon-gsettings-overrides.override { + extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages; + extraGSettingsOverrides = cfg.extraGSettingsOverrides; + }; + +in + +{ + options = { + services.cinnamon = { + apps.enable = mkEnableOption "Cinnamon default applications"; + }; + + services.xserver.desktopManager.cinnamon = { + enable = mkEnableOption "the cinnamon desktop manager"; + + sessionPath = mkOption { + default = []; + example = literalExample "[ pkgs.gnome3.gpaste ]"; + description = '' + Additional list of packages to be added to the session search path. + Useful for GSettings-conditional autostart. + + Note that this should be a last resort; patching the package is preferred (see GPaste). + ''; + }; + + extraGSettingsOverrides = mkOption { + default = ""; + type = types.lines; + description = "Additional gsettings overrides."; + }; + + extraGSettingsOverridePackages = mkOption { + default = []; + type = types.listOf types.path; + description = "List of packages for which gsettings are overridden."; + }; + }; + + environment.cinnamon.excludePackages = mkOption { + default = []; + example = literalExample "[ pkgs.cinnamon.blueberry ]"; + type = types.listOf types.package; + description = "Which packages cinnamon should exclude from the default environment"; + }; + + }; + + config = mkMerge [ + (mkIf (cfg.enable && config.services.xserver.displayManager.lightdm.enable && config.services.xserver.displayManager.lightdm.greeters.gtk.enable) { + services.xserver.displayManager.lightdm.greeters.gtk.extraConfig = mkDefault (builtins.readFile "${pkgs.cinnamon.mint-artwork}/etc/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf"); + }) + + (mkIf cfg.enable { + services.xserver.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ]; + + services.xserver.displayManager.sessionCommands = '' + if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then + true + ${concatMapStrings (p: '' + if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + '') cfg.sessionPath} + fi + ''; + + # Default services + hardware.bluetooth.enable = mkDefault true; + hardware.pulseaudio.enable = mkDefault true; + security.polkit.enable = true; + services.accounts-daemon.enable = true; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.dbus.packages = with pkgs.cinnamon; [ + cinnamon-common + cinnamon-screensaver + nemo + xapps + ]; + services.cinnamon.apps.enable = mkDefault true; + services.gnome3.glib-networking.enable = true; + services.gnome3.gnome-keyring.enable = true; + services.gvfs.enable = true; + services.udisks2.enable = true; + services.upower.enable = mkDefault config.powerManagement.enable; + services.xserver.libinput.enable = mkDefault true; + services.xserver.updateDbusEnvironment = true; + networking.networkmanager.enable = mkDefault true; + + # Enable colord server + services.colord.enable = true; + + # Enable dconf + programs.dconf.enable = true; + + # Enable org.a11y.Bus + services.gnome3.at-spi2-core.enable = true; + + # Fix lockscreen + security.pam.services = { + cinnamon-screensaver = {}; + }; + + environment.systemPackages = with pkgs.cinnamon // pkgs; [ + desktop-file-utils + nixos-artwork.wallpapers.simple-dark-gray + onboard + sound-theme-freedesktop + + # common-files + cinnamon-common + cinnamon-session + cinnamon-desktop + cinnamon-menus + + # utils needed by some scripts + killall + + # session requirements + cinnamon-screensaver + # cinnamon-killer-daemon: provided by cinnamon-common + gnome3.networkmanagerapplet # session requirement - also nm-applet not needed + + # packages + nemo + cinnamon-control-center + cinnamon-settings-daemon + gnome3.libgnomekbd + orca + + # theme + gnome3.adwaita-icon-theme + hicolor-icon-theme + gnome3.gnome-themes-extra + gtk3.out + mint-artwork + mint-themes + mint-x-icons + mint-y-icons + vanilla-dmz + + # other + glib # for gsettings + shared-mime-info # for update-mime-database + xdg-user-dirs + ]; + + # Override GSettings schemas + environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + + environment.pathsToLink = [ + # FIXME: modules should link subdirs of `/share` rather than relying on this + "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173 + ]; + + # Shell integration for VTE terminals + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; + + # Harmonize Qt5 applications under Pantheon + qt5.enable = true; + qt5.platformTheme = "gnome"; + qt5.style = "adwaita"; + + # Default Fonts + fonts.fonts = with pkgs; [ + source-code-pro # Default monospace font in 3.32 + ubuntu_font_family # required for default theme + ]; + }) + + (mkIf serviceCfg.apps.enable { + programs.geary.enable = mkDefault true; + programs.gnome-disks.enable = mkDefault true; + programs.gnome-terminal.enable = mkDefault true; + programs.evince.enable = mkDefault true; + programs.file-roller.enable = mkDefault true; + + environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ + # cinnamon team apps + # warp + # blueberry + + # external apps shipped with linux-mint + hexchat + gnome-calculator + ] config.environment.cinnamon.excludePackages); + }) + ]; +} diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 5d3a84d71399..f5559eb53541 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -21,6 +21,7 @@ in ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix + ./cinnamon.nix ]; options = { From 2f5479d747c5094dd550e52ab37a4bceeee4376c Mon Sep 17 00:00:00 2001 From: Super Bo Date: Sat, 30 May 2020 15:31:33 +0700 Subject: [PATCH 222/499] maintainers: add superbo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c17c91551aab..7149ecb5d600 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8035,6 +8035,12 @@ githubId = 65870; name = "Сухарик"; }; + superbo = { + email = "supernbo@gmail.com"; + github = "SuperBo"; + githubId = 2666479; + name = "Y Nguyen"; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; github = "SuperSandro2000"; From fdda893a8a5e4eee5f97c8bf0ca174a4d8bdd8ee Mon Sep 17 00:00:00 2001 From: Super Bo Date: Sat, 30 May 2020 15:32:05 +0700 Subject: [PATCH 223/499] ibus-bamboo: init at 0.6.6 Add IBus Bamboo engine for Vietnamese --- .../ibus-engines/ibus-bamboo/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix new file mode 100644 index 000000000000..b34206e6cf6d --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, gettext +, xorg +, pkgconfig +, wrapGAppsHook +, ibus +, gtk3 +, go +}: + +stdenv.mkDerivation rec { + pname = "ibus-bamboo"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "BambooEngine"; + repo = pname; + rev = "v${version}"; + sha256 = "0bjcc2dm6c6s0v271nyslmwf5z0xxpcbvmk4lyirs48hc1bzv3n6"; + }; + + nativeBuildInputs = [ + gettext + pkgconfig + wrapGAppsHook + go + ]; + + buildInputs = [ + xorg.libX11 + xorg.xorgproto + xorg.libXtst + xorg.libXi + ]; + + preConfigure = '' + export GOCACHE="$TMPDIR/go-cache" + sed -i "s,/usr,$out," bamboo.xml + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "A Vietnamese IME for IBus"; + homepage = "https://github.com/BambooEngine/ibus-bamboo"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ superbo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca2f2b22b864..77b25f0ea598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2806,6 +2806,8 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { }; From 492de7bb2b62f83f94e732bebb7d21a746dce113 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 8 Sep 2020 05:35:27 +0200 Subject: [PATCH 224/499] mypaint: fix crash without hicolor-icon-theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mypaint seems to check for a presence of this theme scaffold and crashes when not present. Let’s add this since it weights almost nothing. --- pkgs/applications/graphics/mypaint/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index b4dd86c37265..7267e8401600 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -8,6 +8,7 @@ , librsvg , gobject-introspection , libmypaint +, hicolor-icon-theme , mypaint-brushes , gdk-pixbuf , pkgconfig @@ -36,7 +37,9 @@ in buildPythonApplication rec { swig wrapGAppsHook gobject-introspection # for setup hook + hicolor-icon-theme # fór setup hook ]; + buildInputs = [ gtk3 gdk-pixbuf @@ -48,6 +51,9 @@ in buildPythonApplication rec { librsvg pycairo pygobject3 + + # Mypaint checks for a presence of this theme scaffold and crashes when not present. + hicolor-icon-theme ]; propagatedBuildInputs = [ From d375a93eee6da926afb83885537dd47e41486b20 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Sep 2020 04:20:00 +0000 Subject: [PATCH 225/499] syncthing: 1.8.0 -> 1.9.0 https://github.com/syncthing/syncthing/releases/tag/v1.9.0 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index aec44c1bfd8f..7baff125bac0 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.8.0"; + version = "1.9.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "047y2sy9zif19dlh098ihaski9f3b971q3mmqg97qgfzpa8z8fpr"; + sha256 = "1p5wmcmv72hbd3dap9hqv4ryarsj8ljn833x9mcfgh8ff4k25qwr"; }; - vendorSha256 = "0l08d96226l135cqbv1qqw0136f5nzw7likc0nmhcm6ynzv83kj2"; + vendorSha256 = "1mwjfv0l2n21srxsh8w18my2j8diim91jlg00ailiq9fwnvxxn8c"; doCheck = false; From d8e5c6072a09b533a3c36326aae9ab53b8ac79f2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 31 Aug 2020 12:00:17 +0200 Subject: [PATCH 226/499] =?UTF-8?q?jackline:=202020-04-24=20=E2=86=92=2020?= =?UTF-8?q?20-09-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port package to dune --- .../instant-messengers/jackline/default.nix | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index f2b026e79dac..4c067e384f95 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,30 +1,50 @@ -{ stdenv, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages }: -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; +with ocamlPackages; -stdenv.mkDerivation { +buildDunePackage rec { pname = "jackline"; - version = "unstable-2020-04-24"; + version = "unstable-2020-09-03"; + + minimumOCamlVersion = "4.08"; + + useDune2 = true; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87"; - sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj"; + rev = "dd5f19636c9b99b72c348f0f639452d87b7c017c"; + sha256 = "076smdgig4nwvqsqxa6gsl0c3daq5agwgzp4n2y8xxm3qiq91y89"; }; - buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving - erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name - ocaml_lwt otr astring ptime notty sexplib hex uutf - dns-client base64 - ]; + nativeBuildInpts = [ + ppx_sexp_conv + ppx_deriving + ]; - buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; + buildInputs = [ + erm_xmpp + tls + mirage-crypto-pk + x509 + domain-name + ocaml_lwt + otr + astring + ptime + notty + sexplib + hex + uutf + uchar + uuseg + uucp + dns-client + cstruct + base64 + ]; - inherit (ocamlPackages.topkg) installPhase; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hannesm/jackline"; description = "minimalistic secure XMPP client in OCaml"; license = licenses.bsd2; From 945fdbe1b91bb1cc24cf0f9963d8945dae52705c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 7 Sep 2020 20:23:26 +0200 Subject: [PATCH 227/499] pythonPackages.python-pam: remove duplicate package, fixes #97355 --- .../python-modules/pam/default.nix | 32 ------------------- .../python-modules/python-pam/default.nix | 27 ++++++++++------ pkgs/top-level/python-packages.nix | 7 ++-- 3 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/pam/default.nix diff --git a/pkgs/development/python-modules/pam/default.nix b/pkgs/development/python-modules/pam/default.nix deleted file mode 100644 index 6b5855379788..000000000000 --- a/pkgs/development/python-modules/pam/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pam -}: - -buildPythonPackage rec { - pname = "python-pam"; - version = "1.8.4"; - - src = fetchFromGitHub { - owner = "FirefighterBlu3"; - repo = pname; - rev = "v${version}"; - sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; - }; - - buildInputs = [ - pam - ]; - - postPatch = '' - sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py - ''; - - meta = with lib; { - description = "Python pam module supporting py3 (and py2)"; - homepage = "https://github.com/FirefighterBlu3/python-pam"; - license = licenses.mit; - maintainers = with maintainers; [ mkg20001 ]; - }; -} diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix index 4065cd7c0145..f152c1f264eb 100644 --- a/pkgs/development/python-modules/python-pam/default.nix +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -1,23 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi, pam }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pam +}: buildPythonPackage rec { pname = "python-pam"; version = "1.8.4"; - src = fetchPypi { - inherit pname version; - sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + src = fetchFromGitHub { + owner = "FirefighterBlu3"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; }; + buildInputs = [ + pam + ]; + postPatch = '' - substituteInPlace pam.py --replace 'find_library("pam")' \ - '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py ''; - meta = with stdenv.lib; { - description = "Python PAM module using ctypes"; + meta = with lib; { + description = "Python pam module supporting py3 (and py2)"; homepage = "https://github.com/FirefighterBlu3/python-pam"; - maintainers = with maintainers; [ abbradar ]; license = licenses.mit; + maintainers = with maintainers; [ abbradar mkg20001 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8135c083745..f5c3f6c51031 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4193,7 +4193,8 @@ in { palettable = callPackage ../development/python-modules/palettable { }; - pam = callPackage ../development/python-modules/pam { inherit (pkgs) pam; }; + # Alias. Added 2020-09-07. + pam = self.python-pam; pamela = callPackage ../development/python-modules/pamela { }; @@ -5713,7 +5714,9 @@ in { python-packer = callPackage ../development/python-modules/python-packer { }; - python-pam = callPackage ../development/python-modules/python-pam { }; + python-pam = callPackage ../development/python-modules/python-pam { + inherit (pkgs) pam; + }; python-periphery = callPackage ../development/python-modules/python-periphery { }; From 807e4ae439177c87e6a3d9b7b56dd2991ab41280 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 8 Sep 2020 15:15:04 +0900 Subject: [PATCH 228/499] flashplayer: 32.0.0.414 -> 32.0.0.433 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- .../networking/browsers/ungoogled-chromium/plugins.nix | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 239a6282a675..530a4c8a4aea 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; + sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index bec18edea370..247b2457b5a0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "184qy9zxk9ynp6avz1j0ca5mxqqqlhrc0m7d1cjxv39jfdiyz51i" + "18hr026743swpdjjk7cg3hnpw2ws3q246xnkb326lyvv90wqlfni" else - "1m8fay452zps5yw1qpsc6irxxdvqjhkwxg066ckxkjf68gln7cmn" + "1yhyirii6rmnk420imaa160r9akarb3jrrlyas5a8d2y65gya71g" else if arch == "x86_64" then - "0ng04yig7msq4mv01ngfsh7mkxia18j3k9clnp0y0sbpr60z8s83" + "0k80i98zkpf6r46y1aw2zg1dsgbirg6rc8q21vycpvln395jq0pf" else - "0fndnhznqz28wfmm32fafx30pi517vvkxy1isp4krsfvyl7fmzhn"; + "1qw6hjwv9y7qr333k4nlpd7fwyzbsk833sx2slfgjfhsbipr7p3r"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 7a5c676ccb04..996d298df581 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1sfvxi0ngk1ny912hw1zp0l3v6md6qqpvnyab3h45562m2fm6vqz" + "1ys523wwhvj96jph435lnyp07qzg9f70j349l7ggwgg96rflalpf" else - "0pxb3fhwvajvb28w11iylx5rp0h1f4s2aiii53gz28sq082w9br4"; + "1ycw2amis7yvidc6q87gls6rb305p89pr7mhzknc10v0nh34781m"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 239a6282a675..530a4c8a4aea 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -44,11 +44,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.414"; + version = "32.0.0.433"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk"; + sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx"; stripRoot = false; }; From 23c781a810e6133a3c22eea04dc08d820a912ecc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 15:54:19 +1000 Subject: [PATCH 229/499] buildGoPackage: check/delete vendor --- doc/languages-frameworks/go.xml | 9 ++++++++- pkgs/development/go-packages/generic/default.nix | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 26414f23c7d2..7cff7a85c62c 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -117,7 +117,9 @@ deis = buildGoPackage rec { goDeps = ./deps.nix; - buildFlags = [ "--tags" "release" ]; + deleteVendor = true; + + buildFlags = [ "--tags" "release" ]; } @@ -144,6 +146,11 @@ deis = buildGoPackage rec { + + deleteVendor removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. + + + buildFlags is a list of flags passed to the go build command. diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index de0a35b69343..5c54e04652f7 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -29,6 +29,9 @@ # go2nix dependency file , goDeps ? null +# Whether to delete the vendor folder supplied with the source. +, deleteVendor ? false + , dontRenameImports ? false # Do not enable this without good reason @@ -96,6 +99,18 @@ let mkdir -p "go/src/$(dirname "$goPackagePath")" mv "$sourceRoot" "go/src/$goPackagePath" + '' + lib.optionalString (deleteVendor == true) '' + if [ ! -d "go/src/$goPackagePath/vendor" ]; then + echo "vendor folder does not exist, 'deleteVendor' is not needed" + exit 10 + else + rm -rf "go/src/$goPackagePath/vendor" + fi + '' + lib.optionalString (goDeps != null) '' + if [ -d "go/src/$goPackagePath/vendor" ]; then + echo "vendor folder exists, 'goDeps' is not needed" + exit 10 + fi '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' mkdir goPath (cd goPath; unpackFile "${src}") From c70cf7ace6a8e02f6310693709690f4c2c9e2f81 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 19:59:32 +1000 Subject: [PATCH 230/499] manul: use deleteVendor --- pkgs/development/tools/manul/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index b789a99578dd..71010149a921 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -13,6 +13,7 @@ buildGoPackage { sha256 = "06kglxdgj1dfpc9bdnvhsh8z0c1pdbmwmfx4km01wpppzk06dnvm"; }; + deleteVendor = true; goDeps = ./deps.nix; meta = with stdenv.lib; { From 8ad25211cae46eff1655a1c3c1cc94b7dce12f1e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 19:59:33 +1000 Subject: [PATCH 231/499] mirrorbits: use deleteVendor --- pkgs/servers/mirrorbits/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 0761468bd1ff..653ca399fcff 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -30,6 +30,7 @@ buildGoPackage rec { ''; goPackagePath = "github.com/etix/mirrorbits"; + deleteVendor = true; goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig ]; From 73bb0685466978af8502031c2c7017b2f2d6f5fa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 19:59:33 +1000 Subject: [PATCH 232/499] guardian-agent: use deleteVendor --- pkgs/tools/networking/guardian-agent/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix index 262234ca67b5..a736aa4df187 100644 --- a/pkgs/tools/networking/guardian-agent/default.nix +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { goPackagePath = "github.com/StanfordSNR/guardian-agent"; + deleteVendor = true; goDeps = ./deps.nix; postInstall = '' From 83818f068edd45dd3edc6ee36fac6f85e043db36 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 19:59:33 +1000 Subject: [PATCH 233/499] kail: use deleteVendor --- pkgs/tools/networking/kail/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index e7c9b499675a..497afb459ef0 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { # git checkout # dep init # dep2nix + deleteVendor = true; goDeps = ./deps.nix; meta = with stdenv.lib; { From 50dd10f291fa29b958b53b73fab25dbd5d8c7309 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:01:06 +1000 Subject: [PATCH 234/499] autospotting: use upstream vendor --- .../misc/autospotting/default.nix | 2 - pkgs/applications/misc/autospotting/deps.nix | 75 ------------------- 2 files changed, 77 deletions(-) delete mode 100644 pkgs/applications/misc/autospotting/deps.nix diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index a33261e7a59d..f2e922e5b4d1 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -12,8 +12,6 @@ buildGoPackage { sha256 = "0p48lgig9kblxvgq1kggczkn4qdbx6ciq9c8x0179i80vl4jf7v6"; }; - goDeps = ./deps.nix; - # patching path where repository used to exist postPatch = '' sed -i "s+github.com/cristim/autospotting/core+github.com/AutoSpotting/AutoSpotting/core+" autospotting.go diff --git a/pkgs/applications/misc/autospotting/deps.nix b/pkgs/applications/misc/autospotting/deps.nix deleted file mode 100644 index ea744ed6648f..000000000000 --- a/pkgs/applications/misc/autospotting/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/aws/aws-lambda-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-lambda-go"; - rev = "2d482ef09017ae953b1e8d5a6ddac5b696663a3c"; - sha256 = "06v2yfvn4sn116lds0526a8mfrsng4vafrdjf1dhpalqarrbdvmz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "9333060a8d957db41bff1c80603a802aa674fad8"; - sha256 = "0fnypw6zm6k70fzhm5a8g69ag64rxbrrpdk7l3rkfqd99slyg5kz"; - }; - } - { - goPackagePath = "github.com/cristim/ec2-instances-info"; - fetch = { - type = "git"; - url = "https://github.com/cristim/ec2-instances-info"; - rev = "73c042a5558cd6d8b61fb82502d6f7aec334e9ed"; - sha256 = "1xajrkxqqz5wlbi9w2wdhnk115rbmqxyga29f8v9psq8hzwgi0rg"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "d8f796af33cc11cb798c1aaeb27a4ebc5099927d"; - sha256 = "19z27f306fpsrjdvkzd61w1bdazcdbczjyjck177g33iklinhpvx"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "5cf292cae48347c2490ac1a58fe36735fb78df7e"; - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/namsral/flag"; - fetch = { - type = "git"; - url = "https://github.com/namsral/flag"; - rev = "67f268f20922975c067ed799e4be6bacf152208c"; - sha256 = "1lmxq3z276zrsggpfq9b7yklzzxdyib49zr8sznb1lcqlvxqsr47"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } -] \ No newline at end of file From f147284f9705c37bc5024db109d61c5fc8d090b1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:03:23 +1000 Subject: [PATCH 235/499] c14-cli: use upstream vendor --- pkgs/applications/networking/c14/default.nix | 2 -- pkgs/applications/networking/c14/deps.nix | 1 - 2 files changed, 3 deletions(-) delete mode 100644 pkgs/applications/networking/c14/deps.nix diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index 98d2f4aa81d6..afd9aa53ac65 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -13,8 +13,6 @@ buildGoPackage rec { sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "C14 is designed for data archiving & long-term backups."; homepage = "https://www.online.net/en/storage/c14-cold-storage"; diff --git a/pkgs/applications/networking/c14/deps.nix b/pkgs/applications/networking/c14/deps.nix deleted file mode 100644 index fe51488c7066..000000000000 --- a/pkgs/applications/networking/c14/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] From f3623b843591da9b5cc5db482151ab5412b97040 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:03:59 +1000 Subject: [PATCH 236/499] singularity: use upstream vendor --- pkgs/applications/virtualization/singularity/default.nix | 1 - pkgs/applications/virtualization/singularity/deps.nix | 1 - 2 files changed, 2 deletions(-) delete mode 100644 pkgs/applications/virtualization/singularity/deps.nix diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index bfa0e0e54469..0c1569145e6a 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -26,7 +26,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/sylabs/singularity"; - goDeps = ./deps.nix; buildInputs = [ gpgme openssl libuuid ]; nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ]; diff --git a/pkgs/applications/virtualization/singularity/deps.nix b/pkgs/applications/virtualization/singularity/deps.nix deleted file mode 100644 index fe51488c7066..000000000000 --- a/pkgs/applications/virtualization/singularity/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] From 1624286f23a7abc56dff5f979528b1dd8fa2352c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:04:24 +1000 Subject: [PATCH 237/499] devd: use upstream vendor --- pkgs/development/tools/devd/default.nix | 1 - pkgs/development/tools/devd/deps.nix | 201 ------------------------ 2 files changed, 202 deletions(-) delete mode 100644 pkgs/development/tools/devd/deps.nix diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index cd2f401ed25e..2d5a38458d3a 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/devd"; subPackages = [ "cmd/devd" ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A local webserver for developers"; homepage = "https://github.com/cortesi/devd"; diff --git a/pkgs/development/tools/devd/deps.nix b/pkgs/development/tools/devd/deps.nix deleted file mode 100644 index 2cf6dd7eb23b..000000000000 --- a/pkgs/development/tools/devd/deps.nix +++ /dev/null @@ -1,201 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/GeertJohan/go.rice"; - fetch = { - type = "git"; - url = "https://github.com/GeertJohan/go.rice"; - rev = "c02ca9a983da5807ddf7d796784928f5be4afd09"; - sha256 = "1wzi3fprizg29dd4b4bmwz49x154k8cry9d7c08441y1i8w895yw"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; - sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; - }; - } - { - goPackagePath = "github.com/cortesi/moddwatch"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/moddwatch"; - rev = "0a1e0881aa8823d4dbec04c5b65a32a33f467e46"; - sha256 = "0f9gi2vvrhsbbvfqzlx2dcgn389qj1h77rvh2iffqhnsn3cxf5fr"; - }; - } - { - goPackagePath = "github.com/cortesi/termlog"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/termlog"; - rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; - sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; - }; - } - { - goPackagePath = "github.com/daaku/go.zipexe"; - fetch = { - type = "git"; - url = "https://github.com/daaku/go.zipexe"; - rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; - sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/goji/httpauth"; - fetch = { - type = "git"; - url = "https://github.com/goji/httpauth"; - rev = "2da839ab0f4df05a6db5eb277995589dadbd4fb9"; - sha256 = "0rcz1qxdbc2gw0gaj81kag94k98izs9vmhcp5mzs7979s7q4kym1"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "59fac5042749a5afb9af70e813da1dd5474f0167"; - sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; - sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; - }; - } - { - goPackagePath = "github.com/toqueteos/webbrowser"; - fetch = { - type = "git"; - url = "https://github.com/toqueteos/webbrowser"; - rev = "43eedf9c266f511c55ef7eace9ee549e269b54b4"; - sha256 = "0wa8xv0gh9iq3dlwb48dx8w2awrsarqa900hszan8gaxgag7x7ih"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "927f97764cc334a6575f4b7a1584a147864d5723"; - sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] From 47062433b633ede1b689e016101ee9eefc941c5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:04:49 +1000 Subject: [PATCH 238/499] ejson: use upstream vendor --- pkgs/development/tools/ejson/default.nix | 2 - pkgs/development/tools/ejson/deps.nix | 48 ------------------------ 2 files changed, 50 deletions(-) delete mode 100644 pkgs/development/tools/ejson/deps.nix diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index a9481cbb306e..17e3f5f7be19 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -16,8 +16,6 @@ in buildGoPackage rec { goPackagePath = "github.com/Shopify/ejson"; subPackages = [ "cmd/ejson" ]; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "Shopify"; repo = "ejson"; diff --git a/pkgs/development/tools/ejson/deps.nix b/pkgs/development/tools/ejson/deps.nix deleted file mode 100644 index b0c7defc5d78..000000000000 --- a/pkgs/development/tools/ejson/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/codegangsta/cli"; - fetch = { - type = "git"; - url = "https://github.com/codegangsta/cli"; - rev = "9908e96513e5a94de37004098a3974a567f18111"; - sha256 = "0g6sihdb53nlf770dp3jc0qqxnlir5n2yjbp5p5vf7kcj3p54p34"; - }; - } - { - goPackagePath = "github.com/dustin/gojson"; - fetch = { - type = "git"; - url = "https://github.com/dustin/gojson"; - rev = "057ac0edc14e44d03df3bb03449e666ff50884c1"; - sha256 = "1kzzbi5yshcg1v99gab5ymd3psild3p0rbq9jf7mssjvh11yza6f"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "90f2eae17a8bdcbe3f6f654fc76af7f39e97d7b9"; - sha256 = "0s984ksmc8npf642nwwd1a81c2sfi613v7yia9jff710i5472fah"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "ca7e7f10cb9fd9c1a6ff7f60436c086d73714180"; - sha256 = "02wmfdq40fjszrd9l2w4c1g34zxnxyydwr4sqvp2blmw2s6ww4bx"; - }; - } -] \ No newline at end of file From d517dc89d579ca872142cf683779f7914496e5d2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:06:55 +1000 Subject: [PATCH 239/499] kexpand: use upstream vendor --- pkgs/development/tools/kexpand/default.nix | 2 - pkgs/development/tools/kexpand/deps.nix | 63 ---------------------- 2 files changed, 65 deletions(-) delete mode 100644 pkgs/development/tools/kexpand/deps.nix diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix index e6c562721c28..8e45eb2654bd 100644 --- a/pkgs/development/tools/kexpand/default.nix +++ b/pkgs/development/tools/kexpand/default.nix @@ -13,6 +13,4 @@ buildGoPackage { rev = "c508a43a4e84410dfd30827603e902148c5c1f3c"; sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p"; }; - - goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/kexpand/deps.nix b/pkgs/development/tools/kexpand/deps.nix deleted file mode 100644 index c049d9683cce..000000000000 --- a/pkgs/development/tools/kexpand/deps.nix +++ /dev/null @@ -1,63 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] From 4fcc9306ff6ece0b2cf2c4596e21b264078cdb4d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:07:25 +1000 Subject: [PATCH 240/499] modd: use upstream vendor --- pkgs/development/tools/modd/default.nix | 1 - pkgs/development/tools/modd/deps.nix | 138 ------------------------ 2 files changed, 139 deletions(-) delete mode 100644 pkgs/development/tools/modd/deps.nix diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index a9172d792776..5c63447fdc5f 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/cortesi/modd"; subPackages = [ "cmd/modd" ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; homepage = "https://github.com/cortesi/modd"; diff --git a/pkgs/development/tools/modd/deps.nix b/pkgs/development/tools/modd/deps.nix deleted file mode 100644 index 42190e655778..000000000000 --- a/pkgs/development/tools/modd/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; - sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; - }; - } - { - goPackagePath = "github.com/cortesi/moddwatch"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/moddwatch"; - rev = "d27f53de245eb09b9e475d498cc01c91ba8e89c8"; - sha256 = "1ivxk6zxrc5rhd0p5kqi8jg58ql2mwdvrxvfzz8fkj1lxz975p9p"; - }; - } - { - goPackagePath = "github.com/cortesi/termlog"; - fetch = { - type = "git"; - url = "https://github.com/cortesi/termlog"; - rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; - sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/rjeczalik/notify"; - fetch = { - type = "git"; - url = "https://github.com/rjeczalik/notify"; - rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; - sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "927f97764cc334a6575f4b7a1584a147864d5723"; - sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4c64e13b10787722085407fe5d15f"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "mvdan.cc/sh"; - fetch = { - type = "git"; - url = "https://github.com/mvdan/sh"; - rev = "8aeb0734cd0f08b7a473c9ac816be8687ca909cc"; - sha256 = "1mj8qfkyb6k490qjy3riq6pm440qajf5lc8m74x7xhq5059qkgxx"; - }; - } -] \ No newline at end of file From e6038674bb50cab770de20fa106a4af711c04216 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:07:58 +1000 Subject: [PATCH 241/499] open-policy-agent: use upstream vendor --- .../tools/open-policy-agent/default.nix | 1 - .../tools/open-policy-agent/deps.nix | 399 ------------------ 2 files changed, 400 deletions(-) delete mode 100644 pkgs/development/tools/open-policy-agent/deps.nix diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index d31a7e3ab60f..d3fd81a0f941 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { rev = "v${version}"; sha256 = "18hpanfrzg6xnq1g0yws6g0lw4y191pnrqphccv13j6kqk3k10ps"; }; - goDeps = ./deps.nix; buildFlagsArray = '' -ldflags= diff --git a/pkgs/development/tools/open-policy-agent/deps.nix b/pkgs/development/tools/open-policy-agent/deps.nix deleted file mode 100644 index b12502f5e94d..000000000000 --- a/pkgs/development/tools/open-policy-agent/deps.nix +++ /dev/null @@ -1,399 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.7"; - sha256 = "0fqknn2gnicsixm43czd2r6p99ckf9i1b63i11wsbi4lqggwrp0m"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.10"; - sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "c7ce16629ff4"; - sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "v0.2.3"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.3.0"; - sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "d3de96c4c28e"; - sha256 = "0k41z9dybs3fvgb1jzgnxr91qad9rnf9a269l95jics58m3kn7f5"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "521ea7b17d02"; - sha256 = "0bd83nd6jc2vsddwnb8w6gpw6qpfg449n6wb4dmk12ybmdhkwrvf"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.2.0"; - sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "b20a3daf6a39"; - sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.1"; - sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "bf27d3ba8e1d"; - sha256 = "0xx9923l4a46kjd1wpscqw31p4am28xrhd17xgw1cnx06bznb36v"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "059132a15dd0"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "f30f42803563"; - sha256 = "0d3a9igvpdx516wpvj3b1ki1c4n2lvp5ghvzpqk95j2fxzyyzcxg"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "7e9e6cabbd39"; - sha256 = "00nmyp6k6x53gl7csca6bja010wnxf2p2pxfph3y0l2ap44qb38w"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "185b4288413d"; - sha256 = "0d85429kdw5dgj5zhyiz1sq3i5691vj2gjnda93nnxxzx9acg8cv"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "3113b8401b8a"; - sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.1"; - sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "fe5e611709b0"; - sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "082b515c9490"; - sha256 = "03jil8szw5hsp0x4pgzdxas2njqij2466p20q1ag18lmgncjl50m"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/yashtewari/glob-intersection"; - fetch = { - type = "git"; - url = "https://github.com/yashtewari/glob-intersection"; - rev = "5c77d914dd0b"; - sha256 = "1mfdk6iwqbhikcccds81knqlrj1phf9pad39fs2y8bzr6n7nqfzz"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "1baf3a9d7d67"; - sha256 = "0aql4lb9cf2kcb9jx90bvpp9chrmic2y3fwfvdq76hq2qvr4818d"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3b0461eec859"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "5eefd052ad72"; - sha256 = "1bgpq8j3a1mwsd9cbp9hqmb5ms6vp4b0a2xsrlpwrfpyswnyagi0"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "11092d34479b"; - sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] From 7670725ac5ec5a2898bcff8740455581f8989e4b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:08:41 +1000 Subject: [PATCH 242/499] prometheus-aws-s3-exporter: use upstream vendor --- .../monitoring/prometheus/aws-s3-exporter.nix | 2 - .../prometheus/aws-s3-exporter_deps.nix | 336 ------------------ 2 files changed, 338 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 03f09992b811..6f1a3f21f5b2 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/ribbybibby/s3_exporter"; - goDeps = ./aws-s3-exporter_deps.nix; - src = fetchFromGitHub { owner = "ribbybibby"; repo = "s3_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix deleted file mode 100644 index 5ca160cb16f9..000000000000 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter_deps.nix +++ /dev/null @@ -1,336 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.20.1"; - sha256 = "0nhdkkcm11d2n2974kph6jjhddkp1fjbcpfgmalabc798gmqfg54"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e8439af"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.4"; - sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d28f0bde5980"; - sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b47fdc937951"; - sha256 = "17k4qwql2zizrxwjd0qv0gccwgyyv2axiha1vh5lrjfps1h5kli7"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] From d81c805b6fb51d2510a18706a6d8927a7fcc275e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:09:14 +1000 Subject: [PATCH 243/499] prometheus-process-exporter: use upstream vendor --- .../prometheus/process-exporter.nix | 2 - .../prometheus/process-exporter_deps.nix | 156 ------------------ 2 files changed, 158 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/process-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index b9cbfd8d63e5..9b90b9a57f95 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/ncabatoff/process-exporter"; - goDeps = ./process-exporter_deps.nix; - src = fetchFromGitHub { owner = "ncabatoff"; repo = pname; diff --git a/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix deleted file mode 100644 index c8880119207b..000000000000 --- a/pkgs/servers/monitoring/prometheus/process-exporter_deps.nix +++ /dev/null @@ -1,156 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.1.0"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/ncabatoff/fakescraper"; - fetch = { - type = "git"; - url = "https://github.com/ncabatoff/fakescraper"; - rev = "15938421d91a"; - sha256 = "1in2iakq6xly9r8gk0mfim8n0glbjzpa07hkaj1rlrm0i11jlc6f"; - }; - } - { - goPackagePath = "github.com/ncabatoff/go-seq"; - fetch = { - type = "git"; - url = "https://github.com/ncabatoff/go-seq"; - rev = "b08ef85ed833"; - sha256 = "1x88x285n4wf221pp7ccmh2ai7rgcnwz764gn8k861qg30jl1ky6"; - }; - } - { - goPackagePath = "github.com/ncabatoff/procfs"; - fetch = { - type = "git"; - url = "https://github.com/ncabatoff/procfs"; - rev = "9ced60d7b905"; - sha256 = "19756h4lw5v8f0xr70cl8gd0wfqcnszrhhgawqhyinnir82rz728"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.8.0"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "c7de2306084e"; - sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "ea9eea638872"; - sha256 = "1j99qszynx2asac82bhzhk0g1nav87nfgkb1cz5a2iywj81liirj"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] From fc5d4820ebc74c3148611d6b9d083aeda5aef38d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:09:36 +1000 Subject: [PATCH 244/499] cli53: use upstream vendor --- pkgs/tools/admin/cli53/default.nix | 2 - pkgs/tools/admin/cli53/deps.nix | 93 ------------------------------ 2 files changed, 95 deletions(-) delete mode 100644 pkgs/tools/admin/cli53/deps.nix diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 0ba4593f6a56..4978603c1922 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -14,8 +14,6 @@ buildGoPackage { sha256 = "0bhczmzrgf7ypnhhzdrgnvg8cw8ch1x1d0cgajc5kklq9ixv9ygi"; }; - goDeps = ./deps.nix; - meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; homepage = "https://github.com/barnybug/cli53"; diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix deleted file mode 100644 index 4742bc00851b..000000000000 --- a/pkgs/tools/admin/cli53/deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "3e7014382cdc91695381614d0110a3cff997ba72"; - sha256 = "1xnjhmb31k63k13aiiiispc7vkgnlxkbihslwwfsjc7b86vrllm5"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd"; - sha256 = "0mp18hlhnazg3sd02fhv88kbbipmhcrkb6n8imq8gk2dvmxk64ch"; - }; - } - { - goPackagePath = "github.com/gucumber/gucumber"; - fetch = { - type = "git"; - url = "https://github.com/gucumber/gucumber"; - rev = "71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc"; - sha256 = "1h1d9j515v1nyqsyb73v4ahlvm9n6z7hgl2ld8dryr4sw8q7ybw3"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "e4205768578dc90c2669e75a2f8a8bf77e3083a4"; - sha256 = "0247qcc9i41wrm73ivqs2wvy3vi3nb44m3nh27lnhd4a0ilir6wv"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/shiena/ansicolor"; - fetch = { - type = "git"; - url = "https://github.com/shiena/ansicolor"; - rev = "a422bbe96644373c5753384a59d678f7d261ff10"; - sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; - sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } -] From 49527fd2273268eecacc28c83a7a49ed8b518c0b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:10:04 +1000 Subject: [PATCH 245/499] systrayhelper: use upstream vendor --- pkgs/tools/misc/systrayhelper/default.nix | 2 - pkgs/tools/misc/systrayhelper/deps.nix | 102 ---------------------- 2 files changed, 104 deletions(-) delete mode 100644 pkgs/tools/misc/systrayhelper/deps.nix diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index a8376356e86d..8433866928a0 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "1iq643brha5q6w2v1hz5l3d1z0pqzqr43gpwih4cnx3m5br0wg2k"; }; - goDeps = ./deps.nix; - # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. buildFlagsArray = [ ''-ldflags= diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/pkgs/tools/misc/systrayhelper/deps.nix deleted file mode 100644 index 93c984337e6b..000000000000 --- a/pkgs/tools/misc/systrayhelper/deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/getlantern/context"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/context"; - rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; - sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; - }; - } - { - goPackagePath = "github.com/getlantern/errors"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/errors"; - rev = "e24b7f4ff7c70be59bbefca6b7695d68cda8b399"; - sha256 = "1wshagslgl3r07gniq0g55cqgi1j1gk0yrri5ywjz7wm8da42qcr"; - }; - } - { - goPackagePath = "github.com/getlantern/golog"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/golog"; - rev = "cca714f7feb5df8e455f409b549d384441ac4578"; - sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; - }; - } - { - goPackagePath = "github.com/getlantern/hex"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hex"; - rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; - sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; - }; - } - { - goPackagePath = "github.com/getlantern/hidden"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/hidden"; - rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; - sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; - }; - } - { - goPackagePath = "github.com/getlantern/ops"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/ops"; - rev = "37353306c90844c8e0591956f56611f46299d202"; - sha256 = "0q8j2963jqf3p7fcnsfinkvz71mfylrkk2xjar775zjx5a23sa5i"; - }; - } - { - goPackagePath = "github.com/getlantern/systray"; - fetch = { - type = "git"; - url = "https://github.com/getlantern/systray"; - rev = "e31397f8c6928d98a8a9a7e80087aebcf0090beb"; - sha256 = "0ahb6qjd2c43nbbg0ssm76ilbzs9dq43a89f7fj6c029nympjmqn"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/oxtoacart/bpool"; - fetch = { - type = "git"; - url = "https://github.com/oxtoacart/bpool"; - rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; - sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8e24a49d80f82323e1c4db1b5da3e0f31171a151"; - sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724"; - }; - } -] \ No newline at end of file From abf3d29951a6bc19ee3586fcdb69feef79040b03 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:10:33 +1000 Subject: [PATCH 246/499] hologram: use upstream vendor --- pkgs/tools/security/hologram/default.nix | 2 - pkgs/tools/security/hologram/deps.nix | 110 ----------------------- 2 files changed, 112 deletions(-) delete mode 100644 pkgs/tools/security/hologram/deps.nix diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index f829d56d6fda..7c5a2d5a4c11 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -13,8 +13,6 @@ buildGoPackage rec { goPackagePath = "github.com/AdRoll/hologram"; - goDeps = ./deps.nix; - preConfigure = '' sed -i 's|cacheTimeout != 3600|cacheTimeout != 0|' cmd/hologram-server/main.go ''; diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix deleted file mode 100644 index a9b66da2a9c0..000000000000 --- a/pkgs/tools/security/hologram/deps.nix +++ /dev/null @@ -1,110 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; - sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; - }; - } - { - goPackagePath = "github.com/aybabtme/rgbterm"; - fetch = { - type = "git"; - url = "https://github.com/aybabtme/rgbterm"; - rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; - sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; - }; - } - { - goPackagePath = "github.com/vaughan0/go-ini"; - fetch = { - type = "git"; - url = "https://github.com/vaughan0/go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4"; - sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"; - }; - } - { - goPackagePath = "github.com/goamz/goamz"; - fetch = { - type = "git"; - url = "https://github.com/goamz/goamz"; - rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; - sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; - }; - } - { - goPackagePath = "github.com/nmcclain/asn1-ber"; - fetch = { - type = "git"; - url = "https://github.com/go-asn1-ber/asn1-ber"; - rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; - sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-asn1-ber/asn1-ber"; - rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; - sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; - }; - } - { - goPackagePath = "github.com/peterbourgon/g2s"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/g2s"; - rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; - sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; - }; - } - { - goPackagePath = "github.com/nmcclain/ldap"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; - sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "3f8f870ec9939e32b3372abf74d24e468bcd285d"; - sha256 = "0a4hycs3d87s50z4prf5h6918r0fa2rvrrwlbffs430ilc4y8ghv"; - }; - } -] From dfb0dff86c517240a9b3d30d4fedafd7dee9b8bb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:40:37 +1000 Subject: [PATCH 247/499] hound:use upstream vendor --- pkgs/development/tools/misc/hound/default.nix | 2 -- pkgs/development/tools/misc/hound/deps.nix | 1 - 2 files changed, 3 deletions(-) delete mode 100644 pkgs/development/tools/misc/hound/deps.nix diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 2d7431f9e8b0..4e817251bffe 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -22,8 +22,6 @@ buildGoPackage rec { sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq"; }; - goDeps = ./deps.nix; - postInstall = with stdenv; let binPath = lib.makeBinPath [ mercurial git ]; in '' diff --git a/pkgs/development/tools/misc/hound/deps.nix b/pkgs/development/tools/misc/hound/deps.nix deleted file mode 100644 index fe51488c7066..000000000000 --- a/pkgs/development/tools/misc/hound/deps.nix +++ /dev/null @@ -1 +0,0 @@ -[] From bd5c02c03ca219914cd6e66d4897b5b0f680efd7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:41:35 +1000 Subject: [PATCH 248/499] codesearch: use upstream vendor --- pkgs/tools/text/codesearch/default.nix | 2 -- pkgs/tools/text/codesearch/deps.nix | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 pkgs/tools/text/codesearch/deps.nix diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 7f706cf13765..37336e63efe6 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; }; - goDeps = ./deps.nix; - meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; diff --git a/pkgs/tools/text/codesearch/deps.nix b/pkgs/tools/text/codesearch/deps.nix deleted file mode 100644 index 2d1dad706340..000000000000 --- a/pkgs/tools/text/codesearch/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by go2nix. -[ -] From 5331f432cd31f5f7fcf05e1d1a7228d72df7b82c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:42:10 +1000 Subject: [PATCH 249/499] statik: use upstream vendor --- pkgs/development/tools/statik/default.nix | 1 - pkgs/development/tools/statik/deps.nix | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 pkgs/development/tools/statik/deps.nix diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 8152dda2b505..f535fa055ed0 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -4,7 +4,6 @@ buildGoPackage { pname = "statik"; version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "rakyll"; diff --git a/pkgs/development/tools/statik/deps.nix b/pkgs/development/tools/statik/deps.nix deleted file mode 100644 index 0429d8876b29..000000000000 --- a/pkgs/development/tools/statik/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ -] From 8aab09dbc3caba6be9503a6d0cbea12270b7ddbc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:44:43 +1000 Subject: [PATCH 250/499] easyjson: use upstream vendor --- pkgs/development/tools/easyjson/default.nix | 1 - pkgs/development/tools/easyjson/deps.nix | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 pkgs/development/tools/easyjson/deps.nix diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index f7bd4d2037d7..ef99bbd01c31 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -4,7 +4,6 @@ buildGoPackage { pname = "easyjson"; version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; - goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix deleted file mode 100644 index 0429d8876b29..000000000000 --- a/pkgs/development/tools/easyjson/deps.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ -] From 1a36f8fe818fc38f9da13030e2dd4e98e481d5b8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 21:54:43 +1000 Subject: [PATCH 251/499] stern: use deleteVendor --- pkgs/applications/networking/cluster/stern/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 8ad0e8711f2f..0f8ed05d8e6a 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -15,6 +15,7 @@ buildGoPackage rec { sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; }; + deleteVendor = true; goDeps = ./deps.nix; nativeBuildInputs = [ installShellFiles ]; From c9297d49c1aa1b3d40612934888af75f78b22bb3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 21:56:19 +1000 Subject: [PATCH 252/499] ws: use upstream vendor --- pkgs/development/tools/ws/default.nix | 2 -- pkgs/development/tools/ws/deps.nix | 12 ------------ 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/tools/ws/deps.nix diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 952538956485..4a6d8892208d 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -14,8 +14,6 @@ buildGoPackage rec { sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; diff --git a/pkgs/development/tools/ws/deps.nix b/pkgs/development/tools/ws/deps.nix deleted file mode 100644 index 82988437145f..000000000000 --- a/pkgs/development/tools/ws/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5df930a27be2502f99b292b7cc09ebad4d0891f4"; - sha256 = "1xqwvpn5jkp1xqvv9hx4h7cxrsnamryhy2pszcqpbm28dpd3airb"; - }; - } -] From 288135531e1e665192163c5957d77ce6e1fad7c3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 21:58:45 +1000 Subject: [PATCH 253/499] utahfs: use upstream vendor --- .../networking/utahfs/default.nix | 1 - pkgs/applications/networking/utahfs/deps.nix | 327 ------------------ 2 files changed, 328 deletions(-) delete mode 100644 pkgs/applications/networking/utahfs/deps.nix diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/applications/networking/utahfs/default.nix index 6e30e03531dc..b6bae284dcd3 100644 --- a/pkgs/applications/networking/utahfs/default.nix +++ b/pkgs/applications/networking/utahfs/default.nix @@ -11,7 +11,6 @@ buildGoPackage rec { }; goPackagePath = "github.com/cloudflare/utahfs"; - goDeps = ./deps.nix; meta = with lib; { homepage = "https://github.com/cloudflare/utahfs"; diff --git a/pkgs/applications/networking/utahfs/deps.nix b/pkgs/applications/networking/utahfs/deps.nix deleted file mode 100644 index a144211fc954..000000000000 --- a/pkgs/applications/networking/utahfs/deps.nix +++ /dev/null @@ -1,327 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "a6b88cf34a491498e4c7d15c107a31058693e2cb"; - sha256 = "0ilqqymrphg546c66jc0npd48dlr88wbgrg462h1jgm2ykbnq1ba"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "420cda5d6383f94f7d9c231aa44bad3325181950"; - sha256 = "1mp0c9173328r67iica662013jnshiv8yg2p5zgs0kr5sh3ri0ws"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/readahead"; - fetch = { - type = "git"; - url = "https://github.com/google/readahead"; - rev = "eaceba16903255cb149d1efc316f6cc83d765268"; - sha256 = "19l6a29yyypgpqf7v5877ni0bqgxfp41q7ffp2xj57rvikimwiyb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/jacobsa/fuse"; - fetch = { - type = "git"; - url = "https://github.com/jacobsa/fuse"; - rev = "cd3959611bcb6bb23d49f1598d98f2bf44476805"; - sha256 = "0qy7gyczmdwclhml0n4js3rai7qinnvlr8xz1wn0g6z0vqc9p9iz"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75"; - sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pquerna/ffjson"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/ffjson"; - rev = "e517b90714f7c0eabe6d2e570a5886ae077d6db6"; - sha256 = "0lb76zvdi045r3kab529p9ippccsi9vw84xhinddyr4qrxvs9b06"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "4ab88e80c249ed361d3299e2930427d9ac43ef8d"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "3f98efb27840a48a7a2898ec80be07674d19f9c8"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "d835ff86be02193d324330acdb7d65546b05f814"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; - sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "738671d3881b9731cc63024d5d88cf28db875626"; - sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "244492dfa37ae2ce87222fd06250a03160745faa"; - sha256 = "0vm2q44phz4vjnzq9428rjk58c82fxf003whczp7c9ryn9fazh7s"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; - sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "e8dd451b4bcb2ef4a22627699ed7d9df7653d6f3"; - sha256 = "0a088x8gpq7y0nx7z5baz2p9n1br908yrwjqnh2f9b4mv38kagzi"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "c24765c18bb761c90df819dcdfdd62f9a7f6fa22"; - sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "971852bfffca25b069c31162ae8f247a3dba083b"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "43be25429f5aa0b9a3f18fa4e32583729ca30b78"; - sha256 = "0rj8xjyn4b73wvfg6v0fff7brnc61xd41500vxa6lw8cg36d51gr"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "142182889d38b76209f1d9f1d8e91d7608aff542"; - sha256 = "1m36rg3w2mf4r3383yf0r1pjrz890mdw506h1lpm6bkc8w3kyqz3"; - }; - } - { - goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; - fetch = { - type = "git"; - url = "https://github.com/kothar/go-backblaze"; - rev = "7594ed38700f5ca3fc7da8f8c7b91b0526ee66f2"; - sha256 = "0zgd5jwwdrqrnx828yxkzywh1dnwqi9y8pmq0vsndi6bwdp6dvkb"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "508b5eb18ee2f667ce06235ed383647038e2afc5"; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; - }; - } -] \ No newline at end of file From 2afb2ae1109018316d01d64e4a8008dbf4394e9d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 31 Aug 2020 22:58:41 +1000 Subject: [PATCH 254/499] teleconsole: use upstream vendor --- pkgs/tools/misc/teleconsole/default.nix | 11 ++++++++++- pkgs/tools/misc/teleconsole/deps.nix | 13 ------------- 2 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 pkgs/tools/misc/teleconsole/deps.nix diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 374bf9b54b29..47a792a3f92b 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -13,7 +13,16 @@ buildGoPackage rec { sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; }; - goDeps = ./deps.nix; + srcTeleport = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; + sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; + }; + + preBuild = '' + cp -r ${srcTeleport} ./go/src/github.com/gravitational/teleport + ''; CGO_ENABLED = 1; buildFlags = [ "-ldflags" ]; diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/pkgs/tools/misc/teleconsole/deps.nix deleted file mode 100644 index f13529d4b25a..000000000000 --- a/pkgs/tools/misc/teleconsole/deps.nix +++ /dev/null @@ -1,13 +0,0 @@ -[ - # Teleport v2.0.0-alpha.4 required for build. - # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8 - { - goPackagePath = "github.com/gravitational/teleport"; - fetch = { - type = "git"; - url = "https://github.com/gravitational/teleport"; - rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; - sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; - }; - } -] From 9b3bc6b46e921fd5eefcdef544dfa37a04a858a8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:46:09 +1000 Subject: [PATCH 255/499] livepeer: 0.2.4 -> 0.5.10 --- pkgs/servers/livepeer/default.nix | 24 +++++++++++++----------- pkgs/servers/livepeer/deps.nix | 20 -------------------- 2 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 pkgs/servers/livepeer/deps.nix diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 156c0f108ae8..60122d6b451d 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,30 +1,32 @@ -{ stdenv, fetchFromGitHub, buildGoPackage -, pkgconfig, ffmpeg_3 +{ stdenv, fetchFromGitHub, buildGoModule +, pkg-config, ffmpeg, gnutls }: -buildGoPackage rec { +buildGoModule rec { pname = "livepeer"; - version = "0.2.4"; + version = "0.5.10"; - goPackagePath = "github.com/livepeer/go-livepeer"; - goDeps = ./deps.nix; + runVend = true; + vendorSha256 = "0i5977skw4b209zvdvgvzfnhqb574067mmfk2gf9y590lgnr86f7"; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; - rev = version; - sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia"; + rev = "v${version}"; + sha256 = "0qccvnk2yyly7ha9lkcpd6zj5n9xnhdjkl3nllb9xziidsq6p65h"; }; - nativeBuildInputs = [ pkgconfig ]; + # livepeer_cli has a vendoring problem + subPackages = [ "cmd/livepeer" ]; - buildInputs = [ ffmpeg_3 ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ ffmpeg gnutls ]; meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/servers/livepeer/deps.nix b/pkgs/servers/livepeer/deps.nix deleted file mode 100644 index 297d0724a496..000000000000 --- a/pkgs/servers/livepeer/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/ericxtang/m3u8"; - fetch = { - type = "git"; - url = "https://github.com/ericxtang/m3u8"; - rev = "575aeb9f754a5dabcc03d4aa0ed05ecaee26499e"; - sha256 = "08811y4kg6rgj40v80cwjcwhy094qrfigdwjsgr8d6bn64cf9fz2"; - }; - } -] From b8bfe941fa7912bc68fb952fb268bc529eb502ca Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Mon, 7 Sep 2020 09:42:00 +0200 Subject: [PATCH 256/499] caddy: address remaining MR comments for v2 --- nixos/modules/services/web-servers/caddy.nix | 18 ++++++++++++------ nixos/tests/caddy.nix | 8 ++++++-- pkgs/servers/caddy/v1.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index e5f1df774bbc..dda26fe491a1 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -16,13 +16,15 @@ let }; }]; }; - adaptedConfig = importJSON (pkgs.runCommand "caddy-config-adapted.json" { } '' + + adaptedConfig = pkgs.runCommand "caddy-config-adapted.json" { } '' ${cfg.package}/bin/caddy adapt \ --config ${configFile} --adapter ${cfg.adapter} > $out - ''); - # TODO: validate with `caddy validate`? - configJSON = pkgs.writeText "caddy-config.json" (builtins.toJSON - (recursiveUpdate adaptedConfig tlsConfig)); + ''; + tlsJSON = pkgs.writeText "tls.json" (builtins.toJSON tlsConfig); + configJSON = pkgs.runCommand "caddy-config.json" { } '' + ${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${adaptedConfig} ${tlsJSON} > $out + ''; in { options.services.caddy = { enable = mkEnableOption "Caddy web server"; @@ -114,7 +116,11 @@ in { -root=/var/tmp -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + ExecReload = + if isCaddy2 then + "${cfg.package}/bin/caddy reload --config ${configJSON}" + else + "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; Type = "simple"; User = "caddy"; Group = "caddy"; diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index e9a93df4f486..445a7fa6b0b4 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -11,6 +11,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { http://localhost { encode gzip + file_server root * ${ pkgs.runCommand "testdir" {} '' mkdir "$out" @@ -25,6 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { http://localhost { encode gzip + file_server root * ${ pkgs.runCommand "testdir2" {} '' mkdir "$out" @@ -59,9 +61,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) etag = etag.replace("\r\n", " ") http_code = webserver.succeed( - "curl -w \"%{{http_code}}\" -X HEAD -H 'If-None-Match: {}' {}".format(etag, url) + "curl --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( + etag, url + ) ) - assert int(http_code) == 304, "HTTP code is not 304" + assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) return etag diff --git a/pkgs/servers/caddy/v1.nix b/pkgs/servers/caddy/v1.nix index bcd4b7065b58..8a18904af2c8 100644 --- a/pkgs/servers/caddy/v1.nix +++ b/pkgs/servers/caddy/v1.nix @@ -14,7 +14,8 @@ buildGoModule rec { rev = "v${version}"; sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g"; }; - modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; + + vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; preBuild = '' cat << EOF > caddy/main.go diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dba9d0c793b7..a3e555215477 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1507,8 +1507,8 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy1 = callPackage ../servers/caddy/v1.nix { }; + caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614 + caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { From 94ed8606c6851e326d91dde1b79774c157b2681f Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Mon, 7 Sep 2020 09:42:42 +0200 Subject: [PATCH 257/499] caddy: 2.0.0 -> 2.1.1 --- pkgs/servers/caddy/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 5a7ac8f086f9..1ed6fcd2d525 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.0.0"; + version = "2.1.1"; subPackages = [ "cmd/caddy" ]; @@ -10,12 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; + sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; }; - vendorSha256 = "09vnci9pp8zp7bvn8zj68wslz2nc54nhcd0ll31sqfjbp00215mj"; - - modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83"; + vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; From ce1985159dbffd15714560846c7597b93ca451f2 Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Tue, 8 Sep 2020 16:33:03 +0900 Subject: [PATCH 258/499] skk-dicts-unstable: enable to build on mac --- pkgs/tools/inputmethods/skk/skk-dicts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index d760e9d320a6..4d2f37b865db 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, skktools }: +{ stdenv, fetchurl, libiconv, skktools }: let # kana to kanji @@ -31,7 +31,7 @@ stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ]; + nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; phases = [ "installPhase" ]; installPhase = '' @@ -68,6 +68,6 @@ stdenv.mkDerivation { homepage = "https://github.com/skk-dev/dict"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From 21c1a3759b7fcd2602b0c5cce6d66e0970085196 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 6 Sep 2020 12:56:08 +0300 Subject: [PATCH 259/499] libqt5pas: init at 2.0.8 --- pkgs/development/compilers/fpc/libqt5pas.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/compilers/fpc/libqt5pas.nix diff --git a/pkgs/development/compilers/fpc/libqt5pas.nix b/pkgs/development/compilers/fpc/libqt5pas.nix new file mode 100644 index 000000000000..82cdd394e780 --- /dev/null +++ b/pkgs/development/compilers/fpc/libqt5pas.nix @@ -0,0 +1,24 @@ +{ stdenv, lazarus, qt5 }: + +stdenv.mkDerivation { + pname = "libqt5pas"; + inherit (lazarus) version src; + + sourceRoot = "lazarus/lcl/interfaces/qt5/cbindings"; + + postPatch = '' + substituteInPlace Qt5Pas.pro \ + --replace "target.path = \$\$[QT_INSTALL_LIBS]" "target.path = $out/lib" + ''; + + nativeBuildInputs = with qt5; [ qmake ]; + + buildInputs = with qt5; [ qtbase qtx11extras ]; + + meta = with stdenv.lib; { + description = "Free Pascal Qt5 binding library"; + homepage = "https://wiki.freepascal.org/Qt5_Interface#libqt5pas"; + maintainers = with maintainers; [ sikmir ]; + inherit (lazarus.meta) license platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac8be261614..615a53d0c21f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13932,6 +13932,8 @@ in libqalculate = callPackage ../development/libraries/libqalculate { }; + libqt5pas = callPackage ../development/compilers/fpc/libqt5pas.nix { }; + libroxml = callPackage ../development/libraries/libroxml { }; librsvg = callPackage ../development/libraries/librsvg { }; From cceb63ff0a7fb01d3b8dfc3a4a027c5cb97cfd29 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Sep 2020 01:03:27 -0700 Subject: [PATCH 260/499] allegro: fix build, use texinfo6_5 --- pkgs/development/libraries/allegro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 6071f63255d9..66611026c092 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11 +{ stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc , libXxf86vm, openal, libGLU, libGL }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - texinfo libXext xorgproto libX11 libXpm libXt libXcursor + texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc libXxf86vm openal libGLU libGL ]; From ac1f4a3ba160d43de869dcb6687bcb92c6806fa2 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 4 Sep 2020 03:26:11 +0300 Subject: [PATCH 261/499] cudatext: init at 1.111.0 --- .../applications/editors/cudatext/default.nix | 113 ++++++++++++++++++ pkgs/applications/editors/cudatext/deps.json | 42 +++++++ .../editors/cudatext/dont-check-update.patch | 12 ++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 171 insertions(+) create mode 100644 pkgs/applications/editors/cudatext/default.nix create mode 100644 pkgs/applications/editors/cudatext/deps.json create mode 100644 pkgs/applications/editors/cudatext/dont-check-update.patch diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix new file mode 100644 index 000000000000..a1af859af819 --- /dev/null +++ b/pkgs/applications/editors/cudatext/default.nix @@ -0,0 +1,113 @@ +{ stdenv +, lib +, fetchFromGitHub +, lazarus +, fpc +, libX11 + +# GTK2/3 +, pango +, cairo +, glib +, atk +, gtk2 +, gtk3 +, gdk-pixbuf +, python3 + +# Qt5 +, libqt5pas +, qt5 + +, widgetset ? "qt5" +# See https://github.com/Alexey-T/CudaText-lexers +, additionalLexers ? [ "Nix" ] +}: + +assert builtins.elem widgetset [ "gtk2" "gtk3" "qt5" ]; + +let + deps = lib.mapAttrs + (name: spec: + fetchFromGitHub { + owner = "Alexey-T"; + repo = name; + inherit (spec) rev sha256; + } + ) + (builtins.fromJSON (builtins.readFile ./deps.json)); +in +stdenv.mkDerivation rec { + pname = "cudatext"; + version = "1.111.0"; + + src = fetchFromGitHub { + owner = "Alexey-T"; + repo = "CudaText"; + rev = version; + sha256 = "1ai0g8fmw4m237dqh5dkr8w9qqricyvp49ijz2ivvmg9dsdfzjfp"; + }; + + patches = [ + # Don't check for update + ./dont-check-update.patch + ]; + + postPatch = '' + substituteInPlace app/proc_globdata.pas \ + --replace "/usr/share/cudatext" "$out/share/cudatext" \ + --replace "libpython3.so" "${python3}/lib/libpython3.so" + ''; + + nativeBuildInputs = [ lazarus fpc ] + ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook; + + buildInputs = [ libX11 ] + ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ] + ++ lib.optional (widgetset == "gtk2") gtk2 + ++ lib.optional (widgetset == "gtk3") gtk3 + ++ lib.optional (widgetset == "qt5") libqt5pas; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: '' + cp -r --no-preserve=mode ${dep} ${name} + '') deps) + '' + lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ + EncConv/encconv/encconv_package.lpk \ + ATBinHex-Lazarus/atbinhex/atbinhex_package.lpk \ + ATFlatControls/atflatcontrols/atflatcontrols_package.lpk \ + ATSynEdit/atsynedit/atsynedit_package.lpk \ + ATSynEdit_Cmp/atsynedit_cmp/atsynedit_cmp_package.lpk \ + EControl/econtrol/econtrol_package.lpk \ + ATSynEdit_Ex/atsynedit_ex/atsynedit_ex_package.lpk \ + Python-for-Lazarus/python4lazarus/python4lazarus_package.lpk \ + Emmet-Pascal/emmet/emmet_package.lpk \ + app/cudatext.lpi + ''; + + installPhase = '' + install -Dm755 app/cudatext $out/bin/cudatext + + install -dm755 $out/share/cudatext + cp -r app/{data,py,settings_default} $out/share/cudatext + + install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps + install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications + '' + lib.concatMapStringsSep "\n" (lexer: '' + install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib + '') additionalLexers; + + meta = with lib; { + description = "Cross-platform code editor"; + longDescription = '' + Text/code editor with lite UI. Syntax highlighting for 200+ languages. + Config system in JSON files. Multi-carets and multi-selections. + Search and replace with RegEx. Extendable by Python plugins and themes. + ''; + homepage = "http://www.uvviewsoft.com/cudatext/"; + license = licenses.mpl20; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json new file mode 100644 index 000000000000..9c3270bb28a2 --- /dev/null +++ b/pkgs/applications/editors/cudatext/deps.json @@ -0,0 +1,42 @@ +{ + "EncConv": { + "rev": "2020.06.15", + "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" + }, + "ATBinHex-Lazarus": { + "rev": "2020.09.05", + "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" + }, + "ATFlatControls": { + "rev": "2020.08.23", + "sha256": "1axzwiz5h62v11ncynxcg431dfbky9pwyha7cd6kpizjdjagfklw" + }, + "ATSynEdit": { + "rev": "2020.09.05", + "sha256": "0qn0fp7rbi48f3nrysb0knkd7a3a6pl5w72yf95g5iibal4zrib2" + }, + "ATSynEdit_Cmp": { + "rev": "2020.09.05", + "sha256": "1bd25zc97001b7lg0bvi8va9mazkr6jih6d2ddkabcxcnsj0dxnq" + }, + "EControl": { + "rev": "2020.09.05", + "sha256": "1n7s1zkhrr216gqdqvq6wq0n3jq7s78mwpi5s5j8054p0fak1ywi" + }, + "ATSynEdit_Ex": { + "rev": "2020.09.05", + "sha256": "17y2cx5syj3jvrszjgdyf1p6vilp2qgaggz4y8yqnz99cvd0shs7" + }, + "Python-for-Lazarus": { + "rev": "2020.07.31", + "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" + }, + "Emmet-Pascal": { + "rev": "2020.09.05", + "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" + }, + "CudaText-lexers": { + "rev": "2020.08.10", + "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" + } +} diff --git a/pkgs/applications/editors/cudatext/dont-check-update.patch b/pkgs/applications/editors/cudatext/dont-check-update.patch new file mode 100644 index 000000000000..44912160b268 --- /dev/null +++ b/pkgs/applications/editors/cudatext/dont-check-update.patch @@ -0,0 +1,12 @@ +diff --git i/app/formmain.pas w/app/formmain.pas +index 8c1131680..6c6c0043f 100644 +--- i/app/formmain.pas ++++ w/app/formmain.pas +@@ -2135,6 +2135,7 @@ begin + false + {$endif}; + *) ++ mnuHelpCheckUpd.Enabled:=false; + + with AppPanels[cPaneSide] do + begin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 615a53d0c21f..8855faa140c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19844,6 +19844,10 @@ in codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; + cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; + cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; + cudatext = cudatext-qt; + convos = callPackage ../applications/networking/irc/convos { }; comical = callPackage ../applications/graphics/comical { }; From 300df2e2f59d3012199a02370444ec8d4b5bbf6f Mon Sep 17 00:00:00 2001 From: cmacrae Date: Mon, 7 Sep 2020 10:31:48 +0100 Subject: [PATCH 262/499] emacs-mac: json support --- pkgs/applications/editors/emacs/macport.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 3a573504c417..f991fe7ea666 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake ]; - buildInputs = [ ncurses libxml2 gnutls texinfo gettext + buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO # may be optional ]; From ec220866287265462c5217c9d1bc233e6da23f85 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:50:31 +1000 Subject: [PATCH 263/499] gitAndTools.gh: 0.11.1 -> 0.12.0 https://github.com/cli/cli/releases/tag/v0.12.0 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index d456dc15c545..09d50d5a11c8 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0l1d75smvly2k6s3j55n674ld6i5hd8yn6lfhg8vvkvhxx2jjvb9"; + sha256 = "1nwpqwr8sqqpndj7qsk935i1675f4qdbl31x60a038l9iiwc28x1"; }; - vendorSha256 = "1xq1n583p0a3j78afprm2hk5f1hchdrx4vvphml95rv9786vjbcc"; + vendorSha256 = "1m5ahzh5sfla3p6hllr7wjigvrnccdvrsdjpxd2hy0rl7jsrp85m"; nativeBuildInputs = [ installShellFiles ]; From cb141359bf2d9251441bbcc7e440c4f1f4a32e4f Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 8 Sep 2020 11:09:04 +0100 Subject: [PATCH 264/499] nixos/openvpn: path now requires conversion to a string Following changes in https://github.com/NixOS/nixpkgs/pull/91092 the `path` attribute is now a list instead of being a string. This resulted resulted in the following evaluation error: "cannot coerce a list to a string, at [...]/nixos/modules/services/networking/openvpn.nix:16:18" so we now need to convert it to the right type ourselves. Closes https://github.com/NixOS/nixpkgs/issues/97360. --- nixos/modules/services/networking/openvpn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index dcd7e9e5fa4c..650f9c84ac72 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -11,7 +11,7 @@ let makeOpenVPNJob = cfg: name: let - path = (getAttr "openvpn-${name}" config.systemd.services).path; + path = makeBinPath (getAttr "openvpn-${name}" config.systemd.services).path; upScript = '' #! /bin/sh From 63b63537820bd0fd54188d6f1a3e515ca4a73a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 8 Sep 2020 12:00:18 +0200 Subject: [PATCH 265/499] knot-dns: Remove unnecessary runtime dependencies Closure size: 261 -> 171 MiB. (Only .bin was affected.) --- pkgs/servers/dns/knot-dns/default.nix | 1 + pkgs/servers/dns/knot-dns/runtime-deps.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/servers/dns/knot-dns/runtime-deps.patch diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d546b07148b2..de7f2cdfe518 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { # Don't try to create directories like /var/lib/knot at build time. # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch + ./runtime-deps.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/servers/dns/knot-dns/runtime-deps.patch new file mode 100644 index 000000000000..19fc9cd07b18 --- /dev/null +++ b/pkgs/servers/dns/knot-dns/runtime-deps.patch @@ -0,0 +1,14 @@ +Remove unnecessary runtime dependencies. + +`knotc status configure` shows summary from the configure script, +but that contains also references like include paths. +Filter these at least in a crude way (whole lines). +--- a/configure.ac ++++ b/configure.ac +@@ -766,5 +766,5 @@ result_msg_base=" Knot DNS $VERSION + +-result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') ++result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') + + AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary]) + From 5fc8ce0041fa7d1a41a866215c4a8804f8d4bde7 Mon Sep 17 00:00:00 2001 From: symphorien Date: Tue, 8 Sep 2020 13:19:29 +0200 Subject: [PATCH 266/499] paperwork: use tesseract 4 (#97395) it gives empirically better results https://www.willus.com/k2pdfopt/help/ocr/eng_chi_tess4.png --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f5c3f6c51031..ddc1375f276b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5133,7 +5133,9 @@ in { else throw "pyobjc can only be built on Mac OS"; - pyocr = callPackage ../development/python-modules/pyocr { }; + pyocr = callPackage ../development/python-modules/pyocr { + tesseract = pkgs.tesseract_4; + }; pyodbc = callPackage ../development/python-modules/pyodbc { }; From 9550ba71fab6db2782bdca7ce8d707dcb7197260 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 7 Sep 2020 18:55:56 +0200 Subject: [PATCH 267/499] python3Packages.goobook: 3.4 -> 3.5 --- .../python-modules/goobook/default.nix | 19 ++++++----- .../python-modules/goobook/fix-build.patch | 32 ------------------- 2 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 pkgs/development/python-modules/goobook/fix-build.patch diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index ac658b1940f4..6876ae0392b4 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,27 +1,30 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, google_api_python_client, simplejson, oauth2client, setuptools +, google_api_python_client, simplejson, oauth2client, setuptools, xdg }: buildPythonPackage rec { pname = "goobook"; - version = "3.4"; + version = "3.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg"; + sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9"; }; - # Required for a breaking change in google-api-python-client 1.8.1: - patches = [ ./fix-build.patch ]; - propagatedBuildInputs = [ - google_api_python_client simplejson oauth2client setuptools + google_api_python_client simplejson oauth2client setuptools xdg ]; meta = with stdenv.lib; { - description = "Search your google contacts from the command-line or mutt"; + description = "Access your Google contacts from the command line"; + longDescription = '' + The purpose of GooBook is to make it possible to use your Google Contacts + from the command-line and from MUAs such as Mutt. + It can be used from Mutt the same way as abook. + ''; homepage = "https://pypi.python.org/pypi/goobook"; + changelog = "https://gitlab.com/goobook/goobook/-/blob/${version}/CHANGES.rst"; license = licenses.gpl3; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/goobook/fix-build.patch b/pkgs/development/python-modules/goobook/fix-build.patch deleted file mode 100644 index 1121dbfdcb32..000000000000 --- a/pkgs/development/python-modules/goobook/fix-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8de09b82c5ac900317043e1c1025f431516b6788 Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Tue, 21 Apr 2020 21:41:04 +0200 -Subject: [PATCH] Switch from the alias apiclient to googleapiclient - -This fixes the package after a breaking change / bug in -google-api-python-client 1.8.1 (see [0] and a lot of duplicate issues). - -The module apiclient is just an alias for googleapiclient [1]. - -[0]: https://github.com/googleapis/google-api-python-client/issues/870 -[1]: https://github.com/googleapis/google-api-python-client/blob/v1.8.1/apiclient/__init__.py ---- - goobook/goobook.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/goobook/goobook.py b/goobook/goobook.py -index 5bcb0b3..a2e25e9 100755 ---- a/goobook/goobook.py -+++ b/goobook/goobook.py -@@ -31,7 +31,7 @@ import sys - import time - - import httplib2 --from apiclient.discovery import build -+from googleapiclient.discovery import build - - from goobook.storage import Storage, storageify, unstorageify - --- -2.26.1 - From eeaa8b70847dcd5fcc55e2bf986567984b51e2a8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Sep 2020 08:50:27 -0400 Subject: [PATCH 268/499] linux: 5.4.62 -> 5.4.63 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 24bff3218690..89fcf2f6429f 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.62"; + version = "5.4.63"; # 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 = "0w49y8lymz23x4mr5byaxnrkhm56lwfhnqkra07hqyfr5y63v216"; + sha256 = "1h7zlzylxql2v6hyi6g141kj5r3frk2xk6i8lfqn64d01np0s9p0"; }; } // (args.argsOverride or {})) From 29d03429bbbbcb82646b1594b034a42eed645271 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Sep 2020 08:51:03 -0400 Subject: [PATCH 269/499] linux/hardened/patches/4.14: 4.14.195.a -> 4.14.196.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 060d747e763d..446a838e3818 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.195.a.patch", - "sha256": "1a1g9q750gbnkcycqnzafb22f7250ck8dvzx6jqkz669wdg2pd7z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.195.a/linux-hardened-4.14.195.a.patch" + "name": "linux-hardened-4.14.196.a.patch", + "sha256": "0z96y39zghadbzcwnlj588652mfsqs0vdyvx25794y8yl77z6lnl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.196.a/linux-hardened-4.14.196.a.patch" }, "4.19": { "name": "linux-hardened-4.19.142.a.patch", From e8042d106ad3a74bdf6ca4f34ba3886d4bdb98dc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Sep 2020 08:51:05 -0400 Subject: [PATCH 270/499] linux/hardened/patches/4.19: 4.19.142.a -> 4.19.143.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 446a838e3818..07e50aa1c1eb 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.196.a/linux-hardened-4.14.196.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.142.a.patch", - "sha256": "1gwvacr23lp8qryfhnqn89pn9ly9d8c42rirvkz5psfmvnm7vxbn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.142.a/linux-hardened-4.19.142.a.patch" + "name": "linux-hardened-4.19.143.a.patch", + "sha256": "0g5x1arpz2ac7q5m0xyd90frnzmgl96vc7lvshki2s86nn8lwcig", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.143.a/linux-hardened-4.19.143.a.patch" }, "5.4": { "name": "linux-hardened-5.4.61.a.patch", From 0b5bec79aedea3af94c02bdf3db24741220658ef Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Sep 2020 08:51:06 -0400 Subject: [PATCH 271/499] linux/hardened/patches/5.4: 5.4.61.a -> 5.4.63.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 07e50aa1c1eb..c2b2768fd332 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.143.a/linux-hardened-4.19.143.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.61.a.patch", - "sha256": "1sgysrkycca860m2h7vrnfkplbsari6blcrkbsn285s5d0fsicnc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.61.a/linux-hardened-5.4.61.a.patch" + "name": "linux-hardened-5.4.63.a.patch", + "sha256": "0vafplb73ysyqwikil5gl4ipvlhgb8n94qvzbgg8bjv78nk99lm0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.63.a/linux-hardened-5.4.63.a.patch" }, "5.7": { "name": "linux-hardened-5.7.19.a.patch", From 2233cbbfb06d09d08b1fe565c38bf33fe953751f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Sep 2020 08:51:24 -0400 Subject: [PATCH 272/499] linux/hardened/patches/5.8: init at 5.8.7.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c2b2768fd332..02330f59b506 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -18,5 +18,10 @@ "name": "linux-hardened-5.7.19.a.patch", "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" + }, + "5.8": { + "name": "linux-hardened-5.8.7.a.patch", + "sha256": "13l486lyj9wm1v3gvrwpqbr3z3ps63qwx64ykh982mrv9bkrn1ia", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.7.a/linux-hardened-5.8.7.a.patch" } } From 45de9a079f0e63f055f9834e57c9b79e37546f04 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 8 Sep 2020 08:52:43 -0400 Subject: [PATCH 273/499] oh-my-zsh: 2020-09-03 -> 2020-09-04 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 018bf01f7d94..b236c848e14e 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-03"; + version = "2020-09-04"; pname = "oh-my-zsh"; - rev = "87edf16e05598505927410f6b06bbc5a6003805b"; + rev = "708ea42384d378343a590fc34a3dee536a1651df"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0c13vkh9w3sxdy12b17yqa676cp83jb3a4pwc2xx2xggcxpn72by"; + sha256 = "1gcpqwzqfaaa4fkyfk5gik6k9fwk8mwyp80xqin1zizaaz8vzr23"; }; installPhase = '' From ad55e4c7d4a82de6f3a5804321a85ade393d3df8 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 8 Sep 2020 14:51:58 +0200 Subject: [PATCH 274/499] home-manager: 2020-03-17 -> 2020-09-06 The package was broken due to [1], which is fixed upstream in [2]. The repo has moved to nix-community, so we might as well encode the redirect here. [1] https://github.com/NixOS/nixpkgs/pull/96042 [2] https://github.com/nix-community/home-manager/commit/0399839271d51d215430a2a511813c7dd2570769 --- pkgs/tools/package-management/home-manager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index e569d5a3de9b..cff6122fe6d4 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2020-03-17"; + version = "2020-09-06"; src = fetchFromGitHub { - owner = "rycee"; + owner = "nix-community"; repo = "home-manager"; - rev = "5969551a5cc52f9470b5ff5ca01327bf4bda82c1"; - sha256 = "0f4kz83a1kp3ci8zi5hvp8fp34wi73arpykl4d9vlywdk6w36bnd"; + rev = "249650a07ee2d949fa599f3177a8c234adbd1bee"; + sha256 = "0x858b7i15kx74aqwgi2n5ls7zjhcky95z9vbxfdlawmaz371dma"; }; nativeBuildInputs = [ makeWrapper ]; From d2eb16cdf54b0e2ded5415737b9d38755123ec3c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 8 Sep 2020 14:56:14 +0200 Subject: [PATCH 275/499] python3Packages.goobook: Generate and install the man page --- pkgs/development/python-modules/goobook/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index 6876ae0392b4..e183e79f5703 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -1,4 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k +, docutils, installShellFiles , google_api_python_client, simplejson, oauth2client, setuptools, xdg }: @@ -12,10 +13,16 @@ buildPythonPackage rec { sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9"; }; + nativeBuildInputs = [ docutils installShellFiles ]; propagatedBuildInputs = [ google_api_python_client simplejson oauth2client setuptools xdg ]; + postInstall = '' + rst2man goobook.1.rst goobook.1 + installManPage goobook.1 + ''; + meta = with stdenv.lib; { description = "Access your Google contacts from the command line"; longDescription = '' From 97532b871d08e81d0985e37346e94aa0f90b6c60 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Tue, 8 Sep 2020 15:23:01 +0200 Subject: [PATCH 276/499] obsidian: 0.8.2 -> 0.8.12 (#93930) --- pkgs/applications/misc/obsidian/default.nix | 82 ++++++++++++++++----- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 98eb76d9be18..44bd043d348f 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,32 +1,74 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3}: +{ stdenv, fetchurl, lib, makeWrapper, electron, makeDesktopItem, graphicsmagick +, writeScript }: let - pname = "obsidian"; - version = "0.8.2"; -in - -appimageTools.wrapType2 rec { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage"; - sha256 = "04jgsd97ivdm84diiafwqxzc9vvga1gsr7xicmqhdq05ns3xsfyz"; + icon = fetchurl { + url = + "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; + sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; }; - profile = '' - export LC_ALL=C.UTF-8 - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + desktopItem = makeDesktopItem { + name = "obsidian"; + desktopName = "Obsidian"; + comment = "Knowledge base"; + icon = "obsidian"; + exec = "obsidian"; + categories = "Office"; + }; + + updateScript = writeScript "obsidian-updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + + set -eu -o pipefail + + latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" + + update-source-version obsidian "$latestVersion" ''; - # Strip version from binary name. - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; +in stdenv.mkDerivation rec { + pname = "obsidian"; + version = "0.8.12"; + + src = fetchurl { + url = + "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; + sha256 = "1rvdxdxrfhw0ldslbnmx26znlvznb1iqpk95c0rh12hlzh4nlgxm"; + }; + + nativeBuildInputs = [ makeWrapper graphicsmagick ]; + + unpackPhase = '' + gzip -dc $src > obsidian.asar + ''; + + installPhase = '' + mkdir -p $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/obsidian \ + --add-flags $out/share/electron/obsidian.asar + + install -m 444 -D obsidian.asar $out/share/electron/obsidian.asar + + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + done + ''; + + passthru.updateScript = updateScript; meta = with lib; { - description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; + description = + "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns ]; + maintainers = with maintainers; [ conradmearns zaninime ]; platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} From 61eb2b639b6a0d6ed141773fb641722c9206e0ad Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Tue, 8 Sep 2020 15:27:08 +0200 Subject: [PATCH 277/499] gitlab-runner: 13.3.0 -> 13.3.1 (#97350) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 890c561cadc9..ae746f9c54c6 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.3.0"; + version = "13.3.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0pi33mgcmw1n5myyczg1nx1s8rqx6b4vr7s09jsjd6z81irhc87c"; + sha256 = "0bm6vgdy0lhy1cw6rjsifihxrin33h8c5xwca0mgwd4f7ad64dgs"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "071bsfnkasdj7lfidfhwcklycan2zpyalqia3rmbwd93m5rwqgrd"; + sha256 = "1pjpqmi45c0d41cwrb8vb4lkcqarq430mni37h1bsijgqiap8rqk"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0idbj8jmycrh61bvkzjl5xffhvv9jnjqv9q0ivl457sn2jii9bhi"; + sha256 = "15v5m420vv3vxmmga65j0agaa7b9mn1iywkq2ggpnrnznk5m613f"; }; patches = [ ./fix-shell-path.patch ]; From 4c489b5f5dda57883dad634bb5a6455b66c1fd36 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 8 Sep 2020 09:31:18 -0400 Subject: [PATCH 278/499] deployAndroidPackage: Use `pname` and `version` --- pkgs/development/mobile/androidenv/deploy-androidpackage.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix index 839a14f7033c..4f9db98c0062 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -5,7 +5,8 @@ let extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; in stdenv.mkDerivation ({ - name = package.name + "-" + package.revision; + pname = package.name; + version = package.revision; src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all; buildInputs = [ unzip ] ++ buildInputs; preferLocalBuild = true; From 7cac79b3adc20cbf4e94bec35d7f8f9e6535de96 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 8 Sep 2020 09:32:06 -0400 Subject: [PATCH 279/499] androidndkPkgs: Take version from underlying package We can now do this, so let's. --- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 04420370ff1c..995789b8c1ba 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -53,7 +53,9 @@ in rec { # Misc tools - binaries = runCommand "ndk-gcc-binutils" { + binaries = runCommand "ndk-toolchain-binutils" { + pname = "ndk-toolchain-binutils"; + inherit (androidndk) version; isClang = true; # clang based cc, but bintools ld nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ androidndk ]; From e2bef8fbdc998c07c146db1d047a1e331e4f0517 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 8 Sep 2020 09:33:09 -0400 Subject: [PATCH 280/499] lib.systems.examples: Bump android SDK to 21 074bc78cc8749faa31729096b65f2ef51b10abeb evidently meant to do this, but forgot. --- lib/systems/examples.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 40e2b8fcefbc..5403f73405c2 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -47,7 +47,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; sdkVer = "29"; - ndkVer = "18b"; + ndkVer = "21"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; }; @@ -55,7 +55,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; sdkVer = "29"; - ndkVer = "18b"; + ndkVer = "21"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; From 234c6e8a8949b309f73dbabfd7a657770035a766 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 8 Sep 2020 08:40:00 -0500 Subject: [PATCH 281/499] postgresqlPackages.timescaledb: 1.7.3 -> 1.7.4 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 61564a69232c..76619b83c142 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.3"; + version = "1.7.4"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1y3w1ap1cxmi691wfz078r2h74pcwf38zs8lr985pfmb25w47q0l"; + sha256 = "0w0sl5izwic3j1k94xhky2y4wkd8l18m5hcknj5vqxq3ryhxaszc"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; From 053b05d14d2fa31750d0aafb8fa92cff512750e8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Sep 2020 08:47:34 -0500 Subject: [PATCH 282/499] Remove Qt 5.15 from Plasma closure --- nixos/modules/security/pam.nix | 4 ++-- .../modules/services/x11/desktop-managers/plasma5.nix | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index ce74805ef413..4141a17c5072 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -394,7 +394,7 @@ let "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.googleAuthenticator.enable @@ -471,7 +471,7 @@ let "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 869adee5552b..94bc2ae491b8 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,8 +7,9 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5; + inherit (pkgs) kdeApplications kdeFrameworks plasma5; libsForQt5 = pkgs.libsForQt514; + qt5 = pkgs.qt514; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; @@ -84,7 +85,7 @@ let # recognize that software that has been removed. rm -fv $HOME/.cache/ksycoca* - ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5 + ${libsForQt5.kservice}/bin/kbuildsycoca5 ''; set_XDG_CONFIG_HOME = '' @@ -204,7 +205,9 @@ in KERNEL=="i2c-[0-9]*", TAG+="uaccess" ''; - environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; + environment.systemPackages = + with qt5; with libsForQt5; + with plasma5; with kdeApplications; with kdeFrameworks; [ frameworkintegration kactivities @@ -294,7 +297,7 @@ in qtvirtualkeyboard - xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ] # Phonon audio backend From 452854a13cd7f3a4f687096423652040da56e289 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 8 Sep 2020 09:49:39 -0400 Subject: [PATCH 283/499] androidndk: Avoid depending on target-sensative openjdk We just need jdk for this script that helps set up toolchains. The script might need to know about the target platform, but the interpreter that runs it (or part of it) doesn't. --- .../mobile/androidenv/compose-android-packages.nix | 4 ++-- pkgs/development/mobile/androidenv/default.nix | 4 ++-- pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 1786aebae830..794de2276645 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,4 +1,4 @@ -{requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: +{requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" , platformToolsVersion ? "29.0.6" @@ -144,7 +144,7 @@ rec { ) cmakeVersions; ndk-bundle = import ./ndk-bundle { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools; package = packages.ndk-bundle.${ndkVersion}; }; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 0228cd839242..a13b98cf945c 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs ? import {} +{ config, pkgs ? import {}, pkgsHostHost ? pkgs.pkgsHostHost , pkgs_i686 ? import { system = "i686-linux"; } , licenseAccepted ? config.android_sdk.accept_license or false }: @@ -6,7 +6,7 @@ rec { composeAndroidPackages = import ./compose-android-packages.nix { inherit (pkgs) requireFile autoPatchelfHook; - inherit pkgs pkgs_i686 licenseAccepted; + inherit pkgs pkgsHostHost pkgs_i686 licenseAccepted; }; buildApp = import ./build-app.nix { diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 6bdb71815909..ca305e0398d5 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -1,7 +1,11 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}: +{ lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook +, deployAndroidPackage, package, os, platform-tools +}: let - runtime_paths = lib.makeBinPath [ pkgs.coreutils pkgs.file pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.jdk pkgs.python3 pkgs.which ] + ":${platform-tools}/platform-tools"; + runtime_paths = lib.makeBinPath (with pkgsHostHost; [ + coreutils file findutils gawk gnugrep gnused jdk python3 which + ]) + ":${platform-tools}/platform-tools"; in deployAndroidPackage { inherit package os; From 812b60b175f5d02adc1310b52439b5bbb35dabc6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Sep 2020 08:54:45 -0500 Subject: [PATCH 284/499] sddm: use Qt 5.14 to synchronize with Plasma --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bce07e4f5f7..f26b2b66d7d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23095,7 +23095,7 @@ in robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; + sddm = libsForQt514.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; From bf9e9cd08a658c0baa2ac6f19831bb9fde177470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 16:08:10 +0200 Subject: [PATCH 285/499] cinnamon.warpinator: init at 1.0.8 --- pkgs/desktops/cinnamon/default.nix | 1 + pkgs/desktops/cinnamon/warpinator/default.nix | 79 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 pkgs/desktops/cinnamon/warpinator/default.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index e406da2b8e56..00029bb1fc45 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -29,4 +29,5 @@ lib.makeScope pkgs.newScope (self: with self; { mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; xapps = callPackage ./xapps { }; + warpinator = callPackage ./warpinator { }; }) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix new file mode 100644 index 000000000000..279b046be9f8 --- /dev/null +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -0,0 +1,79 @@ +{ fetchFromGitHub +, stdenv +, gobject-introspection +, meson +, ninja +, python3 +, gtk3 +, gdk-pixbuf +, wrapGAppsHook +, gettext +, polkit +, glib +}: + +python3.pkgs.buildPythonApplication rec { + pname = "warpinator"; + version = "1.0.8"; + + format = "other"; + doCheck = false; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0n1b50j2w76qnhfj5yg5q2j7fgxr9gbmzpazmbml4q41h8ybcmxm"; + }; + + nativeBuildInputs = [ + meson + ninja + gobject-introspection + wrapGAppsHook + gettext + polkit # for its gettext + ]; + + buildInputs = [ + glib + gtk3 + gdk-pixbuf + ]; + + propagatedBuildInputs = with python3.pkgs; [ + grpcio-tools + protobuf + pygobject3 + setproctitle + xapp + zeroconf + grpcio + setuptools + cryptography + pynacl + netifaces + ]; + + postPatch = '' + chmod +x install-scripts/* + patchShebangs . + + find . -type f -exec sed -i \ + -e s,/usr/libexec/warpinator,$out/libexec/warpinator,g \ + {} + + ''; + + preFixup = '' + # these get loaded via import from bin, so don't need wrapping + chmod -x+X $out/libexec/warpinator/*.py + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/warpinator"; + description = "Share files across the LAN"; + license = licenses.gpl3plus; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} From e9c4e3ffb4d33be3d09e274528333a8e32f00a58 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 8 Sep 2020 16:26:41 +0200 Subject: [PATCH 286/499] zandronum: use new hg url --- pkgs/games/zandronum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index e7200ff22e95..bdafff992434 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { version = "3.0.1"; src = fetchhg { - url = "https://bitbucket.org/Torr_Samaho/zandronum-stable"; + url = "https://hg.osdn.net/view/zandronum/zandronum-stable"; rev = "ZA_${version}"; sha256 = "16v5b6wfrmabs3ky6isbfhlrqdjrr1pvfxlxwk0im02kcpxxw9qw"; }; From 9b9d0fd5d5369cf138ea1fa09f6ebd6155a26b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 17:05:42 +0200 Subject: [PATCH 287/499] cinnamon.warpinator: license fix --- pkgs/desktops/cinnamon/warpinator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 279b046be9f8..5e37cff3d0a8 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://github.com/linuxmint/warpinator"; description = "Share files across the LAN"; - license = licenses.gpl3plus; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.mkg20001 ]; }; From 8c4dd13e3feaa103083fcd06dfca563e7db74272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 8 Sep 2020 16:49:24 +0200 Subject: [PATCH 288/499] nixos/cinnamon: add warpinator & blueberry pkgs --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++-- pkgs/desktops/cinnamon/default.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a9c059125e8d..a404143a03d4 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -193,8 +193,8 @@ in environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ # cinnamon team apps - # warp - # blueberry + blueberry + warpinator # external apps shipped with linux-mint hexchat diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 00029bb1fc45..68ccd76211d2 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -12,6 +12,7 @@ lib.makeScope pkgs.newScope (self: with self; { installPhase = "mv svg $out/share/iso-flags-svg"; }); + # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; From a634d700f15ad4c3f3412a1682179b891315e215 Mon Sep 17 00:00:00 2001 From: Peter Lacey-Bordeaux Date: Sun, 6 Sep 2020 12:20:12 -0700 Subject: [PATCH 289/499] joplin-desktop: 1.0.233 -> 1.0.241 --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 656cc6f69b95..f3a0d4ae9ae5 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.233"; + version = "1.0.241"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "1fmk56b9b70ly1r471mhppr8fz1wm2gpxji1v760ynha8fqy7qg1"; + sha256 = "0q0vwjch6m0n461x4llhidkqvy492dqnk8q1al8gnfz2grav6537"; }; appimageContents = appimageTools.extractType2 { From 5e8e75a0c6ff626a3dbff3d573695fdcb92bd348 Mon Sep 17 00:00:00 2001 From: midchildan Date: Tue, 8 Sep 2020 23:27:56 +0900 Subject: [PATCH 290/499] dmd: relax ld purity check for checkPhase Fix #97420 --- pkgs/development/compilers/dmd/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index a6d4f7e1e20a..4bfd6298c8f7 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -115,13 +115,21 @@ stdenv.mkDerivation rec { doCheck = true; + # NOTE: Purity check is disabled for checkPhase because it doesn't fare well + # with the DMD linker. See https://github.com/NixOS/nixpkgs/issues/97420 checkPhase = '' cd dmd - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL + NIX_ENFORCE_PURITY= \ + make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL + cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + NIX_ENFORCE_PURITY= \ + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd ../phobos - make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + NIX_ENFORCE_PURITY= \ + make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. ''; From b30c1165b5854aa0841c865b367ad1689c7d9ead Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 8 Sep 2020 19:06:27 +0200 Subject: [PATCH 291/499] rofi: 1.5.4 -> 1.6.0 --- pkgs/applications/misc/rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index d8e600f60193..d565e1874cd1 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "1g1170zmh5v7slnm1sm2d08jgz6icikf8rm17apm1bjzzyw1lhk7"; + sha256 = "sha256-BS/ypMS/MfaiUizWVov8yYgGJjgwMWvz0PiH3sYYn50="; }; preConfigure = '' From 0e5657498d9606a85e776d9c90f9ecd0321435a6 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 23 Jul 2020 13:28:26 +0200 Subject: [PATCH 292/499] mitmproxy: convert to python3Packages --- .../python-modules/mitmproxy/default.nix | 114 ++++++++++++++++++ pkgs/tools/networking/mitmproxy/default.nix | 55 --------- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 2 + 4 files changed, 117 insertions(+), 58 deletions(-) create mode 100644 pkgs/development/python-modules/mitmproxy/default.nix delete mode 100644 pkgs/tools/networking/mitmproxy/default.nix diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix new file mode 100644 index 000000000000..90fccdcd48cf --- /dev/null +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -0,0 +1,114 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, isPy27 +# Mitmproxy requirements +, blinker +, brotli +, certifi +, click +, cryptography +, flask +, h2 +, hyperframe +, kaitaistruct +, ldap3 +, passlib +, protobuf +, pyasn1 +, pyopenssl +, pyparsing +, pyperclip +, ruamel_yaml +, setuptools +, sortedcontainers +, tornado +, urwid +, wsproto +, publicsuffix2 +, zstandard +# Additional check requirements +, beautifulsoup4 +, glibcLocales +, pytest +, requests +, asynctest +, parver +, pytest-asyncio +, hypothesis +}: + +buildPythonPackage rec { + pname = "mitmproxy"; + version = "5.1.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; + }; + + postPatch = '' + # remove dependency constraints + sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py + ''; + + doCheck = (!stdenv.isDarwin); + + # examples.complex.xss_scanner doesn't import correctly with pytest5 + checkPhase = '' + export HOME=$(mktemp -d) + export LC_CTYPE=en_US.UTF-8 + pytest --ignore test/examples \ + -k 'not test_find_unclaimed_URLs and not test_tcp' + ''; + + propagatedBuildInputs = [ + setuptools + # setup.py + blinker + brotli + certifi + click + cryptography + flask + h2 + hyperframe + kaitaistruct + ldap3 + passlib + protobuf + publicsuffix2 + pyasn1 + pyopenssl + pyparsing + pyperclip + ruamel_yaml + sortedcontainers + tornado + urwid + wsproto + zstandard + ]; + + checkInputs = [ + asynctest + beautifulsoup4 + flask + glibcLocales + hypothesis + parver + pytest + pytest-asyncio + requests + ]; + + meta = with stdenv.lib; { + description = "Man-in-the-middle proxy"; + homepage = "https://mitmproxy.org/"; + license = licenses.mit; + maintainers = with maintainers; [ fpletz kamilchm ]; + }; +} diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix deleted file mode 100644 index b9d873fad6af..000000000000 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, fetchpatch }: - -with python3Packages; - -buildPythonPackage rec { - pname = "mitmproxy"; - version = "5.1.1"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; - }; - - postPatch = '' - # remove dependency constraints - sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py - ''; - - doCheck = (!stdenv.isDarwin); - - # examples.complex.xss_scanner doesn't import correctly with pytest5 - checkPhase = '' - export HOME=$(mktemp -d) - export LC_CTYPE=en_US.UTF-8 - pytest --ignore test/examples \ - -k 'not test_find_unclaimed_URLs and not test_tcp' - ''; - - propagatedBuildInputs = [ - blinker brotli certifi cffi - click cryptography flask h11 - h2 hpack hyperframe itsdangerous - jinja2 kaitaistruct ldap3 markupsafe - passlib protobuf publicsuffix2 pyasn1 - pycparser pyopenssl pyparsing pyperclip - ruamel_yaml setuptools six sortedcontainers - tornado urwid werkzeug wsproto zstandard - ]; - - checkInputs = [ - beautifulsoup4 flask pytest - requests glibcLocales - asynctest parver pytest-asyncio - hypothesis - ]; - - meta = with stdenv.lib; { - description = "Man-in-the-middle proxy"; - homepage = "https://mitmproxy.org/"; - license = licenses.mit; - maintainers = with maintainers; [ fpletz kamilchm ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bce07e4f5f7..0243385f77e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5470,9 +5470,7 @@ in mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { - python3Packages = python37Packages; - }; + mitmproxy = with python3Packages; toPythonApplication mitmproxy; mjpegtools = callPackage ../tools/video/mjpegtools { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddc1375f276b..ab7000c47166 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3657,6 +3657,8 @@ in { mistune = callPackage ../development/python-modules/mistune { }; + mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; From 9c6c7acf2218dc38009a5e630bb7ce1034b93318 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 30 Jul 2020 00:30:36 +0200 Subject: [PATCH 293/499] python3Packages.mitmproxy: 5.1.1 -> 5.2 --- .../python-modules/mitmproxy/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 90fccdcd48cf..cb5b5cc80f5b 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , isPy27 +, fetchpatch # Mitmproxy requirements , blinker , brotli @@ -40,16 +41,25 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "5.1.1"; + version = "5.2"; disabled = isPy27; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; + sha256 = "0ja0aqnfmkvns5qmd51hmrvbw8dnccaks30gxgzgcjgy30rj4brq"; }; + patches = [ + # Apply patch from upstream to make mitmproxy v5.2 compatible with urwid >v2.1.0 + (fetchpatch { + name = "urwid-lt-2.1.0.patch"; + url = "https://github.com/mitmproxy/mitmproxy/commit/ea9177217208fdf642ffc54f6b1f6507a199350c.patch"; + sha256 = "1z5r8izg5nvay01ywl3xc6in1vjfi9f144j057p3k5rzfliv49gg"; + }) + ]; + postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py @@ -57,12 +67,9 @@ buildPythonPackage rec { doCheck = (!stdenv.isDarwin); - # examples.complex.xss_scanner doesn't import correctly with pytest5 checkPhase = '' export HOME=$(mktemp -d) - export LC_CTYPE=en_US.UTF-8 - pytest --ignore test/examples \ - -k 'not test_find_unclaimed_URLs and not test_tcp' + pytest -k 'not test_get_version' # expects a Git repository ''; propagatedBuildInputs = [ From fca7cc57ad7ff3f72324636ed3a48d51ed29019f Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Tue, 8 Sep 2020 11:03:12 -0700 Subject: [PATCH 294/499] cantata: add perl for dynamic playlists Cantata wants to check if perl is available at runtime, but we already patch the script shebangs, making it unnecessary to be available at runtime -- thus, patch out this check. --- pkgs/applications/audio/cantata/default.nix | 17 +++++++++++++++-- .../cantata/dont-check-for-perl-in-PATH.diff | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index e5d62b15f450..95b7dd18425b 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtsvg, qttools +, qtbase, qtsvg, qttools, perl # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -38,6 +38,8 @@ let withUdisks = (withTaglib && withDevices); + perl' = perl.withPackages (ppkgs: [ ppkgs.URI ]); + in mkDerivation { name = "${pname}-${version}"; @@ -48,7 +50,18 @@ in mkDerivation { sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; }; - buildInputs = [ qtbase qtsvg ] + patches = [ + # Cantata wants to check if perl is in the PATH at runtime, but we + # patchShebangs the playlists scripts, making that unnecessary (perl will + # always be available because it's a dependency) + ./dont-check-for-perl-in-PATH.diff + ]; + + postPatch = '' + patchShebangs playlists + ''; + + buildInputs = [ qtbase qtsvg perl' ] ++ lib.optionals withTaglib [ taglib taglib_extras ] ++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] ++ lib.optional withHttpStream qtmultimedia diff --git a/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff b/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff new file mode 100644 index 000000000000..effb0f3b502c --- /dev/null +++ b/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff @@ -0,0 +1,17 @@ +diff --git a/playlists/dynamicplaylists.cpp b/playlists/dynamicplaylists.cpp +index 07b6dce3..6a3f97c9 100644 +--- a/playlists/dynamicplaylists.cpp ++++ b/playlists/dynamicplaylists.cpp +@@ -211,11 +211,6 @@ void DynamicPlaylists::start(const QString &name) + return; + } + +- if (Utils::findExe("perl").isEmpty()) { +- emit error(tr("You need to install \"perl\" on your system in order for Cantata's dynamic mode to function.")); +- return; +- } +- + QString fName(Utils::dataDir(rulesDir, false)+name+constExtension); + + if (!QFile::exists(fName)) { + From 2c6753f9d0b9474a492deab4b0d1023391d7ef2b Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 8 Sep 2020 19:59:58 +0200 Subject: [PATCH 295/499] Revert "nixos/raspberrypi-builder: fix cross using buildPackages" The commit enforces buildPackages in the builder but neglects the fact that the builder is intended to run on the target system. Because of that, the builder will fail when remotely building a configuration eg. with nixops or nix-copy-closure. This reverts commit a6ac6d00f98c7cc814008c1e6e288feaa2e123c6. --- .../system/boot/loader/raspberrypi/raspberrypi-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix index e75aa9d13875..7eb52e3d021f 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix @@ -3,8 +3,8 @@ pkgs.substituteAll { src = ./raspberrypi-builder.sh; isExecutable = true; - inherit (pkgs.buildPackages) bash; - path = with pkgs.buildPackages; [coreutils gnused gnugrep]; + inherit (pkgs) bash; + path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; firmware = pkgs.raspberrypifw; inherit configTxt; } From 46e3949819a53363ee32c893d136c05c343a90de Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 8 Sep 2020 20:03:41 +0200 Subject: [PATCH 296/499] codimd: build with nodejs-12_x instead of nodejs-10_x The codimd test is now exposed via passthru.tests --- pkgs/servers/web-apps/codimd/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index 6771f459b68b..7de539bb0913 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, which, nodejs, mkYarnPackage, python2 }: +, which, nodejs, mkYarnPackage, python2, nixosTests }: mkYarnPackage rec { name = "codimd"; @@ -63,6 +63,8 @@ mkYarnPackage rec { runHook postDist ''; + passthru.tests = { inherit (nixosTests) codimd; }; + meta = with stdenv.lib; { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0243385f77e0..0fbd2bd0d6d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2708,7 +2708,7 @@ in cmt = callPackage ../applications/audio/cmt {}; codimd = callPackage ../servers/web-apps/codimd { - nodejs = nodejs-10_x; + nodejs = nodejs-12_x; }; colord = callPackage ../tools/misc/colord { }; From 91523d2d8d20ad1412b299d9789061c33b4b3ef8 Mon Sep 17 00:00:00 2001 From: endorphin Date: Tue, 8 Sep 2020 11:45:22 -0700 Subject: [PATCH 297/499] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 234 ++++++++++++++-------------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 378a252e9da0..3b516de5c5a8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-08-31"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "d4a14746cdcda99ec70915c5540962c85e33f661"; - sha256 = "1k93gab46y3ld9s3h3ha3vmdfy37vhb3px79p5a62b21jwma9mxc"; + rev = "b4b75126f9eae30da8f5e0cb9ec100feb38c1cb6"; + sha256 = "0k6zaw31igpm4d2kwbmryk86aifgabph4yzwyrrwvwlj9l5d32fy"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -137,12 +137,12 @@ let ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; - version = "2020-03-24"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "vmchale"; repo = "ats-vim"; - rev = "a17576687217a2e8066356cc211afb99b5de65e8"; - sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; + rev = "8e3e722b6d09ed81313573b4e7b108b265628ff1"; + sha256 = "1jj4q8dmal7rgizqm59dbgjf8by8lxjwnbg39gkbmjiwhdj8q67h"; }; meta.homepage = "https://github.com/vmchale/ats-vim/"; }; @@ -377,24 +377,24 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-01"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "e1ef6be69cbafff868a45d2b20a6b2325f4baa26"; - sha256 = "0acwlr4pr87jx0a83mq73dh9jwd4iwnv1rs6pd2mdbj4ix0avxyw"; + rev = "847f480a3de6d34c79594caa6c972ecca4e2adba"; + sha256 = "0wny1hakkhngnkx9dsmimljcb8sszxwd7nhcl6ps5wyhxxn46pls"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-08-27"; + version = "2020-09-03"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "085e54bf91b7f6ce19be9c2801ad4e69b15c24f9"; - sha256 = "0dfpl26jn6gc3nswbz0nclzr0s58fhmrhqvmknssg600wgnrd12v"; + rev = "2047783c1c9f7bcc020612a719d932e848a2d39d"; + sha256 = "15fxpip9zz5z8np3qrsgadh7p8y8446bxb9vbcr80fcq3j8fmq0v"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -510,12 +510,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-02"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "3de0996f965a218573e2fa62379cce9ed5c8dbc3"; - sha256 = "0glai58hpwivfc67ndv588b4rsb27m40fblp8ydrf37w7cj787dz"; + rev = "7ee735199fcce0e9dd94cbf288dc7d9e630eef95"; + sha256 = "0w0jdm1vggmzcnvssvxy3hg56mh1w6p7rbgj6asw13k0jam6jd3v"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -546,12 +546,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-08-12"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "db0de94cc2c4fe1bf1a8fe5c78fcc774097d1e90"; - sha256 = "1vcp2hzp5kg1rpdbl8sil16zqc1qawxfchwbq4c4kwyr2kxkavhh"; + rev = "566915cc545edd68bab2ad76eb59dfa43648a8b3"; + sha256 = "0qcg51wmkz6bfz8pz4ryl78ifl7pf8lsjszp2kh0sbq7raz1kpkn"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -702,12 +702,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-08-28"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "e4ea8290eba832997eaa36b6810e8ecc15ca1151"; - sha256 = "063vy5kl8vz9c3nnz7g8yw1f1v1vcmxfg4p59mzsfrqf93fs2y30"; + rev = "4e3221ab3dc1144f4c1a94c78435427f9de943f0"; + sha256 = "16nbp5gkzdbmx96sgybh7kjj6wlpz4zly1656m6ihfq0s3mmvlk5"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1295,12 +1295,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-08-12"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "4145f53f3d343c389ff974b1f1a68eeb39fba18b"; - sha256 = "07fb52c8bmmpfin24pqqh04q157qx52xjri2wjm004yq69b44hx7"; + rev = "18205e071dc701ed9ca51971466b9997cd3d0778"; + sha256 = "0rbsq18gqpyngm0kjxhxwm4avxllmxwhg1bgvcj7pvh3pd35nmbl"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1595,12 +1595,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-05-29"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "43dbd7092801637972b1d9fcecaaeee11f8e00cf"; - sha256 = "0qnzi19vb5qk773pc9v75wqm2ipdkcscljblla6gq05srm1h8x9d"; + rev = "5bf49035522dea94b72638d039828c6f84b7ae34"; + sha256 = "098ng8f2dv29pgvai4nsm2d5qyw44gd9dxjmdc3mdznzmn0clvvf"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1716,12 +1716,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-07-31"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "ead61b0ff9e26365a977280298b22bad40c9fba5"; - sha256 = "05p5kxkdh4y1s8532d1d8zilq9hy098bwx3lyrsqpxj0n2kr2q0d"; + rev = "33116e1135ffa0c09997c111785beb5232efc7cf"; + sha256 = "1qx1xpnnzvb5h86mrywx56yqw5lbma9xmwdgi6dh6x8mzald7agw"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -1848,12 +1848,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-08-20"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "15722c04a41d49027c7b499703fc1dac376653a8"; - sha256 = "1h94zzanzlixlmlyy3r54hk2lw9hwd49v9ij9lq3ghyc79gvhvgi"; + rev = "39e1fc1a1bc38fc90dea53d5737c8699107d3343"; + sha256 = "07i5fz1mgqr8sp653qs0kvi2wdls77g80ajz7z0wq6hxxdkfr46s"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1872,36 +1872,36 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-08-17"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "4e0c69a53b64ac90ca5235f176a070e003108113"; - sha256 = "1rhin9pcry3sgggvkzsmxd2s4x262m4x9xdvsrshkc2zj8wy8b0i"; + rev = "6417dd8c864ccd6fb2b79882d30ca0227bfd2204"; + sha256 = "0aars37arix00l63kn5p4gq3dvzpmrzxz1ap20k1mr2dy7pmval5"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-08-16"; + version = "2020-09-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "1b412cf3af3dad79ee5807e6b151b8ac6aa4e2fc"; - sha256 = "074jp56m55mbvyhl5sw4pmg8ivjxqmah1kl3nyxk61hnnv1ackb3"; + rev = "f5f870e0ac67542fd83cb6ff99632940fe8795f9"; + sha256 = "1al9yvwn3rfw22351p221nx68hhqynh9cq1flyalkvr46cda48cz"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; limelight-vim = buildVimPluginFrom2Nix { pname = "limelight-vim"; - version = "2019-07-09"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "26e913a2e061195245bc62d24009ab67143a3c32"; - sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn"; + rev = "815c6122504361d52e10172601471b416d040ca8"; + sha256 = "1af9jz05iphp6738vvfchnvhfxw7wx2hxqs0iyjkmi7w43hsw0sy"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -2292,12 +2292,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-08-03"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "b4c470b7e720fa061ac118a09420bc2da16610bd"; - sha256 = "1d27rhyd5db0vd72gi6dl34g4axsz66d0l0fgw5g6grawlpf8w6l"; + rev = "14785c0e60f27b8be7998ebfb075ce816a0aace6"; + sha256 = "1y9h9bp17r30g71zcgdapwrnkwrcr16mhqrs94i8y5nay9zmks79"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2496,12 +2496,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-09-02"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "419fa4006e7c15cbc2f81f5110952de562494cd4"; - sha256 = "1snkk214j49wyar98jx65bkkzaj5fnq8d8d8dfnz81ymx3dv6pqv"; + rev = "60133c47e0fd82556d7ca092546ebfa8d047466e"; + sha256 = "15ysbbvxlgy1qx8rjv2i9pgjshldcs3m1ff0my2y5mnr3cpqb3s6"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -2520,12 +2520,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-02"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "36f3e036e5b244af01947339da92430c4761e57e"; - sha256 = "0nymrwc129mxgsw9ziw616zpn2q9a83cnlwkvbjpv3c78im8jnka"; + rev = "dc077b5fb00d1c4635c04c0ba1cb9162e613d83c"; + sha256 = "1172pald8686z8mrqp086jb2yin0i9zl599x4804jflz311cyvjn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2616,12 +2616,12 @@ let palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2020-08-30"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "677745d52c4c03b344cd382dab0554a1d63b0692"; - sha256 = "0av2if81vcknv3w74h5y1mbip8y8i0kif94v5mdc17cfi6d5ngks"; + rev = "294f190da3bd50a7c91fed1b94c92fd0930791ec"; + sha256 = "0s9mna0dcpszz3wyz1qmmrm76rxkjlmyxn7697k5vz4l49zzyi39"; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; @@ -2928,12 +2928,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-08-15"; + version = "2020-09-05"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "f5eb7b04ee2746cbed4067e0cf9dd19185529a34"; - sha256 = "0549r64350cr17gg1lm1fwz0wb1w9jsbs8qi8ddcsgrk1bc3gqf5"; + rev = "f24b96bbc6f618f2f082248e9c405e96118bcbc7"; + sha256 = "0p05h3cmhwz5vm3nlgzyssqb21xjbjqb7xn52zfid4q75cq40lsf"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3024,12 +3024,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-08-31"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "c81d2cabc1ada11f1531b05669fd07f52c75da22"; - sha256 = "042safg5i1f7rnfwlf37ic40rg6s5svsjci3cp06lzy3v9r8n2qf"; + rev = "403accb75e7659dfa9caa9a43e43db9840ea140a"; + sha256 = "1wnr7jfc41i2vvqvbhclw5rym138fki0w67d3q7cqmx2520zxafy"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3217,12 +3217,12 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2020-02-21"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "c4053da88208cef5a32a5862694d36b73f6ce310"; - sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v"; + rev = "bfc662d11b3a006815d0b6972c1c0c2ebbc3b16e"; + sha256 = "1qf5f9p0kfi6bq2qi9izarva6r711vzlbrbdax8nq9g0pxa1bj3f"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -3458,12 +3458,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-05-19"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e83c82099d9bd43dc7895e3cb5b114ee5a2a07c6"; - sha256 = "0a9fqgg8sg8s19q9inxyzl6lqdsnxs22csqs2rss1qz9dsic4yrh"; + rev = "7941f98337564d4e86cf2b7467b64def4d212794"; + sha256 = "0miihbj9h3ay6iq1ld13ixij3l4h02yrmc7bq8iarw776l89gin0"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3806,12 +3806,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-08-27"; + version = "2020-09-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c77d89046e5dc66438190e2261fb2197df2a8932"; - sha256 = "009n427sgjmc12rvamda70marjaqpzi9zlddk5d1yim61qvh7djh"; + rev = "51f599e2cf45c17759b4bd3931ca1c5c10bfd4f4"; + sha256 = "1y6ckm1fkzrq2w5ya0m5iknqcl033ykkzrwx30ia7kxci4drz2ad"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4022,12 +4022,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-03"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "973ebcf5411eea777450673b0b3f132beb5004d7"; - sha256 = "1fdlfx5lw1lkw3ikwap8h8sr2f8g43j87r2vl9y4w0rph240rj1v"; + rev = "92620f3435bb12e518d7a06c8f2f1ff2f53396ec"; + sha256 = "088abwj4spriqnqldrm0djf4a5i1dgrxajz2vw7rajwl7mmjsp1v"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4274,12 +4274,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-08-14"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "308526367703698554d19f15f692ee3c45a598cb"; - sha256 = "0b6ng6qgwx4fb9fs7b7m5k3dj7ycq0zw5y0jaqqqn6asp8wmf51b"; + rev = "7d1c3aeb3b26c7fb7bcd7cb2bee67beb3e538db3"; + sha256 = "0yrc17pq713b86z71ad0zy8lm1cd2psyzbw8yb62d1prjc17hp77"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4310,12 +4310,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-09-01"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "4bc6add29683230dd79a53b2ae8c770fa548a708"; - sha256 = "1vz5fbq5aqlqh6sg6flg8lcds50vy8nck21jpppvhxq7acjn5630"; + rev = "9c0dc32af9235d42715751b30cf04fa0584c1798"; + sha256 = "1xl655mnhjn1mbqzvxblsbqyg3yq50ri2a7szvqmpywq8rr0ymq9"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4586,12 +4586,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-09-02"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "95eb7818f70339a29b7d655fc834ba12ccc2922c"; - sha256 = "18yv4y3p8hlyrhadd2nc464cb9hql89mrpvvcdh4sxqn4qn8pmmk"; + rev = "615568a454e3dfd7a2d1571dcd8a2407f4897303"; + sha256 = "0iclpfqvxhg5b74pixswwys06jmiydk5b82iqkchsxhrfh7jgzb9"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4694,12 +4694,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-08-31"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "098b9c82e9ac39b0d203635a8041bb1aceb8426c"; - sha256 = "1d0shs6q509zwfpp0dqffhh5fm8fr8x6km6w8mf4m9p1fkxyaz1g"; + rev = "94ee004087525d4adb56e9325320053fddef0564"; + sha256 = "0fg2wmk19fp07s3gg8ril8zvhbsvz8n01phv4dyskw6bnaz3vbz7"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4730,12 +4730,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-08-30"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "bf2dd524a7d7a2c6f50642ec3dae2bc1506b5c94"; - sha256 = "0d1gnszjppp4p1b39jxa19fdg77iq6baxm5hbjiinidmhgbal35w"; + rev = "9b9b527d61a6fe10a6d0c618cc0dd113b6aa7690"; + sha256 = "147yqgr7vrn2rj90qczp70fiqk3mj02p4v5qkkhwh1kspdqsjmp7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4754,12 +4754,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-08-31"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "e64fba4ee17fa8dd391405982500c72d68fc50b9"; - sha256 = "1pf0lpjy88hwmxn3lybjkq10w6s666wmpbzsfkjbp8xmqhzlvaf6"; + rev = "94404d3724dd85b72d49f371cd810223dd68112b"; + sha256 = "0ll5qb2cj337flba4sg9ds2cyrdn9j8x1sfjv50r1lr8szaqj6cl"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5391,12 +5391,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-08-16"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "b1af5a28242ae58ece98d833a2bf28e030d57230"; - sha256 = "1nnn0cxvpgmgi8xpqmhxr3vi42s3g1d0rn683hyizdn4i0l888k3"; + rev = "9e0b6f37113e21fecd42ef6b04762de4aafe2cf3"; + sha256 = "0cy7k96458qk5fn7fbvki42b2pgrrk803shixs4ww43iipya6m5b"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -5451,12 +5451,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-09-02"; + version = "2020-09-05"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "77231afb915b32e1530f48e96a64db5cd0948487"; - sha256 = "1hb8kqn70vi17mf2wiliqrkyp1n9zc53020kaw961vqvnk5mqsvg"; + rev = "3ff5adfc7953b48919096cecc3754f0d615a17de"; + sha256 = "0r41abn31jy31lnnj8q6g35y9xnz8j3iivnyyvyxd4z6b8rq4kin"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -5835,12 +5835,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-08-29"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "a9bf5bd72212ff7cf9e9e863c365a3464faa2426"; - sha256 = "0rrmz7vn3kxgrbwmil3vlddq13sy9wbgmn5kgz1r12wcbwf1sb56"; + rev = "d16273e07231260e02412625f98651bc6ceebb56"; + sha256 = "0ckglxbnxq50jfigbmgjwaj2vj1g6xjwyipzxbph2b64yi2kklg5"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5859,12 +5859,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-01"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "63119f09d1390b61155cc0dc3ff497356d2fc7e5"; - sha256 = "0b04la1i0sawkwbwhb708jzdqflpdxavbf2s0dw8ys65z79z8qzn"; + rev = "a4b91124a8fea26575d08c1845e141520e7d33e2"; + sha256 = "1b599jmhlj9nk11hj6h47kny3cvcb8ci6n1s1s9vyghmv2cqysb3"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6063,12 +6063,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-07-23"; + version = "2020-09-08"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "be83e5bcbe30888b88359fc875ade9c54562411d"; - sha256 = "1qz3fqixl25x8b70y6kw9lgjxciv9bbzqx9dimvypmhqwx09pnjb"; + rev = "98595736d4d91552647ea0130e704cd1a3d5d1d1"; + sha256 = "1b6224f4q4lpd3sdn3ka8gdcnyi82ii8bh4baxf8mp9c0r6qwcns"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -6327,12 +6327,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-08-30"; + version = "2020-09-05"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "c609efe753ccc2f2631908149e94febc0b257052"; - sha256 = "00m2kjkqyz1s36hn2m7qd98ms26cxhcbh1qhpnzbhfldz0wq9dd5"; + rev = "791c72d53399c7db9ec5a19922efee15d8f5a94b"; + sha256 = "0ap477g8265w7rprk4z402m3xxpci35xq602z1g7x86488afgsrw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6748,12 +6748,12 @@ let vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2019-06-24"; + version = "2020-09-07"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "962b181f402f05b66641308fe1b3538d5f863ab8"; - sha256 = "0cqarsvdw9gr8pqp1gjy4rb6aaifjyb7iaaa2g8msr1ps0ihs3gd"; + rev = "c0edb8a684f624d6f177c2625fc9db617a3d539f"; + sha256 = "13fm3mgnvbhm93cn0jglnqm8hhmwvh5xg088pn5wmwrn9bjj00gz"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -6808,12 +6808,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-08-15"; + version = "2020-09-01"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "038065ed8d1b43972f8993df41f07aa00848a47f"; - sha256 = "137pcqp96xgak9ghr5829dq39525n0x2p56lcbh2njf3crgvmnl0"; + rev = "1c9207b28c8898ab01b54e6d6b61b0b820a814bc"; + sha256 = "0jggmhxgs3lkm8hfjicminhsmfdjw8gsp0p5jgamdx68bryp818g"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7084,12 +7084,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-01"; + version = "2020-09-04"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "e81be848a112350656e7c273777185c3c1a88e3e"; - sha256 = "07xfkvhanwi7x5kyw0wzgia33wrxi8xpxxf546xkd06bz0j6kqv4"; + rev = "f1cc01a39950d18310bad2d14d7f8e7c52a1e7d0"; + sha256 = "0digxir7gclbcgfk6wgwp7ywy6nmndnybmgjsfksvnqf0qw99inc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; From df767479723f3497767b8c629ef3ebefcefe1743 Mon Sep 17 00:00:00 2001 From: endorphin Date: Tue, 8 Sep 2020 11:48:51 -0700 Subject: [PATCH 298/499] vimPlugins.Coqtail: init at 2020-09-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3b516de5c5a8..e5bdc42c03c6 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -568,6 +568,18 @@ let meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + Coqtail = buildVimPluginFrom2Nix { + pname = "Coqtail"; + version = "2020-09-08"; + src = fetchFromGitHub { + owner = "whonore"; + repo = "Coqtail"; + rev = "828f950097e33325912fd142aa3c4c284c081986"; + sha256 = "1qwc40fvfbhnn160m0clab4kcd1laqibhp7rvivqnk537pw5fk6l"; + }; + meta.homepage = "https://github.com/whonore/Coqtail/"; + }; + cosco-vim = buildVimPluginFrom2Nix { pname = "cosco-vim"; version = "2018-08-07"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e2a4b090aaa0..2edab6b4ec34 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -595,6 +595,7 @@ wannesm/wmgraphviz.vim weirongxu/coc-explorer wellle/targets.vim wellle/tmux-complete.vim +whonore/Coqtail will133/vim-dirdiff wincent/command-t wincent/ferret From f1e071e0481be2ba7659e41100745c9deca8d9ee Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Fri, 7 Aug 2020 20:59:51 +0200 Subject: [PATCH 299/499] bs-platform: 7.3.2 -> 8.2.0 --- .../compilers/bs-platform/build-bs-platform.nix | 7 ++++--- .../compilers/bs-platform/default.nix | 6 ++++-- .../bs-platform/jscomp-release-ninja.patch | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index 71ba415d6202..18c61d0d923c 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -3,6 +3,7 @@ { stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3, ocaml-version, version, src, + patches ? [], ocaml ? (import ./ocaml.nix { version = ocaml-version; inherit stdenv; @@ -22,7 +23,7 @@ let in stdenv.mkDerivation rec { - inherit src version; + inherit src version patches; pname = "bs-platform"; BS_RELEASE_BUILD = "true"; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ nodejs python3 custom-ninja ]; - patchPhase = '' + prePatch = '' sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js mkdir -p ./native/${ocaml-version}/bin ln -sf ${ocaml}/bin/* ./native/${ocaml-version}/bin @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { buildPhase = '' # This is an unfortunate name, but it's actually how to build a release # binary for BuckleScript - node scripts/install.js + npm run postinstall ''; installPhase = '' diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 0fd696c69f0a..18436bca347d 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -4,14 +4,16 @@ let in (build-bs-platform rec { inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "7.3.2"; + version = "8.2.0"; ocaml-version = "4.06.1"; + patches = [ ./jscomp-release-ninja.patch ]; + src = fetchFromGitHub { owner = "BuckleScript"; repo = "bucklescript"; rev = version; - sha256 = "1nvp7wiiv149r4qf9bgc84bm4w7s44sjq9i7j103v24wllzz218s"; + sha256 = "1hql7sxps1k17zmwyha6idq6nw20abpq770l55ry722birclmsmf"; fetchSubmodules = true; }; }).overrideAttrs (attrs: { diff --git a/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch b/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch new file mode 100644 index 000000000000..96235f921317 --- /dev/null +++ b/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch @@ -0,0 +1,16 @@ + jscomp/others/release.ninja | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja +index 9ea6d11c5..a91ed9c80 100644 +--- a/jscomp/others/release.ninja ++++ b/jscomp/others/release.ninja +@@ -30,7 +30,7 @@ build others/js_json.cmj : cc_cmi others/js_json.ml | others/js_array2.cmj other + build others/js_json.cmi : cc others/js_json.mli | others/js_dict.cmi others/js_null.cmi others/js_string.cmj others/js_types.cmi runtime + build others/js_list.cmj : cc_cmi others/js_list.ml | others/js_array2.cmj others/js_list.cmi others/js_vector.cmj runtime + build others/js_list.cmi : cc others/js_list.mli | others/js_vector.cmi runtime +-build others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.ml | others/js_mapperRt.cmi runtime ++build others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.ml | others/js_array2.cmj others/js_mapperRt.cmi runtime + build others/js_mapperRt.cmi : cc others/js_mapperRt.mli | runtime + build others/js_math.cmi others/js_math.cmj : cc others/js_math.ml | others/js_int.cmj runtime + build others/js_null.cmj : cc_cmi others/js_null.ml | others/js_exn.cmj others/js_null.cmi runtime \ No newline at end of file From c73ef96b7ee16f76f95b68a0a81680b1dd350e9f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 8 Sep 2020 22:15:49 +0200 Subject: [PATCH 300/499] linuxPackages.wireguard: 1.0.20200729 -> 1.0.20200908 https://lists.zx2c4.com/pipermail/wireguard/2020-September/005817.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index fa5783728767..b8b65fecafc2 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200729"; + version = "1.0.20200908"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "0fk2i65q8pk11n46a31017059aan7hbbx0xv6d2c9d80dzrw5a36"; + sha256 = "1nd2kc3c62907kxm1084dw7krd8xsy3hxydmcpz4jvk03vm5dnkg"; }; hardeningDisable = [ "pic" ]; From cda6995f5e6ade8738d938e30ca6665a0fba9588 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 8 Sep 2020 22:39:39 +0200 Subject: [PATCH 301/499] golangci-lint: 1.30.0 -> 1.31.0 Signed-off-by: Sascha Grunert --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index cddd16f945ff..1eaa00e80864 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1a2dmjg7mlm908zlh5vibqv17dpn6hvdn8rx14pdm9kw1q51iish"; + sha256 = "10divgsc095jiw7n3gwzikbgvsd0hdwjyv469vq939zm7rqq3acy"; }; - vendorSha256 = "0y18ws2lc9bynb8fi8q6kcc1ngvzyfxlmpqn7gc0hvj3ribdpwrd"; + vendorSha256 = "1pa99jfz6i696x6v06aq56r0kmxmz4khb1hw7pvxds0bn16a4swr"; doCheck = false; From 9716fcd940c042e203bd9e03b53a46f141d3824f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Sep 2020 13:57:50 -0700 Subject: [PATCH 302/499] python3Packages.minio: fix cred tests --- pkgs/development/python-modules/minio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index bd1e5417069f..7799a7a9ef6d 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { ]; checkInputs = [ faker mock nose pytestCheckHook ]; + # example credentials aren't present + pytestFlagsArray = [ "--ignore=tests/unit/credentials_test.py" ]; meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; From 2bc02f29256c0ba5c366330405502637c73c1fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20B=C3=BCttner?= Date: Tue, 8 Sep 2020 23:24:51 +0200 Subject: [PATCH 303/499] vimPlugins.asyncomplete-vim: init at 2020-08-09 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e5bdc42c03c6..377807356827 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -135,6 +135,18 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + asyncomplete-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-vim"; + version = "2020-08-09"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete.vim"; + rev = "0d4ec1805d50fd39b8b41626e0761736feb307d0"; + sha256 = "0lcqdh51fd8lx1g02dcwrfnnx3zfm71g57nv2pmin5ap7qgh8kir"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; From 12fc3e071801968703fab0bf41cb01846054d210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 4 Sep 2020 15:50:53 +0200 Subject: [PATCH 304/499] python-engineio: 3.13.0 -> 3.13.2 (fix build) --- .../python-modules/python-engineio/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 1c48cfa6c66b..a74ee0455f2f 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -9,17 +9,18 @@ , tornado , websocket_client , websockets +, pytestCheckHook }: buildPythonPackage rec { pname = "python-engineio"; - version = "3.13.0"; + version = "3.13.2"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1fgfrgcvjg3fyza5lhl1l9cfq073xrwwhh3xs178csrjz4s8s378"; + sha256 = "1hn5nnxp7y2dpf52vrwdxza2sqmzj8admcnwgjkmcxk65s2dhvy1"; }; propagatedBuildInputs = [ @@ -34,15 +35,19 @@ buildPythonPackage rec { tornado websocket_client websockets + pytestCheckHook ]; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \ LD_PRELOAD=${libredirect}/lib/libredirect.so ''; postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + # somehow effective log level does not change? + disabledTests = [ "test_logger" ]; + meta = with stdenv.lib; { description = "Engine.IO server"; homepage = "https://github.com/miguelgrinberg/python-engineio/"; From b0a8c8af6fcddf8e088aff4e1ba105205e594fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 4 Sep 2020 15:59:40 +0200 Subject: [PATCH 305/499] python3.pkgs.python-language-server: 0.33.1 -> 0.34.1 --- .../python-modules/python-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index c223ccb89b8c..173d6f2a3d5e 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.33.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "064ck4ikrrrhq8wjpbs5k6hzkrjvfg91pd6351471xpsij0kj16f"; + sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU="; }; postPatch = '' From 12a9a93d68b1d0f905a176e406e26e4a2ea76b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Sep 2020 11:45:00 +0200 Subject: [PATCH 306/499] python3.pkgs.jedi: fix compatibility with parso The current version is fundamentally broken as tested with python-language-server because parso now uses Path instead of str in many instances. Backporting of the fixes is not trivial and likely breaks more stuff than it fixes due to other refactorings in jedi, hence using a recent commit in master seems more reasonably. --- .../python-modules/jedi/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 9ee4ae26622f..ab8f72ea9f18 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,24 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.17.2"; + # switch back to stable version on the next release. + # current stable is incompatible with parso + version = "2020-08-06"; - src = fetchPypi { - inherit pname version; - sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; + src = fetchFromGitHub { + owner = "davidhalter"; + repo = "jedi"; + rev = "216f976fd5cab7a460e5d287e853d11759251e52"; + sha256 = "1kb2ajzigadl95pnwglg8fxz9cvpg9hx30hqqj91jkgrc7djdldj"; + fetchSubmodules = true; }; checkInputs = [ pytest glibcLocales tox pytestcov ]; propagatedBuildInputs = [ parso ]; - # remove next bump, >=0.17.2, already fixed in master - prePatch = '' - substituteInPlace requirements.txt \ - --replace "parso>=0.7.0,<0.8.0" "parso" - ''; - checkPhase = '' LC_ALL="en_US.UTF-8" py.test test ''; From b99096b1f06c1658e0da837c02b82514d7f281ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Sep 2020 11:47:11 +0200 Subject: [PATCH 307/499] python3.pkgs.python-language-server: fix jedi integration recent jedi/parso versions uses Path instead of str. --- .../python-modules/python-language-server/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 173d6f2a3d5e..4558bc7edba4 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson , # Allow building a limited set of providers, e.g. ["pycodestyle"]. @@ -30,6 +30,14 @@ buildPythonPackage rec { sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU="; }; + patches = [ + # https://github.com/palantir/python-language-server/pull/851 + (fetchpatch { + url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch"; + sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5"; + }) + ]; + postPatch = '' # https://github.com/palantir/python-jsonrpc-server/issues/36 sed -i -e 's!ujson<=!ujson>=!' setup.py From 0e7f6a884b939823471cde875cf258a2aa2b3535 Mon Sep 17 00:00:00 2001 From: WORLDofPEACE Date: Tue, 8 Sep 2020 19:24:51 -0400 Subject: [PATCH 308/499] Update nixos/doc/manual/installation/installing.xml Co-authored-by: Jon --- nixos/doc/manual/installation/installing.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index e14b6fd07c7e..6df1d8303483 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -73,7 +73,7 @@ can use activated SSH daemon. You need to copy your ssh key to either /home/nixos/.ssh/authorized_keys or /root/.ssh/authorized_keys (Tip: For installers with a - modifiable filesystem such as the sd-card installer image a key can be be manually + modifiable filesystem such as the sd-card installer image a key can be manually placed by mounting the image on a different machine). Alternatively you must set a password for either root or nixos with passwd to be able to login. From 570dbab97567ce49e64f2cfdfc27fde781e28b71 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 9 Sep 2020 00:41:46 +0100 Subject: [PATCH 309/499] pythonPackages.jug: fix tests these seem to have switched to pytest tests in 2.0.2 --- pkgs/development/python-modules/jug/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 9b71a1515ad1..d55a5fad44b5 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch , nose, numpy , bottle, pyyaml, redis, six -, zlib }: +, zlib +, pytestCheckHook }: buildPythonPackage rec { pname = "Jug"; @@ -21,6 +22,9 @@ buildPythonPackage rec { sha256 = "859a4b4cb26a0010299b189c92cfba626852c97a38e22f3d1b56e4e1d8ad8620"; }; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jug" ]; + meta = with stdenv.lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; From d83080f370b52e8b86123a8b60f095b4270f30a9 Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Fri, 4 Sep 2020 13:42:02 +0100 Subject: [PATCH 310/499] maintainers: add tiagolobocastro --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ca08a3466e8..ce853b8b587b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8433,6 +8433,12 @@ githubId = 1391883; name = "Tom Hall"; }; + tiagolobocastro = { + email = "tiagolobocastro@gmail.com"; + github = "tiagolobocastro"; + githubId = 1618946; + name = "Tiago Castro"; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; From 4964392e487abd9db39a7043acf111496bbfea4f Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Fri, 4 Sep 2020 13:46:23 +0100 Subject: [PATCH 311/499] p3x-onenote: init at 2020.10.111 --- .../office/p3x-onenote/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/applications/office/p3x-onenote/default.nix diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix new file mode 100644 index 000000000000..55854be1020f --- /dev/null +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -0,0 +1,55 @@ +{ stdenv, appimageTools, desktop-file-utils, fetchurl }: + +let + version = "2020.10.111"; + name = "p3x-onenote-${version}"; + + plat = { + aarch64-linux = "-arm64"; + armv7l-linux = "-armv7l"; + i386-linux = "-i386"; + i686-linux = "-i386"; + x86_64-linux = ""; + }.${stdenv.hostPlatform.system}; + + sha256 = { + aarch64-linux = "0a3c0w1312l6k2jvn7cn8priibnh8wg0184zjcli29f9ds1afl5s"; + armv7l-linux = "172m2d94zzm8q61pvnjy01cl5fg11ad9hfh1han0gycnv3difniy"; + i386-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; + i686-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; + x86_64-linux = "0bn48r55l5dh8zcf8ijh3z6hlyp3s6fvfyqc1csvnslm63dfkzcq"; + }.${stdenv.hostPlatform.system}; + + src = fetchurl { + url = "https://github.com/patrikx3/onenote/releases/download/v${version}/P3X-OneNote-${version}${plat}.AppImage"; + inherit sha256; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in +appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mkdir -p $out/share/pixmaps $out/share/licenses/p3x-onenote + cp ${appimageContents}/p3x-onenote.png $out/share/pixmaps/ + cp ${appimageContents}/p3x-onenote.desktop $out + cp ${appimageContents}/LICENSE.electron.txt $out/share/licenses/p3x-onenote/LICENSE + mv $out/bin/${name} $out/bin/p3x-onenote + + ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value $out/bin/p3x-onenote \ + --set-key Comment --set-value "P3X OneNote Linux" \ + --delete-original $out/p3x-onenote.desktop + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/patrikx3/onenote"; + description = "Linux Electron Onenote - A Linux compatible version of OneNote"; + license = licenses.mit; + maintainers = with maintainers; [ tiagolobocastro ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 322c6a84fa92..b31a594d728d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6054,6 +6054,8 @@ in p2pvc = callPackage ../applications/video/p2pvc {}; + p3x-onenote = callPackage ../applications/office/p3x-onenote { }; + p7zip = callPackage ../tools/archivers/p7zip { }; packagekit = callPackage ../tools/package-management/packagekit { }; From ddea634e1abe66e1b67b7e339f1530039affd2d9 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:01 -0400 Subject: [PATCH 312/499] srht: 0.59.13 -> 0.64.0 --- pkgs/applications/version-management/sourcehut/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 0023eb407b3a..a95d7a19e045 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "srht"; - version = "0.59.13"; + version = "0.64.0"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "1rgndpr0w25mxg0d8x54lay82d0p01aygallsgr1lw5zs4r3ldz6"; + sha256 = "ubCbDh60zg88LXupWAo2EnqhE5jt0F0L9ikTBebusYQ="; }; node_modules = fetchNodeModules { From a9677e0f33f482852da227ec32cbecf5ffff8642 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:10 -0400 Subject: [PATCH 313/499] buildsrht: 0.56.13 -> 0.62.6 --- pkgs/applications/version-management/sourcehut/builds.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index d5a72a70ec6c..2f786be52674 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -4,7 +4,7 @@ , srht, redis, celery, pyyaml, markdown }: let - version = "0.56.13"; + version = "0.62.6"; buildWorker = src: buildGoModule { inherit src version; @@ -21,7 +21,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; rev = version; - sha256 = "0la9i93fxxphi4gf913ccjiqlfn92h3nbpl9gxcwcplm2vvi4nmq"; + sha256 = "1vSUcqYyOitfGaSZVOj5vkmoiAvQbTHgiDVSV5qJLyQ="; }; patches = [ From 2136408b68c72029faf25c9dd634548675d10e4a Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:14 -0400 Subject: [PATCH 314/499] dispatchsrht: 0.14.1 -> 0.14.9 --- pkgs/applications/version-management/sourcehut/dispatch.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index 1531a6e69b56..e8efa700bca6 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.14.1"; + version = "0.14.9"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; rev = version; - sha256 = "0h3nn73qvxspqv0myiss0y5i8jynh2rh9m57awy89vv6rwgai7vq"; + sha256 = "JUffuJTKY4I8CrJc8tJWL+CbJCZtiqtUSO9SgYoeux0="; }; patches = [ From 20eec4f075d6a61b2ff1092957a5169cfafbefd1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:20 -0400 Subject: [PATCH 315/499] gitsrht: 0.50.3 -> 0.60.7 --- pkgs/applications/version-management/sourcehut/git.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index d71568b94fd8..42ee67fbc1d7 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -4,7 +4,7 @@ , srht, minio, pygit2, scmsrht }: let - version = "0.50.3"; + version = "0.60.7"; buildShell = src: buildGoModule { inherit src version; @@ -48,7 +48,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; rev = version; - sha256 = "0rxsr8cizac5xv8bgx2s1p2q4n8i5s51p9qbqdjad9z1xmwi6rvn"; + sha256 = "EdxgT6IQZgj3KeU3UC+QAQb7BilBY769NhJK633tmE4="; }; patches = [ From 0ad7f89d8cb99134bac1f557c88aef7324511060 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:26 -0400 Subject: [PATCH 316/499] hgsrht: 0.26.0 -> 0.26.18 --- pkgs/applications/version-management/sourcehut/hg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index bddc065eacfd..3592a91f6a8a 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.26.0"; + version = "0.26.18"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "06sgd7pzjabwv66i4v5abqdnx955lqgjmbxxqkhhyq9k45jhlzci"; + sha256 = "j+7yG6WdWoU0Uk6doz9GpKZsEGXy/n2smgU6c56/A+Q="; }; patches = [ From 52a95e99966734460491ffbe3ef53c5f7554f812 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:31 -0400 Subject: [PATCH 317/499] listssrht: 0.41.8 -> 0.45.9 --- pkgs/applications/version-management/sourcehut/lists.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index b1446bbebc8a..1c8cbbbc75d8 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "listssrht"; - version = "0.41.8"; + version = "0.45.9"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; rev = version; - sha256 = "0x49i1fdgi4nawnl362hp4d9ki5phh221zr1lxhidjm9vfv7lsqs"; + sha256 = "2Wb1hBx4GuRvVC0pD7gpE9dj5ketW/4ozxuVq2X5dDM="; }; patches = [ From 68511199bbde7379f364664e29b79762d9154ca5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:35 -0400 Subject: [PATCH 318/499] mansrht: 0.14.7 -> 0.15.1 --- pkgs/applications/version-management/sourcehut/man.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 9b8e5901d9ef..2f0efc4480f1 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.14.7"; + version = "0.15.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; rev = version; - sha256 = "1ys9186lbxhbg5ms9sxjk3va5qwjrsd4nzrz6zx50gzng9axd988"; + sha256 = "hCpuVngpu2AacFGn0F78k2qrn09Z/p1rP8vfW7gkzWc="; }; patches = [ From 77f7c9b851b9c107645fb1523d5f0c9f77458ed5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:40 -0400 Subject: [PATCH 319/499] metasrht: 0.42.13 -> 0.50.2 --- pkgs/applications/version-management/sourcehut/meta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index e2d155e1a066..89d5d6fc9761 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "metasrht"; - version = "0.42.13"; + version = "0.50.2"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; - sha256 = "0bnrhk4w35w9dndihfqki66vyk123my98p4jqic4ypxcyffs1dd7"; + sha256 = "utS/HMFtHPAP1QRYd4WAFApyBPRY5UD72ANmC/SU93c="; }; nativeBuildInputs = srht.nativeBuildInputs; From f38d72aa8b28065c0264f76afc9a4c5cf8bc77c9 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:44 -0400 Subject: [PATCH 320/499] pastesrht: 0.10.3 -> 0.11.1 --- pkgs/applications/version-management/sourcehut/paste.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 26650156c5cd..4cbcafe432a8 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.10.3"; + version = "0.11.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; rev = version; - sha256 = "0sbs591ackrml09jmml4jspnbbqxqdmqy1c1j2rrvms6jcpkhlwb"; + sha256 = "vk+h9gQX9KeynjulDaK/vHpKeRQAjVyxk7ttKG27ZIo="; }; patches = [ From 93ec2aea280abd9630ba8c9cad01fef433ae19b2 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:49 -0400 Subject: [PATCH 321/499] todosrht: 0.57.14 -> 0.61.11 --- pkgs/applications/version-management/sourcehut/todo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 53cd8756ad3b..959b259d9254 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.57.14"; + version = "0.61.11"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; rev = version; - sha256 = "15x78rl0zh1rw0izc36k47b27l75k7iyina5ajm3mgkslpndym4y"; + sha256 = "lUM81FYlR6AXCtXZtYiB+1FD8E1aOX7qxbWUVc36lJM="; }; patches = [ From 151911db03fc4611eeba669a79d341eefa290820 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 19:50:54 -0400 Subject: [PATCH 322/499] scmsrht: 0.19.11 -> 0.22.3 --- pkgs/applications/version-management/sourcehut/scm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 788c90e4872a..7c6ed02c9ffc 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.19.11"; + version = "0.22.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; rev = version; - sha256 = "0wqqqfp8f0gq0jqz3ac6kfkax2bw7yp8wznvsdw8mpmzqdjlhhkb"; + sha256 = "MwgWDYGqOuci55gUFAiKnUfUWgLvQVP5omAMNv/2gPY="; }; nativeBuildInputs = srht.nativeBuildInputs; From 222a7a3a7ae07335dc0ef21dff62de8f99201f9b Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:05:34 -0400 Subject: [PATCH 323/499] sourcehut.hubsrht: init at 0.10.6 --- .../version-management/sourcehut/default.nix | 2 ++ .../version-management/sourcehut/hub.nix | 31 +++++++++++++++++++ .../version-management/sourcehut/update.sh | 4 +-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/sourcehut/hub.nix diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index f6de0036afe0..9d34eabd8865 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -16,6 +16,7 @@ let dispatchsrht = self.callPackage ./dispatch.nix { }; gitsrht = self.callPackage ./git.nix { }; hgsrht = self.callPackage ./hg.nix { }; + hubsrht = self.callPackage ./hub.nix { }; listssrht = self.callPackage ./lists.nix { }; mansrht = self.callPackage ./man.nix { }; metasrht = self.callPackage ./meta.nix { }; @@ -31,6 +32,7 @@ in with python.pkgs; recurseIntoAttrs { dispatchsrht = toPythonApplication dispatchsrht; gitsrht = toPythonApplication gitsrht; hgsrht = toPythonApplication hgsrht; + hubsrht = toPythonApplication hubsrht; listssrht = toPythonApplication listssrht; mansrht = toPythonApplication mansrht; metasrht = toPythonApplication metasrht; diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix new file mode 100644 index 000000000000..0b671940ec05 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, buildPythonPackage +, python +, srht }: + +buildPythonPackage rec { + pname = "hubsrht"; + version = "0.10.6"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; + rev = version; + sha256 = "N54GOk9pxwoF1Wv0ZSe4kIAPBLl/zHrSu8OlKBkacVg="; + }; + + nativeBuildInputs = srht.nativeBuildInputs; + + propagatedBuildInputs = [ + srht + ]; + + preBuild = '' + export PKGVER=${version} + ''; + + meta = with stdenv.lib; { + homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; + description = "Project hub service for the sr.ht network"; + license = licenses.agpl3; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index fdc0639c4c6e..156d4cc35e44 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -40,8 +40,8 @@ update_version() { git commit -m "$1: $version_old -> $version" } -services=( "srht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "listssrht" "mansrht" "metasrht" - "pastesrht" "todosrht" "scmsrht" ) +services=( "srht" "buildsrht" "dispatchsrht" "gitsrht" "hgsrht" "hubsrht" "listssrht" "mansrht" + "metasrht" "pastesrht" "todosrht" "scmsrht" ) # Whether or not a specific service is requested if [ -n "$1" ]; then From 42f17611a13f57299cb69afd75c05585bf6430d2 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:08:08 -0400 Subject: [PATCH 324/499] sourcehut.*: remove SRHT_PATH patch --- .../version-management/sourcehut/builds.nix | 5 --- .../version-management/sourcehut/dispatch.nix | 5 --- .../version-management/sourcehut/git.nix | 5 --- .../version-management/sourcehut/hg.nix | 5 --- .../version-management/sourcehut/lists.nix | 5 --- .../version-management/sourcehut/man.nix | 5 --- .../version-management/sourcehut/meta.nix | 5 --- .../version-management/sourcehut/paste.nix | 5 --- .../version-management/sourcehut/todo.nix | 5 --- .../sourcehut/use-srht-path.patch | 43 ------------------- 10 files changed, 88 deletions(-) delete mode 100644 pkgs/applications/version-management/sourcehut/use-srht-path.patch diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 2f786be52674..8fd52d0a906a 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -24,10 +24,6 @@ in buildPythonPackage rec { sha256 = "1vSUcqYyOitfGaSZVOj5vkmoiAvQbTHgiDVSV5qJLyQ="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -40,7 +36,6 @@ in buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index e8efa700bca6..fa557ce78aa2 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "JUffuJTKY4I8CrJc8tJWL+CbJCZtiqtUSO9SgYoeux0="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -26,7 +22,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 42ee67fbc1d7..08a099f9eb8a 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -51,10 +51,6 @@ in buildPythonPackage rec { sha256 = "EdxgT6IQZgj3KeU3UC+QAQb7BilBY769NhJK633tmE4="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -66,7 +62,6 @@ in buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 3592a91f6a8a..841cec581a57 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "j+7yG6WdWoU0Uk6doz9GpKZsEGXy/n2smgU6c56/A+Q="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -27,7 +23,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 1c8cbbbc75d8..7037688f92ef 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "2Wb1hBx4GuRvVC0pD7gpE9dj5ketW/4ozxuVq2X5dDM="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -28,7 +24,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 2f0efc4480f1..7fdf42a52e73 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "hCpuVngpu2AacFGn0F78k2qrn09Z/p1rP8vfW7gkzWc="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -25,7 +21,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 89d5d6fc9761..26e8ec8d3ee8 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -29,13 +29,8 @@ buildPythonPackage rec { weasyprint ]; - patches = [ - ./use-srht-path.patch - ]; - preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 4cbcafe432a8..15d9839ea37d 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "vk+h9gQX9KeynjulDaK/vHpKeRQAjVyxk7ttKG27ZIo="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -25,7 +21,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 959b259d9254..7eaa6776560a 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -13,10 +13,6 @@ buildPythonPackage rec { sha256 = "lUM81FYlR6AXCtXZtYiB+1FD8E1aOX7qxbWUVc36lJM="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -28,7 +24,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; # pytest tests fail diff --git a/pkgs/applications/version-management/sourcehut/use-srht-path.patch b/pkgs/applications/version-management/sourcehut/use-srht-path.patch deleted file mode 100644 index 43b494bf9d21..000000000000 --- a/pkgs/applications/version-management/sourcehut/use-srht-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/setup.py b/setup.py -index e6ecfb6..89fa92a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,28 +5,16 @@ import os - import site - import sys - --if hasattr(site, 'getsitepackages'): -- pkg_dirs = site.getsitepackages() -- if site.getusersitepackages(): -- pkg_dirs.append(site.getusersitepackages()) -- for pkg_dir in pkg_dirs: -- srht_path = os.path.join(pkg_dir, "srht") -- if os.path.isdir(srht_path): -- break -- else: -- raise Exception("Can't find core srht module in your site packages " -- "directories. Please install it first.") --else: -- srht_path = os.getenv("SRHT_PATH") -- if not srht_path: -- raise Exception("You're running inside a virtual environment. " -- "Due to virtualenv limitations, you need to set the " -- "$SRHT_PATH environment variable to the path of the " -- "core srht module.") -- elif not os.path.isdir(srht_path): -- raise Exception( -- "The $SRHT_PATH environment variable points to an invalid " -- "directory: {}".format(srht_path)) -+srht_path = os.getenv("SRHT_PATH") -+if not srht_path: -+ raise Exception("You're running inside a virtual environment. " -+ "Due to virtualenv limitations, you need to set the " -+ "$SRHT_PATH environment variable to the path of the " -+ "core srht module.") -+elif not os.path.isdir(srht_path): -+ raise Exception( -+ "The $SRHT_PATH environment variable points to an invalid " -+ "directory: {}".format(srht_path)) - - subp = subprocess.run(["make", "SRHT_PATH=" + srht_path]) - if subp.returncode != 0: From 5e9feb2427cd9d1f262f8d6e4263a1e68a723cb6 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:08:49 -0400 Subject: [PATCH 325/499] sourcehut.buildsrht: fix build --- pkgs/applications/version-management/sourcehut/builds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 8fd52d0a906a..29fcbc5100de 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -10,7 +10,7 @@ let inherit src version; pname = "builds-sr-ht-worker"; - vendorSha256 = "0prdlihcy5yz760llwyby747yy2981dn3gy401a48df7ndlfj6lp"; + vendorSha256 = "1sbcjp93gb0c4p7dd1gjhmhwr1pygxvrrzp954j2fvxvi38w6571"; doCheck = false; }; From 3fd4e765d02675da1f0351a1279fa9964a04677d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:08:54 -0400 Subject: [PATCH 326/499] sourcehut.gitsrht: fix build --- pkgs/applications/version-management/sourcehut/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 08a099f9eb8a..281186f50dcb 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -28,7 +28,7 @@ let inherit src version; pname = "gitsrht-keys"; - vendorSha256 = "16j7kpar318s4766pln8xn6d51xqblwig5n1jywhj0sl80qjl5cv"; + vendorSha256 = "08g3cvxq2zkdqbbb9r9rvdg23fs7hn5zqf7fzhr792f6mshdm5v2"; doCheck = false; }; From 8518ef168746b329187e1bd347c74b4ef0da4f9d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:18:41 -0400 Subject: [PATCH 327/499] sourcehut.gitsrht: include api module --- .../version-management/sourcehut/git.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 281186f50dcb..985edf33be9a 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -41,9 +41,18 @@ let doCheck = false; }; + + buildAPI = src: buildGoModule { + inherit src version; + pname = "gitsrht-api"; + + vendorSha256 = "1drrs3wrvhw8lp0877zkbx8gnbxly3fsqynww9vplajkx62z5m3a"; + + doCheck = false; + }; in buildPythonPackage rec { - inherit version; pname = "gitsrht"; + inherit version; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; @@ -70,6 +79,7 @@ in buildPythonPackage rec { cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook + cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api ''; meta = with stdenv.lib; { From 83be8b43dbd7b89846ab6c0b67811d605f983bbb Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:18:52 -0400 Subject: [PATCH 328/499] sourcehut.metasrht: include api module --- .../version-management/sourcehut/meta.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 26e8ec8d3ee8..5ba367223fb0 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,12 +1,24 @@ { stdenv, fetchgit, buildPythonPackage , python +, buildGoModule , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , sshpubkeys, weasyprint }: -buildPythonPackage rec { - pname = "metasrht"; +let version = "0.50.2"; + buildAPI = src: buildGoModule { + inherit src version; + pname = "metasrht-api"; + + vendorSha256 = "0k7i7j604wqvzjavmcsw7g2x059jkkgrgz1qyvzlqc0y4ws59xkq"; + + doCheck = false; + }; +in buildPythonPackage rec { + pname = "metasrht"; + inherit version; + src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; @@ -33,6 +45,11 @@ buildPythonPackage rec { export PKGVER=${version} ''; + postInstall = '' + mkdir -p $out/bin + cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api + ''; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; From c75cd827dfef1b05ec2f64a19536667eebcfa969 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 17:59:40 -0400 Subject: [PATCH 329/499] sourcehut.buildsrht: check buildGoModule --- pkgs/applications/version-management/sourcehut/builds.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 29fcbc5100de..76103eba8af5 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -11,8 +11,6 @@ let pname = "builds-sr-ht-worker"; vendorSha256 = "1sbcjp93gb0c4p7dd1gjhmhwr1pygxvrrzp954j2fvxvi38w6571"; - - doCheck = false; }; in buildPythonPackage rec { inherit version; From 00e0bdf938e131cfadefa7193b384d03a489dd60 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 17:59:47 -0400 Subject: [PATCH 330/499] sourcehut.gitsrht: check buildGoModule --- pkgs/applications/version-management/sourcehut/git.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 985edf33be9a..fad664db238f 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -11,8 +11,6 @@ let pname = "gitsrht-shell"; vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; - - doCheck = false; }; buildDispatcher = src: buildGoModule { @@ -20,8 +18,6 @@ let pname = "gitsrht-dispatcher"; vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; - - doCheck = false; }; buildKeys = src: buildGoModule { @@ -29,8 +25,6 @@ let pname = "gitsrht-keys"; vendorSha256 = "08g3cvxq2zkdqbbb9r9rvdg23fs7hn5zqf7fzhr792f6mshdm5v2"; - - doCheck = false; }; buildUpdateHook = src: buildGoModule { @@ -38,8 +32,6 @@ let pname = "gitsrht-update-hook"; vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; - - doCheck = false; }; buildAPI = src: buildGoModule { @@ -47,8 +39,6 @@ let pname = "gitsrht-api"; vendorSha256 = "1drrs3wrvhw8lp0877zkbx8gnbxly3fsqynww9vplajkx62z5m3a"; - - doCheck = false; }; in buildPythonPackage rec { pname = "gitsrht"; From e616754232e15a94b5b3156d26d23419fe5cb907 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 18:01:22 -0400 Subject: [PATCH 331/499] sourcehut.metasrht: check buildGoModule --- pkgs/applications/version-management/sourcehut/meta.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 5ba367223fb0..9d2f71eaebeb 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -12,8 +12,6 @@ let pname = "metasrht-api"; vendorSha256 = "0k7i7j604wqvzjavmcsw7g2x059jkkgrgz1qyvzlqc0y4ws59xkq"; - - doCheck = false; }; in buildPythonPackage rec { pname = "metasrht"; From db5c7cc5ee03d68c9acb604cc5ef5c2aca09cb56 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 19:16:01 -0400 Subject: [PATCH 332/499] sourcehut.gitsrht: fix build --- .../version-management/sourcehut/git.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index fad664db238f..838a997031c0 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -9,36 +9,31 @@ let buildShell = src: buildGoModule { inherit src version; pname = "gitsrht-shell"; - - vendorSha256 = "1zvbqn4r940mibn4h1cqz94gbr476scm281ps361n0rfqlimw8g5"; + vendorSha256 = "1abyv2s5l3bs0iylpgyj3jri2hh1iy8fiadxm7g6l2vl58h0b9ba"; }; buildDispatcher = src: buildGoModule { inherit src version; pname = "gitsrht-dispatcher"; - vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; }; buildKeys = src: buildGoModule { inherit src version; pname = "gitsrht-keys"; - - vendorSha256 = "08g3cvxq2zkdqbbb9r9rvdg23fs7hn5zqf7fzhr792f6mshdm5v2"; + vendorSha256 = "0lks3js57bb41x1ry5xfadlzf0v2gm68g7h3j94gzlm6j4jfprk9"; }; buildUpdateHook = src: buildGoModule { inherit src version; pname = "gitsrht-update-hook"; - - vendorSha256 = "1rmv3p60g6w4h4v9wx99jkyx0q02snslyjrjy9n1flardjs01b63"; + vendorSha256 = "06ykh9ncamd922xsd329jpn293wsq6vkqnlf3sckjlp2hm290pd8"; }; buildAPI = src: buildGoModule { inherit src version; pname = "gitsrht-api"; - - vendorSha256 = "1drrs3wrvhw8lp0877zkbx8gnbxly3fsqynww9vplajkx62z5m3a"; + vendorSha256 = "0d6kmsbsgj2q5nddx4w675zbsiarffj9vqplwvqk7dwz4id2wnif"; }; in buildPythonPackage rec { pname = "gitsrht"; From 496cbef3d1053029a9a82b85f430b1b8ebf6614b Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 19:20:30 -0400 Subject: [PATCH 333/499] sourcehut: python37 -> python38 --- pkgs/applications/version-management/sourcehut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 9d34eabd8865..8d2e8ceed335 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,4 +1,4 @@ -{ python37, openssl +{ python38, openssl , callPackage, recurseIntoAttrs }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -8,7 +8,7 @@ let fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python37.override { + python = python38.override { packageOverrides = self: super: { srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; From 0f5c7d2bfb6620faacf298ac10716663147ee30c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 19:27:24 -0400 Subject: [PATCH 334/499] python3Packages.mistletoe: init at 0.7.2 --- .../python-modules/mistletoe/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/mistletoe/default.nix diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix new file mode 100644 index 000000000000..29666254e7f0 --- /dev/null +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -0,0 +1,22 @@ +{ lib +, isPy3k +, fetchPypi +, buildPythonPackage }: + +buildPythonPackage rec { + pname = "mistletoe"; + version = "0.7.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "18z6hqfnfjqnrcgfgl5pkj9ggf9yx0yyy94azcn1qf7hqn6g3l14"; + }; + + meta = with lib; { + description = "A fast, extensible Markdown parser in pure Python."; + homepage = "https://github.com/miyuchina/mistletoe"; + license = licenses.mit; + maintainers = with maintainers; [ eadwu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab7000c47166..71723b1b2d87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3655,6 +3655,8 @@ in { misaka = callPackage ../development/python-modules/misaka { }; + mistletoe = callPackage ../development/python-modules/mistletoe { }; + mistune = callPackage ../development/python-modules/mistune { }; mitmproxy = callPackage ../development/python-modules/mitmproxy { }; From 84066b0a4f1bba919fa24a6036168c41d1175a31 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 5 Sep 2020 19:27:47 -0400 Subject: [PATCH 335/499] sourcehut.srht: misaka -> mistletoe Upstream uses mistletoe now [1] [1] https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds/commit/773c3e94eb29c23ae30727b280272719e9cc9840 --- pkgs/applications/version-management/sourcehut/core.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index a95d7a19e045..9f7b4b158c25 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, misaka, humanize, html5lib, markdown, psycopg2, pygments +, pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client -, celery, alembic, importlib-metadata +, celery, alembic, importlib-metadata, mistletoe , sassc, nodejs , writeText }: @@ -34,13 +34,13 @@ buildPythonPackage rec { pgpy flask bleach - misaka humanize html5lib markdown psycopg2 pygments requests + mistletoe sqlalchemy cryptography beautifulsoup4 From b169bfc9e2c981a46680c53343258d90be6f6d9f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:45:34 -0400 Subject: [PATCH 336/499] python3Packages.tinycss2: fix build --- pkgs/development/python-modules/tinycss2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 6f4eb927f3ad..35c0f76b0843 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + # https://github.com/PyCQA/pycodestyle/issues/598 + preCheck = '' + printf "[flake8]\nignore=W504,E741,E126" >> setup.cfg + ''; + meta = with lib; { description = "Low-level CSS parser for Python"; homepage = "https://github.com/Kozea/tinycss2"; From ff7e38b9542a4c6efbc7a935149397c06dfac474 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Sep 2020 17:18:25 -0700 Subject: [PATCH 337/499] python3Packages.xdis: 4.2.4 -> 5.0.4, fix build --- pkgs/development/python-modules/xdis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index b4c8e46f146d..27f3c1af202d 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.2.4"; + version = "5.0.4"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0nq6ijmj48c2dk75vmb040wgvr4y7wyjxrcm2dyvcwfk2h6phwri"; + sha256 = "0hh5pam8dabvh0w1bks0rqfq85gjy3h6ljrzmjg0nqsaapp1g4dd"; }; checkInputs = [ pytest ]; From 494cdb03319be81cf6746e28e54b5fb97bb51414 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Sep 2020 04:20:00 +0000 Subject: [PATCH 338/499] cointop: 1.4.6 -> 1.5.4 --- pkgs/applications/misc/cointop/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 8d91531dd1f8..a74a3962996b 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -2,17 +2,19 @@ buildGoPackage rec { pname = "cointop"; - version = "1.4.6"; + version = "1.5.4"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; - rev = version; - sha256 = "1mkb97x73vzxnbvhnxx3msicr1z0b3sjmydx257ax3nscrmf1l5z"; + rev = "v${version}"; + sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b"; }; goPackagePath = "github.com/miguelmota/cointop"; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cointop.version=${version}" ]; + meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; longDescription = '' From 607b0ae7aeb28227b8941c9a565ac20b0d38f6d5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 2 Sep 2020 09:38:29 +0200 Subject: [PATCH 339/499] coqPackages.coqprime: init at 8.12 for Coq 8.12 --- pkgs/development/coq-modules/coqprime/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 0ead97ffbf0f..f16341ddbd1b 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -20,6 +20,10 @@ let "8.9" = v_8_8; "8.10" = v_8_10; "8.11" = v_8_10; + "8.12" = { + version = "8.12"; + sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj"; + }; }; param = params.${coq.coq-version}; in From e5701710e381d3b2de21bf968051bbeca7c831bb Mon Sep 17 00:00:00 2001 From: Anton Arapov Date: Thu, 27 Aug 2020 18:13:35 +0200 Subject: [PATCH 340/499] nodePackages.node-red: fix build resolves issue #89205 Signed-off-by: Anton Arapov --- pkgs/development/node-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 61581e1a430a..faebe18e3103 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -103,7 +103,7 @@ let }; node-red = super.node-red.override { - meta.broken = since "10"; + buildInputs = [ self.node-pre-gyp ]; }; pnpm = super.pnpm.override { From 307720cf716e2cd1c5a0a60b13e102f2763e9fa4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 09:56:27 +0300 Subject: [PATCH 341/499] bmap-tools: Don't test, as tests fail on hydra e.g: https://hydra.nixos.org/build/126796743/nixlog/1/tail --- pkgs/tools/misc/bmap-tools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index 8273d60bd596..afb41d8b6ea9 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -11,6 +11,9 @@ python2Packages.buildPythonApplication rec { sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q"; }; + # tests fail only on hydra. + doCheck = false; + meta = with stdenv.lib; { description = "bmap-related tools"; homepage = "https://github.com/intel/bmap-tools"; From 09d00b5b98be0ffaf53d887ed44ee7414be70839 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 10:05:04 +0300 Subject: [PATCH 342/499] all-packages.nix: Remove trailing space --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b31a594d728d..77c8fa569928 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24024,7 +24024,7 @@ in xautomation = callPackage ../tools/X11/xautomation { }; xawtv = callPackage ../applications/video/xawtv { }; - + xbattbar = callPackage ../applications/misc/xbattbar { }; xbindkeys = callPackage ../tools/X11/xbindkeys { }; From ad48050cadd58e45c6d065601474a3a9d98f863c Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 22 Aug 2020 15:00:31 +0200 Subject: [PATCH 343/499] nixos/jellyfin: document stateVersion 20.09 in release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c5863f3219ea..e8d672836bd5 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -805,6 +805,16 @@ CREATE ROLE postgres LOGIN SUPERUSER; New option has been added. + + + The jellyfin module will use and stay on the Jellyfin version 10.5.5 + if stateVersion is lower than 20.09. This is because significant changes were made to the database schema, + and it is highly recommended to backup your instance before upgrading. After making your backup, you can upgrade to the latest version either by + setting your stateVersion to 20.09 or higher, or set the to + pkgs.jellyfin. If you do not wish to upgrade Jellyfin, but want to change your stateVersion, you can set + the value of to pkgs.jellyfin_10_5. + + From 339f6248f6408d9c303c998ccc1f40e99e247cf4 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 9 Sep 2020 00:42:50 -0700 Subject: [PATCH 344/499] verilog: unstable-2019-08-01 -> unstable-2020-08-24 The build would previously fail due to a change in bison's behavior (see https://github.com/steveicarus/iverilog/commit/5b699c1be73e789831db01e779a41478c0c62309 for more information). Updating to a more recent version fixes this issue. --- pkgs/applications/science/electronics/verilog/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index fa1efe299829..082d44ddc6e0 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "iverilog"; - version = "unstable-2019-08-01"; + version = "unstable-2020-08-24"; src = fetchFromGitHub { - owner = "steveicarus"; + owner = "steveicarus"; repo = pname; - rev = "c383d2048c0bd15f5db083f14736400546fb6215"; - sha256 = "1zs0gyhws0qa315magz3w5m45v97knczdgbf2zn4d7bdb7cv417c"; + rev = "d8556e4c86e1465b68bdc8d5ba2056ba95a42dfd"; + sha256 = "sha256-sT9j/0Q2FD5MOGpH/quMGvAuM7t7QavRHKD9lX7Elfs="; }; enableParallelBuilding = true; From b4496d4095b2defbc257fc1d26dafbf05291b768 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 9 Sep 2020 09:54:03 +0200 Subject: [PATCH 345/499] maintainers/build: skip packages without meta Some packages do not have a meta attribute, and made the script crash. --- maintainers/scripts/build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix index c70993cf138c..9b2bf00c803a 100644 --- a/maintainers/scripts/build.nix +++ b/maintainers/scripts/build.nix @@ -30,7 +30,7 @@ in packagesWith (name: pkg: ( - if builtins.hasAttr "maintainers" pkg.meta + if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta then ( if builtins.isList pkg.meta.maintainers then builtins.elem maintainer_ pkg.meta.maintainers From 8eeb52625577e9e62cb50ae689773ff6361160cb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Sep 2020 09:51:37 +0300 Subject: [PATCH 346/499] arora: Remove It's last release was 10 years ago, and it won't build since a long time now, due to webkit unfound for qt4. --- .../networking/browsers/arora/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/arora/default.nix diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix deleted file mode 100644 index 88ad2c609bfa..000000000000 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "arora"; - version = "0.11.0"; - - src = fetchFromGitHub { - owner = "Arora"; - repo = "arora"; - rev = version; - sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c"; - }; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - platforms = qt4.meta.platforms; - maintainers = [ maintainers.phreedom ]; - description = "A cross-platform Qt4 Webkit browser"; - homepage = "https://github.com/Arora/arora"; - license = with licenses; [ gpl2 gpl3 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b96bcd40c791..a9832c6841ee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -44,6 +44,7 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 + arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c8fa569928..510fa3033399 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19494,8 +19494,6 @@ in arion = callPackage ../applications/virtualization/arion { }; - arora = callPackage ../applications/networking/browsers/arora { }; - asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; From a9c78519d61e6e26246f7e2c616681a8d04f2ed1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Sep 2020 09:53:35 +0200 Subject: [PATCH 347/499] chromium: 85.0.4183.83 -> 85.0.4183.102 https://chromereleases.googleblog.com/2020/09/stable-channel-update-for-desktop.html This update includes 5 security fixes. CVEs: CVE-2020-6573 CVE-2020-6574 CVE-2020-6575 CVE-2020-6576 CVE-2020-15959 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6365a4eafd62..76c384114a9e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,4 +1,9 @@ { + "stable": { + "version": "85.0.4183.102", + "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", + "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + }, "beta": { "version": "86.0.4240.22", "sha256": "1qxacdwknrjwfp44mnqmq24n8sw4yaf0d1qnz39km2m4apc39svp", @@ -8,10 +13,5 @@ "version": "86.0.4240.8", "sha256": "1x0kbc7xp6599jyn461mbmchbixivnxm0jsyfq0snhxz8x81z55q", "sha256bin64": "0y7drzxxfn0vmfq0m426l8xvkgyajb8pjydi0d7kzk6i92sjf45j" - }, - "stable": { - "version": "85.0.4183.83", - "sha256": "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10", - "sha256bin64": "0fa3la2nvqr0w40j2qkbwnh36924fsp2ajsla6aky6hz08mq2q1g" } } From 8d9fadd3e0869d27a38890e6acd49eb2be08fd05 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 31 Aug 2020 22:03:54 +0200 Subject: [PATCH 348/499] electron_10: init at 10.1.1 --- pkgs/development/tools/electron/default.nix | 8 ++++++++ pkgs/development/tools/electron/generic.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 14f9c209537d..87cc59578289 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -59,4 +59,12 @@ in armv7l-linux = "cc098caebbed5022f26d12f9b5dc316a35dbae0bcf62b9fc72c3b385f93a32d5"; aarch64-linux = "ee39854d8e9ee06e9b94c457a52b0556f570316bbd755d7022e3eade4b5974d5"; }; + + electron_10 = mkElectron "10.1.1" { + x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220"; + x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991"; + i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57"; + armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34"; + aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c"; + }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 92dd72533aef..f24358676dd7 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -10,7 +10,7 @@ let license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; - knownVulnerabilities = optional (version < "6") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "6.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -34,7 +34,7 @@ let src = fetcher version (get tags platform) (get hashes platform); }; - electronLibPath = stdenv.lib.makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ stdenv.lib.optionals (version > "9") [ libdrm mesa ]); + electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); linux = { buildInputs = [ glib gtk3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8de40a13e73..06c506341e76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10444,8 +10444,8 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; - electron = electron_9; + electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; + electron = electron_10; autobuild = callPackage ../development/tools/misc/autobuild { }; From b7f0533d2a0959ccfaff5b877627cdae271bef43 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 31 Aug 2020 22:04:33 +0200 Subject: [PATCH 349/499] electron_9: 9.0.2 -> 9.3.0 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 87cc59578289..440ee882d8a5 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -52,12 +52,12 @@ in aarch64-linux = "1b9cd3ed7eb53ed914ac04c82d736c2677af807e553c87f0698890c2a3dcfd57"; }; - electron_9 = mkElectron "9.0.2" { - x86_64-linux = "08326f505692010d6c92f444a25f450cf19323cd98c5d94cab1057e80601caa1"; - x86_64-darwin = "8ab5b48f873582a9231bc85b0f73d9735fabca51364b8c505da8f8238d658da5"; - i686-linux = "2e950e4ab91453f7611fcfedbe90eff844677dbcc7df87a6fe0889bd3d82daaa"; - armv7l-linux = "cc098caebbed5022f26d12f9b5dc316a35dbae0bcf62b9fc72c3b385f93a32d5"; - aarch64-linux = "ee39854d8e9ee06e9b94c457a52b0556f570316bbd755d7022e3eade4b5974d5"; + electron_9 = mkElectron "9.3.0" { + x86_64-linux = "0c34fa1dbf7708bd4a3f08fde50eafb9903b1c467104dca3e3ced5e7f764b302"; + x86_64-darwin = "25057470c2f3a1c40fa1c25086256041fa70419378fa3d41eeb805ebd3919b20"; + i686-linux = "ea09d10e496450d2d7bb7a37cab7124cc5484117dd7d7d6c4106586ff675d1d5"; + armv7l-linux = "a8b46d6c98546d605a02850c906408dc11104e8ee4366c3d8a956896fafdfcd3"; + aarch64-linux = "791d898d02e45975657ed15f2d83af31d5688e7db0075a6e20021db3420eb320"; }; electron_10 = mkElectron "10.1.1" { From 4599eb4595491ecd36e9197a604113afab1bb91e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 31 Aug 2020 22:05:03 +0200 Subject: [PATCH 350/499] electron_8: 8.3.1 -> 8.5.1 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 440ee882d8a5..e06f15ab1005 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -44,12 +44,12 @@ in aarch64-linux = "f32376ca85c9017b7ab399e58fa176d882baacb048dd69d816831f8dde9054bb"; }; - electron_8 = mkElectron "8.3.1" { - x86_64-linux = "d5ad2bd32f7bf88f869a401017b35be0ea71e6fc7798fe2397b21602573e2639"; - x86_64-darwin = "abe864d9e6327d499120f328e699f4819110d4245bce2f92b84e19d8cdc1c771"; - i686-linux = "e75692c062b15c7f664cf3ff30832a526f3f66080469f7f93befaa4e0860c011"; - armv7l-linux = "cfa0a14225b617492a311c21ad973f24708bc4013a992271368006cdb12ed488"; - aarch64-linux = "1b9cd3ed7eb53ed914ac04c82d736c2677af807e553c87f0698890c2a3dcfd57"; + electron_8 = mkElectron "8.5.1" { + x86_64-linux = "e58bf26ba52e43de77115b6e6844eba8a8cec2ac8aae500cf48fe862014202d9"; + x86_64-darwin = "cf0d42ecde7ca374ddf1b440aaaf441e16a02890112fcbffc03f37f8ec3b1958"; + i686-linux = "4c7ff6225b1ac4b710c454072d9fb8c04a66bb0353e7d6cffb89bcf6d4458d81"; + armv7l-linux = "13afd8b2e36eb8d1582687e16fac5394d6d3b9734d73f94d0d6ef843ba14cec2"; + aarch64-linux = "ff39e5e0e644cbf4ff1d29fc25e94b9eced7ea45d787d1b86fa4e50513336b7b"; }; electron_9 = mkElectron "9.3.0" { From 6954f778452e5a05224eec396626893b02d6a6e7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 31 Aug 2020 22:05:38 +0200 Subject: [PATCH 351/499] electron_7: 7.3.1 -> 7.3.3 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e06f15ab1005..560cd878d797 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -36,12 +36,12 @@ in aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; }; - electron_7 = mkElectron "7.3.1" { - x86_64-linux = "66f37aadf65c0274cc6e46b09e52c38b2c8c5b2d6bbf1cd8196cd69b9f9ab737"; - x86_64-darwin = "351b30cab32539752ce5f9b53d2345352df922d57a152643c4eeb636a8941d23"; - i686-linux = "f80b8a684da13736d7614ca4ad5704812d12537111cb45010e5f42e7e4403554"; - armv7l-linux = "ef054696f4138e261b1310522d57bbdc5336e34488b3e273a8a794f8c26509c7"; - aarch64-linux = "f32376ca85c9017b7ab399e58fa176d882baacb048dd69d816831f8dde9054bb"; + electron_7 = mkElectron "7.3.3" { + x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; + x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; + i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; + armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; + aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; }; electron_8 = mkElectron "8.5.1" { From 504750252a66ed88c23883c72a1568eb436773c6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 1 Sep 2020 11:13:55 -0400 Subject: [PATCH 352/499] electron: move definition into generic.nix --- pkgs/development/tools/electron/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 560cd878d797..c9df28e5cded 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -3,7 +3,10 @@ let mkElectron = import ./generic.nix args; in -{ +rec { + + electron = electron_10; + electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; x86_64-darwin = "1vvjm4jifzjqvbs2kjlwg1h9p2czr2b5imjr9hld1j8nyfrzb0dx"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06c506341e76..50772641e74e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10444,8 +10444,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; - electron = electron_10; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; autobuild = callPackage ../development/tools/misc/autobuild { }; From 1c10ce66c5a19c766f0da7a8ee43ea4b8d60662f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 1 Sep 2020 17:20:39 +0200 Subject: [PATCH 353/499] 1password-gui: move required electron version to package definition --- pkgs/tools/security/1password-gui/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 91052f945ede..b8ecf45c6295 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -2,10 +2,15 @@ , fetchurl , appimageTools , makeWrapper -, electron +, electron_9 , openssl }: +let + electron = electron_9; + +in + stdenv.mkDerivation rec { pname = "1password"; version = "0.8.4"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50772641e74e..e387d52e03af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,9 +553,7 @@ in _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../tools/security/1password-gui { - electron = electron_9; - }; + _1password-gui = callPackage ../tools/security/1password-gui { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; From 3c45610ddd7009f535e3ddbf4fe4a6a4a0226f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Sep 2020 08:10:16 +0200 Subject: [PATCH 354/499] knot-resolver: 5.1.2 -> 5.1.3 https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.1.3 --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 3466fb776f00..9f54d2f5fa30 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836"; + sha256 = "20cd829027e39a9f7d993894e3640e886825b492d9ac1a744ac5616cc101458b"; }; outputs = [ "out" "dev" ]; From d70480f30e36c1dc040c3acc51a8166f61ced40e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 9 Sep 2020 17:22:17 +0800 Subject: [PATCH 355/499] libfilezilla: 0.24.0 -> 0.24.1 --- pkgs/development/libraries/libfilezilla/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 5edcb7e410fd..455d42e30502 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl - +, autoreconfHook , gettext , gnutls , nettle @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.24.0"; + version = "0.24.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1372i9f501kn8p1vkqdydaqvvi6lzxsnw2yzyxx5j4syqd4p0qa5"; + sha256 = "sha256-/dW07hkWr3sdQC591GfwXfdiS7ZfuVoIdaA3EuzC1v0="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gettext gnutls nettle ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; From a9683dc333dcf570103d4a2138da8bda4b6a91a7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 9 Sep 2020 17:22:30 +0800 Subject: [PATCH 356/499] filezilla: 3.49.1 -> 3.50.0 --- pkgs/applications/networking/ftp/filezilla/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 7d07c7acbe42..0cb0d17cc5a2 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, autoreconfHook , dbus , gettext , gnutls @@ -16,11 +17,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.49.1"; + version = "3.50.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "1dmkwpc0vy7058bh9a10ida0k64rxggap8ysl5xx3457y468rk2f"; + sha256 = "sha256-4NuHJpylIIqtFKAkFTN7T57+PEnC1NFOZukhx4oTXBA="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ dbus From 51428e8d38271d14146211867984b8742d304ea4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 31 Aug 2020 15:07:19 +0200 Subject: [PATCH 357/499] firefox: set build timeout at eight hours --- pkgs/applications/networking/browsers/firefox/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 37b36e5e6295..a438c37ac2bf 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -26,6 +26,7 @@ rec { broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; + timeout = 28800; # eight hours }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; From 67c991114f351f2f40f5be67888577d6000fd90a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 9 Sep 2020 13:00:49 +0200 Subject: [PATCH 358/499] aegisub: fix build with make 4.3 --- pkgs/applications/video/aegisub/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 64c7dc20f355..54dac5c2aa1c 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -68,6 +68,12 @@ stdenv.mkDerivation url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch"; sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf"; }) + + # Compatbility with make 4.3 + (fetchpatch { + url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch"; + sha256 = "1s9cc5rikrqb9ivjbag4b8yxcyjsmmmw744394d5xq8xi4k12vxc"; + }) ]; nativeBuildInputs = [ From f961ac6695ad04d028576f7baa48fdf28344be6d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 9 Sep 2020 13:32:31 +0200 Subject: [PATCH 359/499] python3Packages.todoist: fix build See https://hydra.nixos.org/build/126777642 ZHF #97479 --- .../python-modules/todoist/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index bfff6282025d..ac7817962300 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchPypi, buildPythonPackage -, requests }: +, requests, fetchpatch, pythonOlder, typing +}: buildPythonPackage rec { pname = "todoist-python"; @@ -10,11 +11,24 @@ buildPythonPackage rec { sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498"; }; - propagatedBuildInputs = [ requests ]; + patches = [ + # From https://github.com/Doist/todoist-python/pull/80 + (fetchpatch { + url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch"; + sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa"; + }) + (fetchpatch { + url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch"; + sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn"; + }) + ]; + + propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; meta = { description = "The official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ ma27 ]; }; } From ed21f45583a971fc80d2479f01728ec9f901cc4a Mon Sep 17 00:00:00 2001 From: meutraa Date: Wed, 9 Sep 2020 12:47:28 +0100 Subject: [PATCH 360/499] androidStudioPackages.{dev,canary}: 4.2.0.9 -> 4.2.0.10 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 515d88566122..c0b404c9285d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc="; }; latestVersion = { # canary & dev - version = "4.2.0.9"; # "Android Studio 4.2 Canary 9" - build = "202.6795674"; - sha256Hash = "sha256-IL7jdGC7X8mr5eyh8YqD6z9WF8MO5AtFXVaUEf+ThiY="; + version = "4.2.0.10"; # "Android Studio 4.2 Canary 10" + build = "202.6811877"; + sha256Hash = "sha256-ZKfETCECIOq+q/5N+I13ceb5dqGMGTXMGrqSeTL9KCc="; }; in { # Attributes are named by their corresponding release channels From f8f840f6643b6f3e189efce119141ccb9386c45d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 9 Sep 2020 14:12:25 +0200 Subject: [PATCH 361/499] exiv2: disable output splitting This is a temporary workaround. See the linked comment. --- pkgs/development/libraries/exiv2/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 24c39cb8cdcf..b79415894b3e 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.3"; - outputs = [ "out" "dev" "doc" "man" ]; + # Disabled since splitting the outputs leads to issues, see + # https://github.com/NixOS/nixpkgs/pull/97161#issuecomment-689426419 + # outputs = [ "out" "dev" "doc" "man" ]; src = fetchFromGitHub { owner = "exiv2"; From 5f6738228d48e5f1c0ec4acca4379c7c7d0648ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 9 Sep 2020 15:08:24 +0200 Subject: [PATCH 362/499] clpeak: fix build The build of clpeak recently started failing because opencl-clhpp was updated. The latest version of opencl-hpp does not ship the deprecated cl.hpp header anymore. --- pkgs/tools/misc/clpeak/clpeak-clhpp2.diff | 72 +++++++++++++++++++++++ pkgs/tools/misc/clpeak/default.nix | 8 +++ 2 files changed, 80 insertions(+) create mode 100644 pkgs/tools/misc/clpeak/clpeak-clhpp2.diff diff --git a/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff b/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff new file mode 100644 index 000000000000..aed9112682b8 --- /dev/null +++ b/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 86fec9e..b9d0341 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ elseif(WIN32 AND ${OpenCL_LIBRARIES} MATCHES "OpenCL.lib") + set(OpenCL_LIBRARIES ${OpenCL_LIBRARIES} cfgmgr32.lib) + endif() + +-FIND_PATH(HPP_FOUND CL/cl.hpp PATHS ${OpenCL_INCLUDE_DIRS}) ++FIND_PATH(HPP_FOUND CL/cl2.hpp PATHS ${OpenCL_INCLUDE_DIRS}) + if(NOT HPP_FOUND) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + include(BuildCLHpp) +diff --git a/include/clpeak.h b/include/clpeak.h +index c090d31..0d9d5e2 100644 +--- a/include/clpeak.h ++++ b/include/clpeak.h +@@ -1,14 +1,10 @@ + #ifndef CLPEAK_HPP + #define CLPEAK_HPP + +-#define __CL_ENABLE_EXCEPTIONS +- +-#include +- + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/common.h b/include/common.h +index 91318cb..6aaca04 100644 +--- a/include/common.h ++++ b/include/common.h +@@ -1,7 +1,11 @@ + #ifndef COMMON_H + #define COMMON_H + +-#include ++#define CL_HPP_ENABLE_EXCEPTIONS ++#define CL_HPP_MINIMUM_OPENCL_VERSION 120 ++#define CL_HPP_TARGET_OPENCL_VERSION 120 ++#include ++ + #if defined(__APPLE__) || defined(__MACOSX) || defined(__FreeBSD__) + #include + #endif +diff --git a/src/clpeak.cpp b/src/clpeak.cpp +index 8708463..4a47842 100644 +--- a/src/clpeak.cpp ++++ b/src/clpeak.cpp +@@ -3,7 +3,7 @@ + + #define MSTRINGIFY(...) #__VA_ARGS__ + +-static const char *stringifiedKernels = ++static const std::string stringifiedKernels = + #include "global_bandwidth_kernels.cl" + #include "compute_sp_kernels.cl" + #include "compute_hp_kernels.cl" +@@ -65,7 +65,7 @@ int clPeak::runAll() + + cl::Context ctx(CL_DEVICE_TYPE_ALL, cps); + vector devices = ctx.getInfo(); +- cl::Program::Sources source(1, make_pair(stringifiedKernels, (strlen(stringifiedKernels) + 1))); ++ cl::Program::Sources source(1, stringifiedKernels); + cl::Program prog = cl::Program(ctx, source); + + for (size_t d = 0; d < devices.size(); d++) diff --git a/pkgs/tools/misc/clpeak/default.nix b/pkgs/tools/misc/clpeak/default.nix index 46284f9a4da0..b021703b804a 100644 --- a/pkgs/tools/misc/clpeak/default.nix +++ b/pkgs/tools/misc/clpeak/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2"; }; + patches = [ + # The cl.hpp header was removed from opencl-clhpp. This patch + # updates clpeak to use the new cp2.hpp header. The patch comes + # from the following PR and was updated to apply against more + # recent versions: https://github.com/krrishnarraj/clpeak/pull/46 + ./clpeak-clhpp2.diff + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ ocl-icd opencl-clhpp ]; From 66551093ab59422c842082afb82665f9a7d260fd Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 9 Sep 2020 09:05:52 -0400 Subject: [PATCH 363/499] cht.sh: unstable-2019-08-06 -> unstable-2020-08-06 --- pkgs/tools/misc/cht.sh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 084d51d2a3ab..1c38e7c3b8f5 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -9,15 +9,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2019-08-06"; + version = "unstable-2020-08-06"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "f507ba51d6bc1ae6c7df808cadbe4f8603951b6b"; - sha256 = "0r7x9a3qzzkbd1m5zdlkpmhx0p7b7ja42190s7fidls3dsm710g0"; + rev = "9f99bec1f0293e84d6d8a990a1940c1422e3b0ce"; + sha256 = "1n4lgzsgg4502zh113d7pb1hw6bykqx6vpfp8j08z7y5clmdiwa6"; }; # Fix ".cht.sh-wrapped" in the help message From 1c8d65f940cd8a0400ddb09784ad8d35befe504f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 8 Sep 2020 11:50:54 +0200 Subject: [PATCH 364/499] drawpile: fix build by adding libsecret --- pkgs/applications/graphics/drawpile/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 20e295c85e9f..e210d03406b7 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -14,6 +14,7 @@ , qtmultimedia , qtsvg , qttools +, libsecret # optional client deps , giflib @@ -45,6 +46,7 @@ let qtmultimedia qtsvg qttools + libsecret # optional: giflib # gif animation export support kdnssd # local server discovery with Zeroconf From b8f7063cac461529463d5597866e6eb61c2cc869 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Sep 2020 15:52:34 +0200 Subject: [PATCH 365/499] ffmpeg-full: Add support for rav1e (faster AV1 encoding) #95188 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 1cbcc5471e08..c23fb87f2fae 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -110,6 +110,7 @@ , openjpeg ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null , libpulseaudio ? null # Pulseaudio input support +, rav1e ? null # AV1 encoder (focused on speed and safety) , rtmpdump ? null # RTMP[E] support #, libquvi ? null # Quvi input support , samba ? null # Samba protocol @@ -383,6 +384,7 @@ stdenv.mkDerivation rec { (enableFeature (opensslExtlib && gplLicensing) "openssl") (enableFeature (libpulseaudio != null) "libpulse") #(enableFeature quvi "libquvi") + (enableFeature (rav1e != null) "librav1e") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") (enableFeature (SDL2 != null) "sdl2") @@ -419,7 +421,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 165b9f2bcdcd..2d61efb3006c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12242,6 +12242,7 @@ in openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; + rav1e = if stdenv.isDarwin then null else rav1e; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; From ad473ca1808ec9eb63494009dbe5d3a7447bc45b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 9 Sep 2020 21:06:20 +0700 Subject: [PATCH 366/499] knightos-mkrom: unstable-2020-06-11 -> 1.0.2 --- pkgs/development/tools/knightos/mkrom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix index eec63f75e71c..258f238fd6d9 100644 --- a/pkgs/development/tools/knightos/mkrom/default.nix +++ b/pkgs/development/tools/knightos/mkrom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mkrom"; - version = "unstable-2020-06-11"; + version = "1.0.2"; src = fetchFromGitHub { owner = "KnightOS"; repo = "mkrom"; - rev = "7a735ecbe09409e74680a9dc1c50dd4db99a409f"; - sha256 = "18h7a0fb5zb991iy9ljpknmk9qvl9nz3yh1zh5bm399rpxn4nzx3"; + rev = "${version}"; + sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na"; }; nativeBuildInputs = [ From 6c9df40a4bc819fcab0836ad28ee944c8ce66db0 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 5 Feb 2020 15:35:34 +0100 Subject: [PATCH 367/499] nixos/device-tree: improve overlays support Now allows applying external overlays either in form of .dts file, literal dts context added to store or precompiled .dtbo. If overlays are defined, kernel device-trees are compiled with '-@' so the .dtb files contain symbols which we can reference in our overlays. Since `fdtoverlay` doesn't respect `/ compatible` by itself we query compatible strings of both `dtb` and `dtbo(verlay)` and apply only if latter is substring of the former. Also adds support for filtering .dtb files (as there are now nearly 1k dtbs). Co-authored-by: georgewhewell Co-authored-by: Kai Wohlfahrt --- nixos/doc/manual/release-notes/rl-2009.xml | 11 ++ nixos/modules/hardware/device-tree.nix | 164 ++++++++++++++++-- .../os-specific/linux/device-tree/default.nix | 27 ++- 3 files changed, 183 insertions(+), 19 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c5863f3219ea..886cc403fe17 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -833,6 +833,17 @@ CREATE ROLE postgres LOGIN SUPERUSER; of the default out output anymore - if you relied on the notmuch-emacs-mua binary or the emacs lisp files, access them via the notmuch.emacs output. + + Device tree overlay support was improved in + #79370 + and now uses + instead of . + + configuration was + extended to support .dts files with symbols. + + Device trees can now be filtered by setting + option. diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index b3f1dda98c89..e0ab37bca63a 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -4,7 +4,114 @@ with lib; let cfg = config.hardware.deviceTree; -in { + + overlayType = types.submodule { + options = { + name = mkOption { + type = types.str; + description = '' + Name of this overlay + ''; + }; + + dtsFile = mkOption { + type = types.nullOr types.path; + description = '' + Path to .dts overlay file, overlay is applied to + each .dtb file matching "compatible" of the overlay. + ''; + default = null; + example = literalExample "./dts/overlays.dts"; + }; + + dtsText = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Literal DTS contents, overlay is applied to + each .dtb file matching "compatible" of the overlay. + ''; + example = literalExample '' + /dts-v1/; + /plugin/; + / { + compatible = "raspberrypi"; + fragment@0 { + target-path = "/soc"; + __overlay__ { + pps { + compatible = "pps-gpio"; + status = "okay"; + }; + }; + }; + }; + ''; + }; + + dtboFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to .dtbo compiled overlay file. + ''; + }; + }; + }; + + # this requires kernel package + dtbsWithSymbols = pkgs.stdenv.mkDerivation { + name = "dtbs-with-symbols"; + inherit (cfg.kernelPackage) src nativeBuildInputs depsBuildBuild; + patches = map (patch: patch.patch) cfg.kernelPackage.kernelPatches; + buildPhase = '' + patchShebangs scripts/* + substituteInPlace scripts/Makefile.lib \ + --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@' + make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + ''; + installPhase = '' + make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + ''; + }; + + filterDTBs = src: if isNull cfg.filter + then "${src}/dtbs" + else + pkgs.runCommand "dtbs-filtered" {} '' + mkdir -p $out + cd ${src}/dtbs + find . -type f -name '${cfg.filter}' -print0 \ + | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents + ''; + + # Compile single Device Tree overlay source + # file (.dts) into its compiled variant (.dtbo) + compileDTS = name: f: pkgs.callPackage({ dtc }: pkgs.stdenv.mkDerivation { + name = "${name}-dtbo"; + + nativeBuildInputs = [ dtc ]; + + buildCommand = '' + dtc -I dts ${f} -O dtb -@ -o $out + ''; + }) {}; + + # Fill in `dtboFile` for each overlay if not set already. + # Existence of one of these is guarded by assertion below + withDTBOs = xs: flip map xs (o: o // { dtboFile = + if isNull o.dtboFile then + if !isNull o.dtsFile then compileDTS o.name o.dtsFile + else compileDTS o.name (pkgs.writeText "dts" o.dtsText) + else o.dtboFile; } ); + +in +{ + imports = [ + (mkRemovedOptionModule [ "hardware" "deviceTree" "base" ] "Use hardware.deviceTree.kernelPackage instead") + ]; + options = { hardware.deviceTree = { enable = mkOption { @@ -16,13 +123,13 @@ in { ''; }; - base = mkOption { - default = "${config.boot.kernelPackages.kernel}/dtbs"; - defaultText = "\${config.boot.kernelPackages.kernel}/dtbs"; - example = literalExample "pkgs.device-tree_rpi"; + kernelPackage = mkOption { + default = config.boot.kernelPackages.kernel; + defaultText = "config.boot.kernelPackages.kernel"; + example = literalExample "pkgs.linux_latest"; type = types.path; description = '' - The path containing the base device-tree (.dtb) to boot. Contains + Kernel package containing the base device-tree (.dtb) to boot. Uses device trees bundled with the Linux kernel by default. ''; }; @@ -38,14 +145,32 @@ in { ''; }; + filter = mkOption { + type = types.nullOr types.str; + default = null; + example = "*rpi*.dtb"; + description = '' + Only include .dtb files matching glob expression. + ''; + }; + overlays = mkOption { default = []; - example = literalExample - "[\"\${pkgs.device-tree_rpi.overlays}/w1-gpio.dtbo\"]"; - type = types.listOf types.path; + example = literalExample '' + [ + { name = "pps"; dtsFile = ./dts/pps.dts; } + { name = "spi"; + dtsText = "..."; + } + { name = "precompiled"; dtboFile = ./dtbos/example.dtbo; } + ] + ''; + type = types.listOf (types.coercedTo types.path (path: { + name = baseNameOf path; + dtboFile = path; + }) overlayType); description = '' - A path containing device tree overlays (.dtbo) to be applied to all - base device-trees. + List of overlays to apply to base device-tree (.dtb) files. ''; }; @@ -54,14 +179,27 @@ in { type = types.nullOr types.path; internal = true; description = '' - A path containing the result of applying `overlays` to `base`. + A path containing the result of applying `overlays` to `kernelPackage`. ''; }; }; }; config = mkIf (cfg.enable) { + + assertions = let + invalidOverlay = o: isNull o.dtsFile && isNull o.dtsText && isNull o.dtboFile; + in lib.singleton { + assertion = lib.all (o: !invalidOverlay o) cfg.overlays; + message = '' + deviceTree overlay needs one of dtsFile, dtsText or dtboFile set. + Offending overlay(s): + ${toString (map (o: o.name) (builtins.filter invalidOverlay cfg.overlays))} + ''; + }; + hardware.deviceTree.package = if (cfg.overlays != []) - then pkgs.deviceTree.applyOverlays cfg.base cfg.overlays else cfg.base; + then pkgs.deviceTree.applyOverlays (filterDTBs dtbsWithSymbols) (withDTBOs cfg.overlays) + else (filterDTBs cfg.kernelPackage); }; } diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 13d819a08a5b..0599289ab726 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -1,16 +1,31 @@ { stdenvNoCC, dtc, findutils }: with stdenvNoCC.lib; { - applyOverlays = (base: overlays: stdenvNoCC.mkDerivation { + applyOverlays = (base: overlays': stdenvNoCC.mkDerivation { name = "device-tree-overlays"; nativeBuildInputs = [ dtc findutils ]; buildCommand = let - quotedDtbos = concatMapStringsSep " " (o: "\"${toString o}\"") (toList overlays); + overlays = toList overlays'; in '' - for dtb in $(find ${base} -name "*.dtb" ); do - outDtb=$out/$(realpath --relative-to "${base}" "$dtb") - mkdir -p "$(dirname "$outDtb")" - fdtoverlay -o "$outDtb" -i "$dtb" ${quotedDtbos}; + mkdir -p $out + cd ${base} + find . -type f -name '*.dtb' -print0 \ + | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents + + for dtb in $(find $out -type f -name '*.dtb'); do + dtbCompat="$( fdtget -t s $dtb / compatible )" + + ${flip (concatMapStringsSep "\n") overlays (o: '' + overlayCompat="$( fdtget -t s ${o.dtboFile} / compatible )" + # overlayCompat in dtbCompat + if [[ "$dtbCompat" =~ "$overlayCompat" ]]; then + echo "Applying overlay ${o.name} to $( basename $dtb )" + mv $dtb{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" ${o.dtboFile}; + rm $dtb.in + fi + '')} + done ''; }); From 16124457d0d947ce0d98bfcb7c18f0b88c9ad398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Sep 2020 17:09:16 +0200 Subject: [PATCH 368/499] libbpf: fix incomplete linkage Also use a better reallocarray fix. --- pkgs/os-specific/linux/libbpf/default.nix | 24 +++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 1c54b93e8abc..68ccef6529c3 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig , libelf, zlib +, fetchpatch }: with builtins; @@ -15,6 +16,21 @@ stdenv.mkDerivation rec { sha256 = "1wi3a795jq0smqg1c5ml2ghai47n1m5ijmch017wscybx4jdlynv"; }; + patches = [ + (fetchpatch { # included upstream for > 0.1.0 + name = "link-zlib.patch"; + url = "https://github.com/libbpf/libbpf/commit/8b14cb43ff837.diff"; + sha256 = "17mvjrs7s727drz013a8qlyj0345ldi2kph6pazcmxv6kl1qrz2z"; + }) + ]; + patchFlags = "-p2"; + # https://github.com/libbpf/libbpf/pull/201#issuecomment-689174740 + postPatch = '' + substituteInPlace ../scripts/check-reallocarray.sh \ + --replace 'mktemp /tmp/' 'mktemp ' \ + --replace '/bin/rm' 'rm' + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libelf zlib ]; @@ -22,14 +38,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "PREFIX=$(out)" ]; - patchPhase = '' - substituteInPlace ../scripts/check-reallocarray.sh \ - --replace '/bin/rm' 'rm' - # Without patching this the config-test program will be refused by our CC wrapper. - chmod +w ../scripts - sed -e '2a NIX_ENFORCE_PURITY=0' -i ../scripts/check-reallocarray.sh - ''; - # FIXME: Multi-output requires some fixes to the way the pkgconfig file is # constructed (it gets put in $out instead of $dev for some reason, with # improper paths embedded). Don't enable it for now. From d09738dd9070a34e04cf54f1e8deeeea5408f52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Sep 2020 17:11:51 +0200 Subject: [PATCH 369/499] knot-dns: 2.9.6 -> 3.0.0 Upgrade should be pretty easy: https://www.knot-dns.cz/docs/3.0/html/migration.html#upgrade-2-9-x-to-3-0-x https://en.blog.nic.cz/2020/09/09/knot-dns-3-0-news/ https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.0.0 For now, it's built with XDP support but the NixOS service isn't ready for that yet. I'll try to look at that sometime later. --- pkgs/servers/dns/knot-dns/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index de7f2cdfe518..27f1ca12aacb 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring -, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 , autoreconfHook }: @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.6"; + version = "3.0.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7"; + sha256 = "f1c96aff6e873a2f9b1b8c2441d5a7801dd48d3abdb738a4d24b26c2a8fbe6c4"; }; outputs = [ "bin" "out" "dev" ]; @@ -34,8 +34,11 @@ stdenv.mkDerivation rec { gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl + libbpf # XDP support + nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) # without sphinx &al. for developer documentation + # TODO: add dnstap support? ] ++ optionals stdenv.isLinux [ libcap_ng systemd ] ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls From d7fade20b5443765b93ce2922604a6173529a8f1 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Wed, 9 Sep 2020 17:36:30 +0200 Subject: [PATCH 370/499] traefik: 2.2.8 -> 2.2.11 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 3d5880245e7b..b1f6fbbeeb7a 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.8"; + version = "2.2.11"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1p2qv8vrjxn5wg41ywxbpaghb8585xmkwr8ih5df4dbdjw2m3k1f"; + sha256 = "0l93qb0kjbm5gjba0bxfyb5a0n1p54n5crhcsyzgrki4x586lan0"; }; - vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; + vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2"; doCheck = false; From f3ce1df79a52c8992ccfb3c677039f32b8997be3 Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Wed, 9 Sep 2020 10:40:46 -0500 Subject: [PATCH 371/499] tlaplus: remove myself from maintainers list --- pkgs/applications/science/logic/tlaplus/tlaps.nix | 2 +- pkgs/applications/science/logic/tlaplus/toolbox.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index cbca37ea53d1..3872d3a9826b 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.badi ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 5edc3e4129df..5c445459a36a 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -76,6 +76,6 @@ in stdenv.mkDerivation { # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.badi ]; + maintainers = [ ]; }; } From a25396b58c29fe8c0b1ab10dec9fe82577583943 Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Wed, 9 Sep 2020 10:45:08 -0500 Subject: [PATCH 372/499] maintainers: badi -> badmutex --- maintainers/maintainer-list.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ca08a3466e8..596fe1c34559 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -886,9 +886,9 @@ githubId = 1017537; name = "Bruno Bieth"; }; - badi = { - email = "abdulwahidc@gmail.com"; - github = "badi"; + badmutex = { + email = "github@badi.sh"; + github = "badmutex"; githubId = 35324; name = "Badi' Abdul-Wahid"; }; From 3877da58a77fe01670b3f33d53986500c1c74eba Mon Sep 17 00:00:00 2001 From: Badi Abdul-Wahid Date: Wed, 9 Sep 2020 10:46:02 -0500 Subject: [PATCH 373/499] vivaldi: add badmutex to maintainers list --- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2fe4c638929d..f19d05306f60 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { description = "A Browser for our Friends, powerful and personal"; homepage = "https://vivaldi.com"; license = licenses.unfree; - maintainers = with maintainers; [ otwieracz nequissimus ]; + maintainers = with maintainers; [ otwieracz nequissimus badmutex ]; platforms = [ "x86_64-linux" ]; }; } From 5c84d57a592ad3a955a8c03240459c78568efe81 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 9 Sep 2020 15:42:55 +0200 Subject: [PATCH 374/499] lorri: remove unnecessary output override --- pkgs/tools/misc/lorri/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 8c544d3f0db1..99ac31f6a0b9 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -37,6 +37,8 @@ in (rustPlatform.buildRustPackage rec { inherit sha256; }; + outputs = [ "out" "man" "doc" ]; + inherit cargoSha256; doCheck = false; @@ -68,7 +70,4 @@ in (rustPlatform.buildRustPackage rec { nixos = nixosTests.lorri; }; }; -}).overrideAttrs (old: { - # add man and doc outputs to put our documentation into - outputs = old.outputs or [ "out" ] ++ [ "man" "doc" ]; }) From 9c5a72408d5f1a4ee5d6ce3887e111e29008e36e Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Thu, 10 Sep 2020 00:59:11 +0900 Subject: [PATCH 375/499] skktools: refactor Specify tag name for revision --- pkgs/tools/inputmethods/skk/skktools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index 8a7423eea1f4..435f40be3c14 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -8,13 +8,13 @@ # dependencies on a Ruby interpreter etc. # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "skktools"; version = "1.3.3"; src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; - rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769"; + rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}"; sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh"; }; # # See "12.2. Package naming" From 8b435d9e6f5aaa151b9a564cd478aef22c967bbf Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Tue, 8 Sep 2020 14:44:48 +0900 Subject: [PATCH 376/499] skktools: 1.3.3 -> 1.3.4 --- pkgs/tools/inputmethods/skk/skktools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index 435f40be3c14..b150521396c3 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -10,12 +10,12 @@ # Probably, shall package the newer tools as skktools-extra in the future. stdenv.mkDerivation rec { pname = "skktools"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh"; + sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a"; }; # # See "12.2. Package naming" # name = "skktools-unstable-${version}"; From 467dcc5b75165a8a62d84b932a44f6393275b6fc Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2020 18:10:21 +0200 Subject: [PATCH 377/499] pythonPackages.aresponses: only py3k --- pkgs/development/python-modules/aresponses/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index c790f4804105..56093192d6c7 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -6,12 +6,15 @@ # buildInputs , pytest , pytest-asyncio +, isPy3k }: buildPythonPackage rec { pname = "aresponses"; version = "2.0.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35"; From b30dfc4f4bab7a1be10946b43b4e5ca0048265ff Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2020 18:11:17 +0200 Subject: [PATCH 378/499] pythonPackages.pyhaversion: py3k only --- pkgs/development/python-modules/pyhaversion/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 381ec45388bf..4fb28fb762dd 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k # propagatedBuildInputs , aiohttp , async-timeout @@ -15,6 +16,9 @@ buildPythonPackage rec { pname = "pyhaversion"; version = "3.3.0"; + # needs aiohttp which is py3k-only + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "376a1b232a26035bc82d64affa1c4f312d782234fe5453e8d0f9e1350a97be5b"; From 31579c6b0a643742d6ac6157d002de1e730a83cb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 9 Sep 2020 12:18:50 -0400 Subject: [PATCH 379/499] matplotlib: Disable LTO on darwin. Needs #19312 or equivalent to work. --- pkgs/development/python-modules/matplotlib/default.nix | 2 +- .../development/python-modules/matplotlib/setup-darwin.cfg | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/matplotlib/setup-darwin.cfg diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 45f317397467..732a6c89f439 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; - setup_cfg = ./setup.cfg; + setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg; preBuild = '' cp "$setup_cfg" ./setup.cfg ''; diff --git a/pkgs/development/python-modules/matplotlib/setup-darwin.cfg b/pkgs/development/python-modules/matplotlib/setup-darwin.cfg new file mode 100644 index 000000000000..f6463d9c574a --- /dev/null +++ b/pkgs/development/python-modules/matplotlib/setup-darwin.cfg @@ -0,0 +1,7 @@ +[directories] +basedirlist = . + +[libs] +system_freetype = true +# LTO not working in darwin stdenv, see #19312 +enable_lto = false From ff268eb32530f490baadc5da87353777d8e3e4ce Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Sep 2020 12:23:59 -0400 Subject: [PATCH 380/499] linux: 5.9-rc3 -> 5.9-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index a78d853bb7ff..57c6b941c8d3 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc3"; + version = "5.9-rc4"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1byckdxy0y5i3lgw3f3n7b4r3v1xb4g1z3ffiq3hp4ga4nf5xzw3"; + sha256 = "080qd0dmxs0zmkpcx62vnf719wgkk64a3012r4vsaiymzhddxy8k"; }; # Should the testing kernels ever be built on Hydra? From cf54ef99b63a38a99cee677ecf1daf32b95358e1 Mon Sep 17 00:00:00 2001 From: William Kral Date: Tue, 8 Sep 2020 22:18:08 -0700 Subject: [PATCH 381/499] python3Packages.jq: 0.1.8 -> 1.0.2 --- .../development/python-modules/jq/default.nix | 12 +- .../python-modules/jq/jq-py-setup.patch | 111 ++++++++++-------- 2 files changed, 67 insertions(+), 56 deletions(-) diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 30efd75aa3a9..72776a037192 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -1,21 +1,15 @@ -{ buildPythonPackage, fetchPypi, lib, cython, jq }: +{ buildPythonPackage, fetchPypi, lib, jq }: buildPythonPackage rec { pname = "jq"; - version = "0.1.8"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "9b6bb376237133080185ab556ca2a724e8be5b31946eb2053d4a1f17ae9df9a8"; + sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147"; }; patches = [ ./jq-py-setup.patch ]; - nativeBuildInputs = [ cython ]; - - preBuild = '' - cython jq.pyx - ''; - buildInputs = [ jq ]; meta = { diff --git a/pkgs/development/python-modules/jq/jq-py-setup.patch b/pkgs/development/python-modules/jq/jq-py-setup.patch index 53092b8a1f57..df5245a0c3b5 100644 --- a/pkgs/development/python-modules/jq/jq-py-setup.patch +++ b/pkgs/development/python-modules/jq/jq-py-setup.patch @@ -1,61 +1,69 @@ -From 3f369cf8b9f7134d0792f6b141d39b5342a8274f Mon Sep 17 00:00:00 2001 -From: Benjamin Staffin -Date: Mon, 14 Jan 2019 17:27:06 -0500 +From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001 +From: William Kral +Date: Tue, 8 Sep 2020 22:04:24 -0700 Subject: [PATCH] Vastly simplify setup.py for distro compatibility --- - setup.py | 81 +------------------------------------------------------- - 1 file changed, 1 insertion(+), 80 deletions(-) + setup.py | 101 ++----------------------------------------------------- + 1 file changed, 2 insertions(+), 99 deletions(-) diff --git a/setup.py b/setup.py -index 77933f2..2b71e25 100644 +index cb63f60..87380ed 100644 --- a/setup.py +++ b/setup.py -@@ -1,10 +1,6 @@ +@@ -1,114 +1,19 @@ #!/usr/bin/env python import os --import platform -import subprocess -import tarfile -import shutil +-import sysconfig - try: - import sysconfig -@@ -14,88 +10,15 @@ except ImportError: - +-import requests from setuptools import setup - from distutils.extension import Extension --from distutils.command.build_ext import build_ext +-from setuptools.command.build_ext import build_ext + from setuptools.extension import Extension + + +-def urlretrieve(source_url, destination_path): +- response = requests.get(source_url, stream=True) +- if response.status_code != 200: +- raise Exception("status code was: {}".format(response.status_code)) - --try: -- from urllib import urlretrieve --except ImportError: -- from urllib.request import urlretrieve +- with open(destination_path, "wb") as fileobj: +- for chunk in response.iter_content(chunk_size=128): +- fileobj.write(chunk) - -def path_in_dir(relative_path): - return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) - +- +-def dependency_path(relative_path): +- return os.path.join(path_in_dir("_deps"), relative_path) +- def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() --jq_lib_tarball_path = path_in_dir("_jq-lib-1.5.tar.gz") --jq_lib_dir = path_in_dir("jq-jq-1.5") +-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz") +-jq_lib_dir = dependency_path("jq-1.6") - --oniguruma_lib_tarball_path = path_in_dir("_onig-5.9.6.tar.gz") --oniguruma_lib_build_dir = path_in_dir("onig-5.9.6") --oniguruma_lib_install_dir = path_in_dir("onig-install-5.9.6") +-oniguruma_version = "6.9.4" +-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version)) +-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version)) +-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version)) - -class jq_build_ext(build_ext): - def run(self): +- if not os.path.exists(dependency_path(".")): +- os.makedirs(dependency_path(".")) - self._build_oniguruma() - self._build_libjq() - build_ext.run(self) -- +- - def _build_oniguruma(self): - self._build_lib( -- source_url="https://github.com/kkos/oniguruma/releases/download/v5.9.6/onig-5.9.6.tar.gz", +- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version), - tarball_path=oniguruma_lib_tarball_path, - lib_dir=oniguruma_lib_build_dir, - commands=[ @@ -63,11 +71,11 @@ index 77933f2..2b71e25 100644 - ["make"], - ["make", "install"], - ]) -- -- +- +- - def _build_libjq(self): - self._build_lib( -- source_url="https://github.com/stedolan/jq/archive/jq-1.5.tar.gz", +- source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz", - tarball_path=jq_lib_tarball_path, - lib_dir=jq_lib_dir, - commands=[ @@ -75,9 +83,13 @@ index 77933f2..2b71e25 100644 - ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], - ["make"], - ]) -- +- - def _build_lib(self, source_url, tarball_path, lib_dir, commands): -- self._download_tarball(source_url, tarball_path) +- self._download_tarball( +- source_url=source_url, +- tarball_path=tarball_path, +- lib_dir=lib_dir, +- ) - - macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") - if macosx_deployment_target: @@ -86,45 +98,50 @@ index 77933f2..2b71e25 100644 - def run_command(args): - print("Executing: %s" % ' '.join(args)) - subprocess.check_call(args, cwd=lib_dir) -- +- - for command in commands: - run_command(command) -- -- def _download_tarball(self, source_url, tarball_path): +- +- def _download_tarball(self, source_url, tarball_path, lib_dir): - if os.path.exists(tarball_path): - os.unlink(tarball_path) +- print("Downloading {}".format(source_url)) - urlretrieve(source_url, tarball_path) -- -- if os.path.exists(jq_lib_dir): -- shutil.rmtree(jq_lib_dir) -- tarfile.open(tarball_path, "r:gz").extractall(path_in_dir(".")) +- print("Downloaded {}".format(source_url)) +- +- if os.path.exists(lib_dir): +- shutil.rmtree(lib_dir) +- tarfile.open(tarball_path, "r:gz").extractall(dependency_path(".")) - - jq_extension = Extension( "jq", sources=["jq.c"], -- include_dirs=[jq_lib_dir], +- include_dirs=[os.path.join(jq_lib_dir, "src")], +- extra_link_args=["-lm"], - extra_objects=[ - os.path.join(jq_lib_dir, ".libs/libjq.a"), - os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), - ], -+ libraries=["jq"], ++ libraries=["jq"] ) setup( -@@ -107,7 +30,6 @@ setup( - url='https://github.com/mwilliamson/jq.py', +@@ -120,8 +25,7 @@ setup( + url='http://github.com/mwilliamson/jq.py', + python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', license='BSD 2-Clause', - ext_modules = [jq_extension], +- ext_modules = [jq_extension], - cmdclass={"build_ext": jq_build_ext}, ++ ext_modules=[jq_extension], classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', -@@ -123,4 +45,3 @@ setup( - 'Programming Language :: Python :: 3.5', +@@ -137,4 +41,3 @@ setup( + 'Programming Language :: Python :: 3.8', ], ) - -- -2.19.2 +2.28.0 From 329a922fb273bb2f6139a9043c91489c2c1d7c05 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 9 Sep 2020 18:29:54 +0200 Subject: [PATCH 382/499] nomad: Pin to go1.14 for 0.11 and 0.12 This commit pins go versions for nomad 0.11 and 0.12. Future versions of Nomad should have their versions pinned from the beginning, even if they support the latest-at-the-time version of Go to prevent accidental version bumps on unsupported go versions. See https://github.com/NixOS/nixpkgs/pull/96414 for further discussion around this change. --- pkgs/applications/networking/cluster/nomad/0.11.nix | 3 ++- pkgs/applications/networking/cluster/nomad/0.12.nix | 3 ++- pkgs/top-level/all-packages.nix | 11 +++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix index 9d0f2248ddc5..ff0d1c69f41d 100644 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -1,6 +1,7 @@ -{ callPackage }: +{ callPackage, buildGoPackage }: callPackage ./generic.nix { + inherit buildGoPackage; version = "0.11.4"; sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb"; } diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index b39748e9eba0..3687b58b5a7c 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -1,6 +1,7 @@ -{ callPackage }: +{ callPackage, buildGoPackage }: callPackage ./generic.nix { + inherit buildGoPackage; version = "0.12.3"; sha256 = "100ynhc4nm4mmjxx1jhq2kjbqshxvi5x8y482520j8gsyn40g6zc"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be21cc88773c..390d16d9acf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5687,8 +5687,15 @@ in noip = callPackage ../tools/networking/noip { }; nomad = nomad_0_11; - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { }; - nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { }; + # Nomad never updates major go versions within a release series and is unsupported + # on Go versions that it did not ship with. Due to historic bugs when compiled + # with different versions we pin Go for all versions. + nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { + buildGoPackage = buildGo114Package; + }; + nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { + buildGoPackage = buildGo114Package; + }; notable = callPackage ../applications/misc/notable { }; From 9cdfa8adc25daaabe4e08de040826a088f2f0dc9 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 9 Sep 2020 19:10:17 +0200 Subject: [PATCH 383/499] recoll: qt4 -> qt5, fix build --- pkgs/applications/search/recoll/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 425e82000b79..fe9719efdef8 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lib, bison -, qt4, xapian, file, python, perl +{ mkDerivation, stdenv, fetchurl, lib, bison +, qtbase, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex , ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv, zlib @@ -7,7 +7,7 @@ assert stdenv.hostPlatform.system != "powerpc-linux"; -stdenv.mkDerivation rec { +mkDerivation rec { ver = "1.24.5"; name = "recoll-${ver}"; @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { sha256 = "10m3a0ghnyipjcxapszlr8adyy2yaaxx4vgrkxrfmz13814z89cv"; }; - configureFlags = [ "--enable-recollq" ] + configureFlags = [ "--enable-recollq" "--disable-webkit" ] ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); buildInputs = [ xapian file python bison zlib ] - ++ lib.optional withGui qt4 + ++ lib.optional withGui qtbase ++ lib.optional stdenv.isDarwin libiconv; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with - # the absolute path to the filtering command. + # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do if [[ ! "$f" =~ \.zip$ ]]; then @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "A full-text search tool"; longDescription = '' Recoll is an Xapian frontend that can search through files, archive - members, email attachments. + members, email attachments. ''; homepage = "https://www.lesbonscomptes.com/recoll/"; license = licenses.gpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4caf98bd192..16a79932be45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6588,7 +6588,7 @@ in recutils = callPackage ../tools/misc/recutils { }; - recoll = callPackage ../applications/search/recoll { }; + recoll = libsForQt5.callPackage ../applications/search/recoll { }; redoc-cli = nodePackages.redoc-cli; From a7f9d336b7fa7c0a14f056e5acdadae9d7b3c58e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 9 Sep 2020 19:29:57 +0200 Subject: [PATCH 384/499] mlton: fix build --- pkgs/development/compilers/mlton/default.nix | 6 +++--- pkgs/development/compilers/mlton/from-git-source.nix | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index aaf588851402..67dfd3d26898 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, patchelf, gmp }: +{ stdenv, fetchurl, fetchgit, patchelf, gmp, which }: rec { mlton20130715 = import ./20130715.nix { inherit stdenv fetchurl patchelf gmp; @@ -13,7 +13,7 @@ rec { version = "20180207"; rev = "on-20180207-release"; sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; - inherit stdenv fetchgit gmp; + inherit stdenv fetchgit gmp which; }; mltonHEAD = import ./from-git-source.nix { @@ -21,6 +21,6 @@ rec { version = "HEAD"; rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde"; sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d"; - inherit stdenv fetchgit gmp; + inherit stdenv fetchgit gmp which; }; } diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index 2585b599caf3..dc5862e6e3d8 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -6,6 +6,7 @@ , sha256 , stdenv , version +, which }: stdenv.mkDerivation { @@ -16,6 +17,8 @@ stdenv.mkDerivation { inherit url rev sha256; }; + nativeBuildInputs = [ which ]; + buildInputs = [mltonBootstrap gmp]; preBuild = '' From 04111cb35689939bfd782243e2f92d873f25db5b Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 9 Sep 2020 17:25:27 +0200 Subject: [PATCH 385/499] lxd: use stable URL for Alpine's image --- nixos/tests/lxd-nftables.nix | 1 + nixos/tests/lxd.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/tests/lxd-nftables.nix b/nixos/tests/lxd-nftables.nix index 25517914db85..4ca02067a0ae 100644 --- a/nixos/tests/lxd-nftables.nix +++ b/nixos/tests/lxd-nftables.nix @@ -7,6 +7,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lxd-nftables"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ patryk27 ]; }; diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index db2d44dff557..bf81fdd3edf1 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -6,15 +6,14 @@ let # # I've chosen to import Alpine Linux, because its image is turbo-tiny and, # generally, sufficient for our tests. - alpine-meta = pkgs.fetchurl { - url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/lxd.tar.xz"; - sha256 = "1hkvaj3rr333zmx1759njy435lps33gl4ks8zfm7m4nqvipm26a0"; + url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; + sha256 = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; }; alpine-rootfs = pkgs.fetchurl { - url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/rootfs.tar.xz"; - sha256 = "1v82zdra4j5xwsff09qlp7h5vbsg54s0j7rdg4rynichfid3r347"; + url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; + sha256 = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; }; lxd-config = pkgs.writeText "config.yaml" '' @@ -44,8 +43,10 @@ let type: disk ''; + in { name = "lxd"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ patryk27 ]; }; @@ -53,7 +54,7 @@ in { machine = { lib, ... }: { virtualisation = { # Since we're testing `limits.cpu`, we've gotta have a known number of - # cores to lay on + # cores to lean on cores = 2; # Ditto, for `limits.memory` From 43d9d1d7d8f558cbaa4ce386a7c3fb9be2b0d9c1 Mon Sep 17 00:00:00 2001 From: marius david Date: Wed, 9 Sep 2020 18:23:23 +0200 Subject: [PATCH 386/499] instead: 3.3.1 -> 3.3.2; fix compilation --- pkgs/games/instead/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index f131b920990c..34a31fee7292 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }: let - version = "3.3.1"; + version = "3.3.2"; # I took several games at random from http://instead.syscall.ru/games/ games = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz"; - sha256 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0"; + sha256 = "u5j2kDKRvMQPsG8iA6uOBScuyE/e1BJIK2+qVL6jqQs="; }; NIX_LDFLAGS = "-llua -lgcc_s"; @@ -41,6 +41,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig unzip ]; buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ]; + postPatch = '' + substituteInPlace configure.sh \ + --replace "/tmp/sdl-test" $(mktemp) + ''; + configurePhase = '' { echo 2; echo $out; } | ./configure.sh ''; From 32c9ee2cfc18cf9d798011b3822c176a2ce819d9 Mon Sep 17 00:00:00 2001 From: Tim Zook Date: Wed, 9 Sep 2020 11:55:52 -0500 Subject: [PATCH 387/499] csvkit: fix failing test The build for this package was failing due to failing tests that were caused by a breaking change in a dependency. The requirements.txt for this package does not pin specific versions so it was trying to build with the new version of the dependency and failing. This commit overrides the version of the dependency that is used to build the package. --- pkgs/tools/text/csvkit/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 7a0240fc7301..95ef4f22b776 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -12,7 +12,14 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ agate agate-excel - agate-dbf + # dbf test fail with agate-dbf-0.2.2 + (agate-dbf.overridePythonAttrs(old: rec { + version = "0.2.1"; + src = python3.pkgs.fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; + };})) # sql test fail with agate-sql-0.5.4 (agate-sql.overridePythonAttrs(old: rec { version = "0.5.3"; From 93b8435915e9bbc8efe0c9c40a1d981cebaa795c Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 9 Sep 2020 19:46:21 +0200 Subject: [PATCH 388/499] lxd: add `wait_for_file()` to ensure LXD is actually running --- nixos/tests/lxd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index bf81fdd3edf1..0ee3084f246b 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -68,6 +68,7 @@ in { testScript = '' machine.wait_for_unit("sockets.target") machine.wait_for_unit("lxd.service") + machine.wait_for_file("/var/lib/lxd/unix.socket") # It takes additional second for lxd to settle machine.sleep(1) From 92bf2d7c03f0d93334b229e612f9f365a7db72b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2020 19:46:33 +0200 Subject: [PATCH 389/499] python3Packages.pyhaversion: add missing semantic-version --- pkgs/development/python-modules/pyhaversion/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 4fb28fb762dd..b6ef4bc4a8ba 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -5,6 +5,7 @@ # propagatedBuildInputs , aiohttp , async-timeout +, semantic-version # buildInputs , pytestrunner # checkInputs @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp async-timeout + semantic-version ]; buildInputs = [ From 183d9abdafbf505f47a4c188ae141aa9a40570f4 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 9 Sep 2020 20:07:17 +0200 Subject: [PATCH 390/499] lxd: s/sha256/hash --- nixos/tests/lxd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix index 0ee3084f246b..d1e642383cf8 100644 --- a/nixos/tests/lxd.nix +++ b/nixos/tests/lxd.nix @@ -8,12 +8,12 @@ let # generally, sufficient for our tests. alpine-meta = pkgs.fetchurl { url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz"; - sha256 = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; + hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA="; }; alpine-rootfs = pkgs.fetchurl { url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz"; - sha256 = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; + hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA="; }; lxd-config = pkgs.writeText "config.yaml" '' From ad0d43e1a714e7fcc10aef96c61a726d6254217b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 9 Sep 2020 20:16:18 +0200 Subject: [PATCH 391/499] mlton: use callPackage --- pkgs/development/compilers/mlton/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 67dfd3d26898..e4381774781c 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchurl, fetchgit, patchelf, gmp, which }: +{ callPackage }: + rec { - mlton20130715 = import ./20130715.nix { - inherit stdenv fetchurl patchelf gmp; - }; + mlton20130715 = callPackage ./20130715.nix {}; - mlton20180207Binary = import ./20180207-binary.nix { - inherit stdenv fetchurl patchelf gmp; - }; + mlton20180207Binary = callPackage ./20180207-binary.nix {}; - mlton20180207 = import ./from-git-source.nix { + mlton20180207 = callPackage ./from-git-source.nix { mltonBootstrap = mlton20180207Binary; version = "20180207"; rev = "on-20180207-release"; sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; - inherit stdenv fetchgit gmp which; }; - mltonHEAD = import ./from-git-source.nix { + mltonHEAD = callPackage ./from-git-source.nix { mltonBootstrap = mlton20180207Binary; version = "HEAD"; rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde"; sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d"; - inherit stdenv fetchgit gmp which; }; } From 3a38cef8f9108bcbf024c05dc89dd80561f7e62b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 14 Mar 2020 01:30:31 -0700 Subject: [PATCH 392/499] jasper: remove, abandoned upstream. Jasper has been marked insecure for a while, and upstream has not been responsive to CVEs for over a year. Fixes #55388. Signed-off-by: David Anderson --- lib/licenses.nix | 5 -- .../applications/graphics/digikam/default.nix | 4 +- pkgs/applications/misc/k2pdfopt/default.nix | 2 - pkgs/development/libraries/jasper/default.nix | 51 ------------------- pkgs/development/libraries/libraw/default.nix | 7 +-- pkgs/development/libraries/opencv/3.x.nix | 3 -- pkgs/development/libraries/opencv/4.x.nix | 3 -- pkgs/development/libraries/opencv/default.nix | 3 -- .../libraries/openscenegraph/default.nix | 2 - pkgs/tools/graphics/dcraw/default.nix | 9 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 12 files changed, 9 insertions(+), 83 deletions(-) delete mode 100644 pkgs/development/libraries/jasper/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index ee11966b0d53..8492cf2495b4 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -448,11 +448,6 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { free = false; }; - jasper = spdx { - spdxId = "JasPer-2.0"; - fullName = "JasPer License"; - }; - lgpl2Only = spdx { spdxId = "LGPL-2.0-only"; fullName = "GNU Library General Public License v2 only"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index b2a039656017..2c0dbd5f3f0a 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -26,7 +26,6 @@ , exiv2 , ffmpeg , flex -, jasper ? null, withJpeg2k ? false # disable JPEG2000 support, jasper has unfixed CVE , lcms2 , lensfun , libgphoto2 @@ -98,8 +97,7 @@ mkDerivation rec { marble oxygen threadweaver - ] - ++ lib.optionals withJpeg2k [ jasper ]; + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 431426e55fbd..75e467d4cdf8 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -3,7 +3,6 @@ , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf -, enableJPEG2K ? false, jasper ? null # disabled by default, jasper has unfixed CVE , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes , enableTesseract ? true, leptonica, tesseract4 @@ -144,7 +143,6 @@ in stdenv.mkDerivation rec { optional enableGSL gsl ++ optional enableGhostScript ghostscript ++ optional enableMuPDF mupdf_modded ++ - optional enableJPEG2K jasper ++ optional enableDJVU djvulibre ++ optional enableGOCR gocr ++ optionals enableTesseract [ leptonica_modded tesseract_modded ]; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix deleted file mode 100644 index cd7b1cf4fd10..000000000000 --- a/pkgs/development/libraries/jasper/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }: - -stdenv.mkDerivation rec { - pname = "jasper"; - version = "2.0.16"; - - src = fetchFromGitHub { - repo = "jasper"; - owner = "mdadams"; - rev = "version-${version}"; - sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2018-9055.patch"; - url = "http://paste.opensuse.org/view/raw/330751ce"; - sha256 = "0m798m6c4v9yyhql7x684j5kppcm6884n1rrb9ljz8p9aqq2jqnm"; - }) - ]; - - - # newer reconf to recognize a multiout flag - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ libjpeg ]; - - configureFlags = [ "--enable-shared" ]; - - outputs = [ "bin" "dev" "out" "man" ]; - - enableParallelBuilding = true; - - doCheck = false; # fails - - postInstall = '' - moveToOutput bin "$bin" - ''; - - meta = with stdenv.lib; { - homepage = "https://www.ece.uvic.ca/~frodo/jasper/"; - description = "JPEG2000 Library"; - platforms = platforms.unix; - license = licenses.jasper; - maintainers = with maintainers; [ pSub ]; - knownVulnerabilities = [ - "Numerous CVE unsolved upstream" - "See: https://github.com/NixOS/nixpkgs/pull/57681#issuecomment-475857499" - "See: https://github.com/mdadams/jasper/issues/208" - ]; - }; -} diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index f20810801d97..b190d36acb52 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -1,7 +1,4 @@ -{ stdenv, fetchurl, lcms2, pkgconfig -, jasper ? null, withJpeg2k ? false -# disable JPEG2000 support by default as jasper has many CVE -}: +{ stdenv, fetchurl, lcms2, pkgconfig }: stdenv.mkDerivation rec { pname = "libraw"; @@ -14,8 +11,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" ]; - buildInputs = stdenv.lib.optionals withJpeg2k [ jasper ]; - propagatedBuildInputs = [ lcms2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 1597eb7913a5..2ad2d016c9fd 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -9,7 +9,6 @@ , enableTIFF ? true, libtiff , enableWebP ? true, libwebp , enableEXR ? !stdenv.isDarwin, openexr, ilmbase -, enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true @@ -187,7 +186,6 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -225,7 +223,6 @@ stdenv.mkDerivation { "-DBUILD_DOCS=${printEnabled enableDocs}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) - (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index dd71b10728d8..a2cd75093ce3 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -9,7 +9,6 @@ , enableTIFF ? true, libtiff , enableWebP ? true, libwebp , enableEXR ? !stdenv.isDarwin, openexr, ilmbase -, enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true @@ -203,7 +202,6 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -242,7 +240,6 @@ stdenv.mkDerivation { "-DBUILD_DOCS=${printEnabled enableDocs}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) - (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 06a3d5f194fb..d71c210fb6f6 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -6,7 +6,6 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase -, enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen @@ -65,7 +63,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) - (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index a86171852164..4ded4770fc81 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,7 +2,6 @@ libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, jpegSupport ? true, libjpeg, - jasperSupport ? false, jasper, # disable jasper by default (many CVE) exrSupport ? false, openexr, gifSupport ? true, giflib, pngSupport ? true, libpng, @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { libX11 libXinerama libXrandr libGLU libGL glib ilmbase libxml2 pcre zlib ] ++ lib.optional jpegSupport libjpeg - ++ lib.optional jasperSupport jasper ++ lib.optional exrSupport openexr ++ lib.optional gifSupport giflib ++ lib.optional pngSupport libpng diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index f8e78d017120..a43c7a16d97e 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper, libiconv }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -9,12 +9,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; - buildInputs = [ libjpeg lcms2 gettext jasper ]; + buildInputs = [ libjpeg lcms2 gettext ]; + # Jasper is disabled because the library is abandoned and has many + # CVEs. patchPhase = '' substituteInPlace install \ --replace 'prefix=/usr/local' 'prefix=$out' \ - --replace gcc '$CC' + --replace gcc '$CC' \ + --replace '-ljasper' '-DNO_JASPER=1' ''; buildPhase = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9832c6841ee..0acab2235470 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -211,6 +211,7 @@ mapAliases ({ idea = jetbrains; # added 2017-04-03 infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; + jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; jbuilder = dune; # added 2018-09-09 jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff6dd98b460..3c6f6539a3e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12996,8 +12996,6 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - jasper = callPackage ../development/libraries/jasper { }; - jama = callPackage ../development/libraries/jama { }; jansson = callPackage ../development/libraries/jansson { }; From 6917fda396d85f49676dc4dd7a5c6a384e31c980 Mon Sep 17 00:00:00 2001 From: luc65r Date: Wed, 9 Sep 2020 20:49:52 +0200 Subject: [PATCH 393/499] rbw: 0.4.4 -> 0.4.6 --- pkgs/tools/security/rbw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 11045e53f23b..9eb670102fb8 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -19,15 +19,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "0.4.4"; + version = "0.4.6"; src = fetchCrate { inherit version; crateName = "${pname}"; - sha256 = "01p37zx2h3gpm363xn96w0wlg7kqayjl3an65h9p6md21d41bvyr"; + sha256 = "0vq7cwk3i57fvn54q2rgln74j4p9vqm5zyhap94s73swjywicwk0"; }; - cargoSha256 = "1xiw21snsbqxfw624cdc340asp2kmcp8rymfcjj7w2lwcqhadrh9"; + cargoSha256 = "1h253ncick2v9aki5rf1bdrg5rj3h4nrvx5q01gw03cgwnqvyiiy"; nativeBuildInputs = [ pkgconfig From 07999f480b3117ab2b85410151fbac25bdb9b4ee Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 9 Sep 2020 20:57:32 +0200 Subject: [PATCH 394/499] ncftp: do not override $TMPDIR --- pkgs/tools/networking/ncftp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 98fa6cc29f1a..d8c37ff58707 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' + find -name Makefile.in | xargs sed -i '/^TMPDIR=/d' + find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \ -e 's@/bin/ls@${coreutils}/bin/ls@g' \ -e 's@/bin/rm@${coreutils}/bin/rm@g' From 8f3efbde4e5d5d5f6af97e8f7e199f37d51d9faa Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 9 Sep 2020 11:56:52 -0700 Subject: [PATCH 395/499] Fix arch eval error introduced in #61019 This occurs when using a `platform.gcc.arch` that isn't one of the pre-existing hard-coded options. --- lib/systems/architectures.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 9d1c29fd9f0b..bfecaec1ae88 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -60,7 +60,7 @@ rec { }; predicates = let - featureSupport = feature: x: builtins.elem feature features.${x}; + featureSupport = feature: x: builtins.elem feature features.${x} or []; in { sse3Support = featureSupport "sse3"; ssse3Support = featureSupport "ssse3"; From 98512f3eaa9875bbc634e7e1f3f9e752de0dbcae Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 18 Feb 2020 17:31:10 -0500 Subject: [PATCH 396/499] nifticlib: 2.0.0 -> 3.0.1 --- .../science/biology/nifticlib/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index 37055259e7c8..572c31dd1e52 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, cmake, zlib }: +{ stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { - pname = "nifticlib"; - pversion = "2.0.0"; - name = "${pname}-${pversion}"; + pname = "nifticlib"; + version = "3.0.1"; - src = fetchurl { - url = "mirror://sourceforge/project/niftilib/${pname}/${pname}_2_0_0/${name}.tar.gz"; - sha256 = "123z9bwzgin5y8gi5ni8j217k7n683whjsvg0lrpii9flgk8isd3"; + src = fetchFromGitHub { + owner = "NIFTI-Imaging"; + repo = "nifti_clib"; + rev = "v${version}"; + sha256 = "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4"; }; + cmakeFlags = [ "-DDOWNLOAD_TEST_DATA=OFF" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - doCheck = false; # fails 7 out of 293 tests + checkPhase = '' + runHook preCheck + ctest -LE 'NEEDS_DATA' + runHook postCheck + ''; + doCheck = true; meta = with stdenv.lib; { - homepage = "https://sourceforge.net/projects/niftilib"; + homepage = "https://nifti-imaging.github.io"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; From 57b9d5c14456042f86b41ef13880886fbee6e857 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Wed, 9 Sep 2020 15:48:48 -0400 Subject: [PATCH 397/499] chrony: Create state directory with correct owner. Fixes https://github.com/NixOS/nixpkgs/issues/97546 --- nixos/modules/services/networking/ntp/chrony.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index b7e4c89a155c..78de50583f34 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -117,7 +117,6 @@ in ProtectHome = "yes"; ProtectSystem = "full"; PrivateTmp = "yes"; - StateDirectory = "chrony"; }; }; From 7879a6f95b1fdce63f79711eb5b222b9d96e056c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Sep 2020 22:09:45 +0200 Subject: [PATCH 398/499] flashrom nitpick: avoid nested list --- pkgs/tools/misc/flashrom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index ab0fa0846ea1..2f92dc6d9bf2 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"; }; - mesonFlags = lib.optional stdenv.isAarch64 [ "-Dpciutils=false" ]; + mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; nativeBuildInputs = [ meson pkgconfig ninja ]; buildInputs = [ libftdi1 libusb1 pciutils ]; From 6e08d2370751890a9ac5c5906dbcf585f9d4d9c0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 3 Sep 2020 09:26:50 +0200 Subject: [PATCH 399/499] coqPackages.paramcoq: init at 1.1.2 for Coq 8.12 --- pkgs/development/coq-modules/paramcoq/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 67e420b4e89e..12d65bdb3d7b 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -20,6 +20,9 @@ let params = "8.11" = { sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; }; + "8.12" = { + sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; + }; }; param = params.${coq.coq-version}; in From 4bf695e988a323a2377dadcf2e37f7b6934e3f84 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 9 Sep 2020 22:30:32 +0200 Subject: [PATCH 400/499] nixos/qt5ct: do not require qtstyleplugins These do not build with qt 5.15. --- nixos/modules/programs/qt5ct.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix index aeb7fc508495..3f2bcf622836 100644 --- a/nixos/modules/programs/qt5ct.nix +++ b/nixos/modules/programs/qt5ct.nix @@ -26,6 +26,6 @@ with lib; ###### implementation config = mkIf config.programs.qt5ct.enable { environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct"; - environment.systemPackages = with pkgs; [ qt5ct libsForQt5.qtstyleplugins ]; + environment.systemPackages = with pkgs; [ qt5ct ]; }; } From 1186c168892b0a406374221cebe74595c1a2528d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 9 Sep 2020 22:40:33 +0200 Subject: [PATCH 401/499] pass-wayland: use proper derivation for `.withExtensions` The `pass.withExtensions`-function uses `buildEnv` to create a derivation which contains a `pass`-package and a list of extensions for it. However, this function always uses the `pass`-attribute for `buildEnv` which will break e.g. `passmenu` or `pass show -c` on desktops using Wayland (and `pass-wayland.withExtensions`) since the default `pass`-package without support for Wayland's clipboard is used. This patch replaces the `pass`-attribute in the derivation with `pass-wayland` to work around this issue. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff6dd98b460..a34dadf63995 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1113,6 +1113,7 @@ in pass-wayland = callPackage ../tools/security/pass { waylandSupport = true; + pass = pass-wayland; }; passExtensions = recurseIntoAttrs pass.extensions; From fbefec0d3e1fde1ad36b661d44935959532b1c1c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 9 Sep 2020 12:20:48 +0200 Subject: [PATCH 402/499] j: fix build on darwin On darwin the compilation would fail with the following warning: ``` clang-7: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] ``` This error happens because the `-fno-strict-overflow` is passed to the compiler. To fix this, disable the `strictoverflow` hardening feature. Also see #39687. ZHF: #97479 --- pkgs/development/interpreters/j/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index c612135cd184..b7f8b63d54ad 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { doCheck = true; + # Causes build failure due to warning + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; + buildPhase = '' export SOURCE_DIR=$(pwd) export HOME=$TMPDIR From d3958aa3fa5fbd9ee162a0872ef3d4562d951d6f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 10 Sep 2020 00:27:30 +0200 Subject: [PATCH 403/499] electron-cash: 4.0.14 -> 4.1.0 --- .../misc/electron-cash/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 1616c082c017..a6ba3444dcdb 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,14 +1,15 @@ -{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook, secp256k1 }: +{ lib, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook +, secp256k1 }: python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.0.14"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6"; + sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; }; propagatedBuildInputs = with python3Packages; [ @@ -35,6 +36,15 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; + patches = [ + # Patch a failed test, this can be removed in next version + (fetchpatch { + url = + "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch"; + sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk"; + }) + ]; + postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3" @@ -43,9 +53,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - checkInputs = with python3Packages; [ - pytest - ]; + checkInputs = with python3Packages; [ pytest ]; checkPhase = '' unset HOME From 4051e867ba04cf4c1bccf0a2da5553cde2645821 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Sep 2020 18:00:00 -0500 Subject: [PATCH 404/499] grpc: 1.31.0 -> 1.32.0 https://github.com/grpc/grpc/releases/tag/v1.32.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index b0fe149b6f06..b5d4db8b4198 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.31.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1h7gmhkjijfkpqhz8vswhkz2gkphs638g10dlkayic8xg9xdl4gj"; + sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c"; fetchSubmodules = true; }; patches = [ From 35665b9fc222a9098729545145a46f123e7e0210 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Sep 2020 18:01:00 -0500 Subject: [PATCH 405/499] pythonPackages.grpcio-tools: 1.31.0 -> 1.32.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 37ffc8beca55..94a440bb4f10 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3b08cbd3f4d5b60e3bff8f859e6e03db739967a684268164abc940415e23ca51"; + sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47"; }; enableParallelBuilding = true; From cdaec7e9edfad25ce9611c322d264f1414a372de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 9 Sep 2020 12:38:57 +0200 Subject: [PATCH 406/499] ejabberd: fix failing tests This commit fixes the ejabberd tests for hydra: mod_http_upload and mod_disco need to be explicitly enabled, and a handler needs to be setup to make it work. Also, the client needs to be able to contact the server. The commit also fixes the situation where http upload failed: in that case the client would wait forever because nothing catched the error. Finally, there remains a non-reproducible error where ejabberd server fails to start with an error like: format: "Failed to create cookie file '/var/lib/ejabberd/.erlang.cookie': eacces" (happens ~15%) I tried to check existence of /var/lib/ejabberd/ in pre-start script and saw nothing that would explain this error, so I gave up about this error in particular. --- nixos/tests/xmpp/ejabberd.nix | 16 +++++++++++++--- nixos/tests/xmpp/xmpp-sendmessage.nix | 6 +++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 1518aaacc8ab..2b09f99f5fd9 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -5,6 +5,10 @@ import ../make-test-python.nix ({ pkgs, ... }: { }; nodes = { client = { nodes, pkgs, ... }: { + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ''; + environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) ]; @@ -46,6 +50,11 @@ import ../make-test-python.nix ({ pkgs, ... }: { module: ejabberd_service access: local shaper: fast + - + port: 5444 + module: ejabberd_http + request_handlers: + "/upload": mod_http_upload ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text ## password storage (see auth_password_format option). @@ -180,6 +189,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { mod_client_state: {} mod_configure: {} # requires mod_adhoc ## mod_delegation: {} # for xep0356 + mod_disco: {} #mod_irc: # host: "irc.@HOST@" # default_encoding: "utf-8" @@ -187,9 +197,9 @@ import ../make-test-python.nix ({ pkgs, ... }: { ## mod_http_fileserver: ## docroot: "/var/www" ## accesslog: "/var/log/ejabberd/access.log" - #mod_http_upload: - # thumbnail: false # otherwise needs the identify command from ImageMagick installed - # put_url: "https://@HOST@:5444" + mod_http_upload: + thumbnail: false # otherwise needs the identify command from ImageMagick installed + put_url: "http://@HOST@:5444/upload" ## # docroot: "@HOME@/upload" #mod_http_upload_quota: # max_days: 14 diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 349b9c6f38e4..30945e68300a 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -36,7 +36,11 @@ class CthonTest(ClientXMPP): def timeout_callback(arg): log.error("ERROR: Cannot upload file. XEP_0363 seems broken") sys.exit(1) - url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback) + try: + url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback) + except: + log.error("ERROR: Cannot run upload command. XEP_0363 seems broken") + sys.exit(1) log.info('Upload success!') # Test MUC self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) From 3d9adca64178619c4868060a86a546978cda5764 Mon Sep 17 00:00:00 2001 From: Amit Aryeh Levy Date: Wed, 9 Sep 2020 16:20:29 -0700 Subject: [PATCH 407/499] zoom-us: 5.2.454870.0831 -> 5.2.458699.0906 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 11325daffb8f..076024684275 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.2.454870.0831"; + version = "5.2.458699.0906"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "198p7a6kd5bakywj314lwizsy03g3j7w5zd7j3xghmpcfjz5drbn"; + sha256 = "0cwai5v2m99cvw1dnysl88fi97dwm6rq7xv3y0ydgg3499n8cjpf"; }; }; From 5b49a74747b41940e663385e21fe8ab5155d9a29 Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Wed, 9 Sep 2020 22:25:54 +0000 Subject: [PATCH 408/499] lxpanel: fix build by switching to gdk-pixbuf-xlib The build has been broken since gdk-pixbuf-xlib was broken out into a separate package in #88086. For some reason if I just add gdk-pixbuf-xlib.dev the headers don't make it into CFLAGS. --- pkgs/desktops/lxde/core/lxpanel/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 20b5a35fc309..da146764c320 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder -, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf +, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib , menu-cache, lxmenu-data, wirelesstools , supportAlsa ? false, alsaLib }: @@ -14,10 +14,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; buildInputs = [ - keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf + keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev menu-cache lxmenu-data m4 wirelesstools ] ++ stdenv.lib.optional supportAlsa alsaLib; + postPatch = '' + substituteInPlace src/Makefile.in \ + --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" + substituteInPlace plugins/Makefile.in \ + --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" + ''; + meta = { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; From e64d3f60fbc77887534838de7208df853275fd01 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 23 Aug 2020 15:12:13 +0200 Subject: [PATCH 409/499] nixos/modules/security/rngd: Disable by default `rngd` seems to be the root cause for slow boot issues, and its functionality is redundant since kernel v3.17 (2014), which introduced a `krngd` task (in kernel space) that takes care of pulling in data from hardware RNGs: > commit be4000bc4644d027c519b6361f5ae3bbfc52c347 > Author: Torsten Duwe > Date: Sat Jun 14 23:46:03 2014 -0400 > > hwrng: create filler thread > > This can be viewed as the in-kernel equivalent of hwrngd; > like FUSE it is a good thing to have a mechanism in user land, > but for some reasons (simplicity, secrecy, integrity, speed) > it may be better to have it in kernel space. > > This patch creates a thread once a hwrng registers, and uses > the previously established add_hwgenerator_randomness() to feed > its data to the input pool as long as needed. A derating factor > is used to bias the entropy estimation and to disable this > mechanism entirely when set to zero. Closes: #96067 --- nixos/modules/security/rngd.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index cffa1a5849f9..cb885c4762d0 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -10,11 +10,10 @@ in security.rngd = { enable = mkOption { type = types.bool; - default = true; + default = false; description = '' - Whether to enable the rng daemon, which adds entropy from - hardware sources of randomness to the kernel entropy pool when - available. + Whether to enable the rng daemon. Devices that the kernel recognises + as entropy sources are handled automatically by krngd. ''; }; debug = mkOption { @@ -26,12 +25,6 @@ in }; config = mkIf cfg.enable { - services.udev.extraRules = '' - KERNEL=="random", TAG+="systemd" - SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - ''; - systemd.services.rngd = { bindsTo = [ "dev-random.device" ]; From ca674c176918f7b33407608b7894e32e6211dab9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 9 Sep 2020 21:50:07 -0400 Subject: [PATCH 410/499] rl-2009: document rngd --- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8bc51c906ae8..1b51fbd566d5 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -815,6 +815,13 @@ CREATE ROLE postgres LOGIN SUPERUSER; the value of to pkgs.jellyfin_10_5. + + + The security.rngd service is now disabled by default. + This choice was made because there's krngd in the linux kernel space making it (for most usecases) + functionally redundent. + + From 039e248555935580b0551b3e1aaa466067c66151 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 6 Sep 2020 12:15:20 +0200 Subject: [PATCH 411/499] python3Packages.django-picklefield: fix tests --- .../django-picklefield/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index a9a03e9066c4..4710de2c7ecb 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,16 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, django }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django }: buildPythonPackage rec { pname = "django-picklefield"; version = "3.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "15ccba592ca953b9edf9532e64640329cd47b136b7f8f10f2939caa5f9ce4287"; + # The PyPi source doesn't contain tests + src = fetchFromGitHub { + owner = "gintas"; + repo = pname; + rev = "v${version}"; + sha256 = "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"; }; propagatedBuildInputs = [ django ]; + checkInputs = [ pytest pytest-django ]; + + checkPhase = '' + PYTHONPATH="$(pwd):$PYTHONPATH" \ + DJANGO_SETTINGS_MODULE=tests.settings \ + pytest tests/tests.py + ''; + meta = { description = "A pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; From a81c38893c10d890f44bfdc75b7df1bfdd0ef705 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 6 Sep 2020 12:17:39 +0200 Subject: [PATCH 412/499] python3Packages.django_extensions: 2.2.8 -> 3.0.8 --- pkgs/development/python-modules/django-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 08b2460b1bbc..ecf400b21d86 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.2.8"; + version = "3.0.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; + sha256 = "1z2si9wpc8irqhi5i2wp4wr05dqxyw4mn2vj3amp0rvsvydws92c"; }; LC_ALL = "en_US.UTF-8"; From 684496cfb64cd17faf676ea5f6b021a9938f5be7 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 6 Sep 2020 12:53:49 +0200 Subject: [PATCH 413/499] paperless: fix build Paperless was dependent on older older versions of recently updated Python packages. --- .../applications/office/paperless/default.nix | 26 ++++++++-------- .../paperless/python-modules/default.nix | 30 +++++++++++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/office/paperless/python-modules/default.nix diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index c549b107c541..ebd057da5ce1 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -106,26 +106,26 @@ let }; python = python3.override { - packageOverrides = self: super: { - # Paperless only supports Django 2.0 - django = django_2_0 super; + packageOverrides = self: super: let + customPkgs = import ./python-modules super fetchFromGitHub; in + { pyocr = pyocrWithUserTesseract super; + + # Paperless only supports Django 2.0 + django = customPkgs.django_2_0; + + # Paperless is incompatible with factory_boy >= 3 + factory_boy = customPkgs.factory_boy_2_12_0; + + # The current version of django_extensions is incompatible with django 2.0 + django_extensions = customPkgs.django_extensions_2_2_8; + # These are pre-release versions, hence they are private to this pkg django-filter = self.callPackage ./python-modules/django-filter.nix {}; django-crispy-forms = self.callPackage ./python-modules/django-crispy-forms.nix {}; }; }; - django_2_0 = pyPkgs: pyPkgs.django_2_2.overrideDerivation (_: rec { - pname = "Django"; - version = "2.0.12"; - name = "${pname}-${version}"; - src = pyPkgs.fetchPypi { - inherit pname version; - sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2"; - }; - }); - runtimePackages = with python.pkgs; [ dateparser dateutil diff --git a/pkgs/applications/office/paperless/python-modules/default.nix b/pkgs/applications/office/paperless/python-modules/default.nix new file mode 100644 index 000000000000..40a496312fa9 --- /dev/null +++ b/pkgs/applications/office/paperless/python-modules/default.nix @@ -0,0 +1,30 @@ +pyPkgs: fetchFromGitHub: +{ + django_2_0 = pyPkgs.django_2_2.overridePythonAttrs (old: rec { + version = "2.0.12"; + src = pyPkgs.fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2"; + }; + }); + + django_extensions_2_2_8 = pyPkgs.django_extensions.overridePythonAttrs (old: rec { + version = "2.2.8"; + src = fetchFromGitHub { + owner = old.pname; + repo = old.pname; + rev = version; + sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; + }; + }); + + factory_boy_2_12_0 = pyPkgs.factory_boy.overridePythonAttrs (old: rec { + version = "2.12.0"; + src = pyPkgs.fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; + }; + }); +} From 9fae7b21ef65e83bccd17167e0180eba67a5f806 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 9 Sep 2020 21:58:09 -0400 Subject: [PATCH 414/499] python3Packages.pyfakefs: disable on py2.7 * No longer supports python < 3.5, so disabled. * Enables tests that were disabled due to bugs. * Add changelog --- pkgs/development/python-modules/pyfakefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index d38125e26b81..7c1dc4fbb0d9 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }: buildPythonPackage rec { version = "4.1.0"; pname = "pyfakefs"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -24,8 +25,6 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - # https://github.com/jmcgeheeiv/pyfakefs/issues/508 - doCheck = !isPy37; checkInputs = [ pytest glibcLocales ]; checkPhase = '' @@ -39,6 +38,7 @@ buildPythonPackage rec { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; homepage = "http://pyfakefs.org/"; + changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; maintainers = with maintainers; [ gebner ]; }; } From b03c729c88dadfcab53019d4d7a7db9899fb6ad6 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 9 Sep 2020 21:26:17 -0400 Subject: [PATCH 415/499] python3Packages.nmigen: fix build Tried to debug failure & traced it to subprocess.Popen calling fork_exec() with a bad path, but couldn't reproduce error from manual debugging using ``nix-shell``. Bad path meaning that most paths were of form /nix/store/.../bin/sby, but one path was "sby" only. That's my only guess as to what would be causing this failure. --- pkgs/development/python-modules/nmigen/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 98d95afa9924..4a2327bf9288 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -8,6 +8,7 @@ , jinja2 # for tests +, pytestCheckHook , yosys , symbiyosys , yices @@ -18,6 +19,7 @@ buildPythonPackage rec { version = "unstable-2020-04-02"; # python setup.py --version realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nmigen"; @@ -26,18 +28,23 @@ buildPythonPackage rec { sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; }; - disabled = pythonOlder "3.6"; - nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; - checkInputs = [ yosys symbiyosys yices ]; + checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; + # Fail b/c can't find sby (symbiyosys) executable, which should be on path. + disabledTests = [ + "test_distance" + "test_reversible" + "FIFOFormalCase" + ]; + meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; From 051ac12650176a113045c8616fda01a984e55aae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 9 Sep 2020 22:58:51 -0500 Subject: [PATCH 416/499] shadowsocks-rust: 1.8.16 -> 1.8.17 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 3fb34697da1d..e9e09e8cdffe 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.16"; + version = "1.8.17"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "09wncvy1cn8038xf8srz8y955xw9h59zh7avrh060wm50azrhlg5"; + sha256 = "1fl23q4hccwdapknj7yd8294jil15758k1r6ljbms2gijlly9lg3"; }; - cargoSha256 = "0n03dg1rrhlryap0dqqmmzhp49lxvhh3478z123x23fm04ygln44"; + cargoSha256 = "0jgzh9p6ziq3337461cj4fkbghks3bq8dnrn6ab8dkynjwvd47bx"; SODIUM_USE_PKG_CONFIG = 1; From 535896671b66d308df3ce467c94f8a9fecfdffea Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 10 Sep 2020 08:19:20 +0300 Subject: [PATCH 417/499] nixos/nginx: remove option enableSandbox --- nixos/doc/manual/release-notes/rl-2009.xml | 4 ++-- nixos/modules/services/web-servers/nginx/default.nix | 9 --------- nixos/tests/nginx-sandbox.nix | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8a2d15660180..cd6b8915dcea 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -427,8 +427,8 @@ php.override { - Add option services.nginx.enableSandbox to starting Nginx web server with additional sandbox/hardening options. - By default, write access to services.nginx.stateDir is allowed. To allow writing to other folders, + Nginx web server now starting with additional sandbox/hardening options. By default, write access + to services.nginx.stateDir is allowed. To allow writing to other folders, use systemd.services.nginx.serviceConfig.ReadWritePaths systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 975b56d47822..39bcb14e5afe 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -463,14 +463,6 @@ in ''; }; - enableSandbox = mkOption { - default = false; - type = types.bool; - description = '' - Starting Nginx web server with additional sandbox/hardening options. - ''; - }; - user = mkOption { type = types.str; default = "nginx"; @@ -728,7 +720,6 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; # Security NoNewPrivileges = true; - } // optionalAttrs cfg.enableSandbox { # Sandboxing ProtectSystem = "strict"; ProtectHome = mkDefault true; diff --git a/nixos/tests/nginx-sandbox.nix b/nixos/tests/nginx-sandbox.nix index bc9d3ba8add7..514318c9456c 100644 --- a/nixos/tests/nginx-sandbox.nix +++ b/nixos/tests/nginx-sandbox.nix @@ -18,7 +18,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { ]; services.nginx.enable = true; services.nginx.package = pkgs.nginx-lua; - services.nginx.enableSandbox = true; services.nginx.virtualHosts.localhost = { extraConfig = '' location /test1-write { From 9101eede6e7a3669813ed3c8de707db381f59f88 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 10 Sep 2020 05:40:38 +0000 Subject: [PATCH 418/499] Update pkgs/development/tools/knightos/mkrom/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël de Kok --- pkgs/development/tools/knightos/mkrom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix index 258f238fd6d9..380bdc58d49b 100644 --- a/pkgs/development/tools/knightos/mkrom/default.nix +++ b/pkgs/development/tools/knightos/mkrom/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KnightOS"; repo = "mkrom"; - rev = "${version}"; + rev = version; sha256 = "1nx3787gvs04xdvvamzkjkn9nmy2w70ja8dnh4szk420mvpc85na"; }; From 8a6f8043d21a893d755e35f99e8720fb4f48354d Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Thu, 10 Sep 2020 14:56:32 +0900 Subject: [PATCH 419/499] maintainers: add cohei --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3bc103427a58..584f7d174747 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1641,6 +1641,12 @@ githubId = 5561189; name = "Cody Opel"; }; + cohei = { + email = "a.d.xvii.kal.mai@gmail.com"; + github = "cohei"; + githubId = 3477497; + name = "TANIGUCHI Kohei"; + }; cohencyril = { email = "cyril.cohen@inria.fr"; github = "CohenCyril"; From b063ae1aa851f07e4939b2f75c2335466a2881fb Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Tue, 25 Feb 2020 08:01:49 +0900 Subject: [PATCH 420/499] cmigemo: init at 1.3e cmigemo is a tool that supports Japanese incremental search with Romaji. --- pkgs/tools/text/cmigemo/default.nix | 35 +++++++++++++++++++ .../text/cmigemo/no-http-tool-check.patch | 23 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/tools/text/cmigemo/default.nix create mode 100644 pkgs/tools/text/cmigemo/no-http-tool-check.patch diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix new file mode 100644 index 000000000000..c84299c68436 --- /dev/null +++ b/pkgs/tools/text/cmigemo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }: + +stdenv.mkDerivation { + pname = "cmigemo"; + version = "1.3e"; + + src = fetchFromGitHub { + owner = "koron"; + repo = "cmigemo"; + rev = "5c014a885972c77e67d0d17d367d05017c5873f7"; + sha256 = "0xrblwhaf70m0knkd5584iahaq84rlk0926bhdsrzmakpw77hils"; + }; + + nativeBuildInputs = [ gzip libiconv nkf perl which ]; + + postUnpack = '' + cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ + ''; + + patches = [ ./no-http-tool-check.patch ]; + + makeFlags = [ "INSTALL=install" ]; + + buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all"; + + installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; + + meta = with stdenv.lib; { + description = "A tool that supports Japanese incremental search with Romaji"; + homepage = "https://www.kaoriya.net/software/cmigemo"; + license = licenses.mit; + maintainers = [ maintainers.cohei ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/cmigemo/no-http-tool-check.patch b/pkgs/tools/text/cmigemo/no-http-tool-check.patch new file mode 100644 index 000000000000..518bfa0e6171 --- /dev/null +++ b/pkgs/tools/text/cmigemo/no-http-tool-check.patch @@ -0,0 +1,23 @@ +diff --git a/configure b/configure +index 4480261..2fb9b34 100755 +--- a/configure ++++ b/configure +@@ -28,18 +28,6 @@ do + esac + done + +-# Check HTTP access tool +-if CHECK_COMMAND curl ; then +- PROGRAM_HTTP="curl -O" +-elif CHECK_COMMAND wget ; then +- PROGRAM_HTTP="wget" +-elif CHECK_COMMAND fetch ; then +- PROGRAM_HTTP="fetch" +-else +- echo "ERROR: Require one of HTTP access tools (curl, wget or fetch)." +- exit 1 +-fi +- + # Check encoding filter + if CHECK_COMMAND qkc ; then + PROGRAM_ENCODEFILTER="qkc -q -u" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5bc95bbe578..f254f56027db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2702,6 +2702,8 @@ in citra = libsForQt5.callPackage ../misc/emulators/citra { }; + cmigemo = callPackage ../tools/text/cmigemo { }; + cmst = libsForQt5.callPackage ../tools/networking/cmst { }; cmt = callPackage ../applications/audio/cmt {}; From 6847084284dc3b70acc3688ee090282f35751057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Sep 2020 08:41:58 +0200 Subject: [PATCH 421/499] knot-dns: libbpf is Linux-only I should've noticed before pushing; I'm sorry. --- pkgs/servers/dns/knot-dns/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 27f1ca12aacb..3ebb31e20f24 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -34,13 +34,15 @@ stdenv.mkDerivation rec { gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl - libbpf # XDP support nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) # without sphinx &al. for developer documentation # TODO: add dnstap support? ] - ++ optionals stdenv.isLinux [ libcap_ng systemd ] + ++ optionals stdenv.isLinux [ + libcap_ng systemd + libbpf # XDP support + ] ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; From 67b4880faa39b71356c6a085d4addce61a4f454d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 10 Aug 2020 23:24:20 +0200 Subject: [PATCH 422/499] inkscape: introduce a way to add external extensions Co-Authored-By: Stefan Siegl --- .../graphics/inkscape/with-extensions.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/graphics/inkscape/with-extensions.nix diff --git a/pkgs/applications/graphics/inkscape/with-extensions.nix b/pkgs/applications/graphics/inkscape/with-extensions.nix new file mode 100644 index 000000000000..cca7b1fc3a54 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/with-extensions.nix @@ -0,0 +1,21 @@ +{ lib +, inkscape +, symlinkJoin +, makeWrapper +, inkscapeExtensions ? [] +}: + +symlinkJoin { + name = "inkscape-with-extensions-${lib.getVersion inkscape}"; + + paths = [ inkscape ] ++ inkscapeExtensions; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + rm -f $out/bin/inkscape + makeWrapper "${inkscape}/bin/inkscape" "$out/bin/inkscape" --set INKSCAPE_DATADIR "$out/share" + ''; + + inherit (inkscape) meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b0985e78393..658e7f38e9ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20927,6 +20927,8 @@ in lcms = lcms2; }; + inkscape-with-extensions = callPackage ../applications/graphics/inkscape/with-extensions.nix { }; + inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { lcms = lcms2; }; From fb5a153c268327f6137212d6b05a0c0bc5de2ab1 Mon Sep 17 00:00:00 2001 From: William Kral Date: Wed, 9 Sep 2020 17:56:36 -0700 Subject: [PATCH 423/499] jwt-cli: fix build --- pkgs/tools/security/jwt-cli/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index be3de71f25ca..23c25accc930 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "jwt-cli"; @@ -13,6 +13,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; + patches = [ + # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` + (fetchpatch { + url = "https://github.com/mike-engel/jwt-cli/commit/df87111f3084abdecce5d58ad031edb6e7fef94a.patch"; + sha256 = "1vjk7wy8ddkz9wjkiayag61gklrq59m7bwlaiyinjp4n15gx0j1k"; + }) + ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { From c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f Mon Sep 17 00:00:00 2001 From: Milan Date: Thu, 10 Sep 2020 09:28:30 +0200 Subject: [PATCH 424/499] qutebrowser: use qt515 (#97586) --- pkgs/top-level/all-packages.nix | 7 ++++++- pkgs/top-level/python-packages.nix | 7 ++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f254f56027db..ae19e77cadb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22776,7 +22776,12 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { + python3Packages = python3Packages.override { + qt5 = qt515; + libsForQt5 = libsForQt515; + }; + }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71723b1b2d87..610e50fe84d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,16 +9,13 @@ { pkgs , stdenv , python +, qt5 +, libsForQt5 , overrides ? (self: super: {}) }: with pkgs.lib; -let - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; -in - let packages = ( self: From 1db7f6459758314b3c9a46652b438c40c916ee92 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Wed, 9 Sep 2020 18:12:14 +0200 Subject: [PATCH 425/499] traefik: build with go 1.14 See containous/traefik#7234, containous/traefik#7169 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4caf98bd192..51926876ff82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1511,7 +1511,10 @@ in caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614 caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; }; - traefik = callPackage ../servers/traefik { }; + + # Traefik 2.2 uses go1.14, pinning can be removed with 2.3 + # https://github.com/containous/traefik/issues/7234#issuecomment-684950612 + traefik = callPackage ../servers/traefik { buildGoModule = buildGo114Module; }; calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; From 3d08e8947d43c65499357af1fcd5a2ab9d9d2dc6 Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Wed, 9 Sep 2020 19:05:05 +0200 Subject: [PATCH 426/499] traefik: fix passing build flags --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index b1f6fbbeeb7a..b18530f8c09e 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -26,9 +26,9 @@ buildGoModule rec { CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - makeFlagsArray+=("-ldflags=\ - -X github.com/containous/traefik/version.Version=${version} \ - -X github.com/containous/traefik/version.Codename=$CODENAME") + buildFlagsArray+=("-ldflags=\ + -X github.com/containous/traefik/v2/pkg/version.Version=${version} \ + -X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME") ''; meta = with stdenv.lib; { From 422f3f2f4c98aea647003b777ae6e37448613de2 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 10 Sep 2020 10:35:48 +0200 Subject: [PATCH 427/499] kops_1_17: 1.17.1 -> 1.17.2 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index d751c8ca18e8..af20e7a3cd0b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -57,8 +57,8 @@ in rec { }; kops_1_17 = mkKops { - version = "1.17.1"; - sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h"; + version = "1.17.2"; + sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz"; }; kops_1_18 = mkKops rec { From c524f8b574fc7e7223adc428b605611ab528ad9b Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 10 Sep 2020 10:42:51 +0200 Subject: [PATCH 428/499] kops_1_18: 1.18.0 -> 1.18.1 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index af20e7a3cd0b..7bcc97c73921 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ in rec { }; kops_1_18 = mkKops rec { - version = "1.18.0"; - sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh"; + version = "1.18.1"; + sha256 = "0jw23vmq2v9czxyansggq4fapz1bcaclmxpw6na4dsn8zcssz320"; rev = "v${version}"; }; } From 656915d250b83baa3955ce3bc7692109630f9cdd Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 10 Sep 2020 10:47:24 +0200 Subject: [PATCH 429/499] kops: Add meta.changelog --- .../applications/networking/cluster/kops/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 7bcc97c73921..baf10e273fb7 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: - let goPackagePath = "k8s.io/kops"; - generic = { version, sha256, rev ? version, ...}@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in - buildGoPackage { + generic = { version, sha256, rev ? version, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "rev" ]; in + buildGoPackage + { pname = "kops"; inherit version; @@ -42,12 +42,14 @@ let meta = with stdenv.lib; { description = "Easiest way to get a production Kubernetes up and running"; homepage = "https://github.com/kubernetes/kops"; + changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; maintainers = with maintainers; [ offline zimbatm kampka ]; platforms = platforms.unix; }; } // attrs'; -in rec { +in +rec { mkKops = generic; From 5198ec411389b29d2b3f51a0d4cfd3d0ee606cc0 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 10 Sep 2020 10:55:43 +0200 Subject: [PATCH 430/499] CODEOWNERS: add stigtsp to perl --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 19b9ad57933c..556dcd770ca6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -83,9 +83,9 @@ /pkgs/development/haskell-modules/hoogle.nix @cdepillabout # Perl -/pkgs/development/interpreters/perl @volth -/pkgs/top-level/perl-packages.nix @volth -/pkgs/development/perl-modules @volth +/pkgs/development/interpreters/perl @volth @stigtsp +/pkgs/top-level/perl-packages.nix @volth @stigtsp +/pkgs/development/perl-modules @volth @stigtsp # R /pkgs/applications/science/math/R @peti From 5e3ec7ea1e760ba52c30ea8da5bf0bd8b61d308b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 10 Sep 2020 11:00:15 +0200 Subject: [PATCH 431/499] weather: Use scoped variable to increase readability Signed-off-by: Matthias Beyer --- pkgs/applications/misc/weather/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 9b6289d70826..a41a080771f4 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with stdenv.lib; { homepage = "http://fungi.yuggoth.org/weather"; description = "Quick access to current weather conditions and forecasts"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; # my only platform + license = licenses.isc; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; # my only platform }; } From 67871eed1d2b4bfc7d281be107ed47c6a2814ce8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 10 Sep 2020 11:01:02 +0200 Subject: [PATCH 432/499] weather: 2.4 -> 2.4.1 Signed-off-by: Matthias Beyer --- pkgs/applications/misc/weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index a41a080771f4..f44b5f1f56a3 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.4"; + version = "2.4.1"; pname = "weather"; src = fetchurl { url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "084f0am0s1h6y71wgja9acaaxp0mq6k74b6ad4b5wpk2znwv0rzz"; + sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys"; }; nativeBuildInputs = [ pythonPackages.wrapPython ]; From 3ea949714d9876448becb4ba3a9c06ed0de3f961 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Sep 2020 15:45:57 +0200 Subject: [PATCH 433/499] cargo-c: 0.6.7 -> 0.6.13 --- pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 44ebcc63c878..ce01fc1f00c6 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.6.7"; + version = "0.6.13"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0n52xh4qg12bvvp2dgx5wfj5f31qijdqahasa3qfa3c3aqq7cvvg"; + sha256 = "0ks2w3gclahidv6r6i0d0d6sli7r8wabxzgmhq03czy5w7kr0x56"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0296187hsaxxmqhsrrva4qf313jwh3z08j1vxcbislxdq8xg32qb"; + sha256 = "0czy5q8hkjqyn53p7cjxnxfgwygx2a6casjb4nj5gxss2x3haih6"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1gwyszpcmss2d0lm5hvf3b48jy7b0fm7xizhrl3wd6rzw7pg06zd"; + cargoSha256 = "0jjkcawcz6wacx22zir9ay1qsi5ffk7c4gwa6jpky4a94zr1h690"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From ae0221e4d00107d7afc8fae96d25590835c1913c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 9 Sep 2020 15:48:09 +0200 Subject: [PATCH 434/499] rav1e: 0.3.3 -> 0.3.4 --- pkgs/tools/video/rav1e/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index f883c423d010..ae7a45b562d9 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "xiph"; repo = "rav1e"; rev = "v${version}"; - sha256 = "0a9dryag4x35a2c45qiq1j5xk9ydcpw1g6kici85d2yrc2z3hwrx"; + sha256 = "0zwjg0sv504i1ahzfy2jgng6qwmyvcrvdrp4n3s90r4kvwjkv8xs"; }; - cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3"; + cargoSha256 = "1mfzshcbxky27nskxhcyrj99wd3v5f597ymgv7nb67lzp5lsyb24"; nativeBuildInputs = [ nasm cargo-c ]; From ceb3acfa8b67ca1c4b255da7db96af972ccbe64e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 10 Sep 2020 12:01:01 +0200 Subject: [PATCH 435/499] chromium: update.py: Keep the channel order consistent This makes Git diffs way easier to read. Using sort_keys=True is usually better but with this implementation the output is a bit nicer to read IMO. --- .../networking/browsers/chromium/update.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 0a0d512004b5..bfc7f0d2478c 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -4,9 +4,11 @@ import csv import json import subprocess +import sys + from codecs import iterdecode +from collections import OrderedDict from os.path import abspath, dirname -from sys import stderr from urllib.request import urlopen HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' @@ -27,7 +29,7 @@ def nix_prefetch_url(url, algo='sha256'): channels = {} last_channels = load_json(JSON_PATH) -print(f'GET {HISTORY_URL}', file=stderr) +print(f'GET {HISTORY_URL}', file=sys.stderr) with urlopen(HISTORY_URL) as resp: builds = csv.DictReader(iterdecode(resp, 'utf-8')) for build in builds: @@ -59,5 +61,17 @@ with urlopen(HISTORY_URL) as resp: channels[channel_name] = channel with open(JSON_PATH, 'w') as out: - json.dump(channels, out, indent=2) + def get_channel_key(item): + channel_name = item[0] + if channel_name == 'stable': + return 0 + elif channel_name == 'beta': + return 1 + elif channel_name == 'dev': + return 2 + else: + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) + sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) + json.dump(sorted_channels, out, indent=2) out.write('\n') From e249baca2294cb1644535f1b6b05bca54593256c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 10 Sep 2020 12:04:49 +0200 Subject: [PATCH 436/499] chromiumDev: M86 -> M87 --- .../networking/browsers/chromium/default.nix | 11 +++++++++++ .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1c811acd2547..7f5378e2b199 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -55,6 +55,17 @@ let sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { + llvmPackages = llvmPackages_11; + useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-08-17"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; + sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; + }; + }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 76c384114a9e..dae7f741b357 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -5,13 +5,13 @@ "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" }, "beta": { - "version": "86.0.4240.22", - "sha256": "1qxacdwknrjwfp44mnqmq24n8sw4yaf0d1qnz39km2m4apc39svp", - "sha256bin64": "05qdzkq9daqjliqj7zxsa03903rv3kwaj627192ls6m33bacz9gp" + "version": "86.0.4240.30", + "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", + "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" }, "dev": { - "version": "86.0.4240.8", - "sha256": "1x0kbc7xp6599jyn461mbmchbixivnxm0jsyfq0snhxz8x81z55q", - "sha256bin64": "0y7drzxxfn0vmfq0m426l8xvkgyajb8pjydi0d7kzk6i92sjf45j" + "version": "87.0.4252.0", + "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", + "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" } } From 6623aac94635324b54ad80327c5883896f4d519c Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 10 Sep 2020 13:09:33 +0200 Subject: [PATCH 437/499] gitAndTools.rs-git-fsmonitor: init at 0.1.3 (#96574) --- .../git-and-tools/default.nix | 2 ++ .../rs-git-fsmonitor/default.nix | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 657ae4605eb0..765c2157a22e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -211,6 +211,8 @@ let qgit = qt5.callPackage ./qgit { }; + rs-git-fsmonitor = callPackage ./rs-git-fsmonitor { }; + scmpuff = callPackage ./scmpuff { }; stgit = callPackage ./stgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix b/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix new file mode 100644 index 000000000000..6968508f8c9a --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/rs-git-fsmonitor/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, makeWrapper +, watchman +}: + +rustPlatform.buildRustPackage rec { + pname = "rs-git-fsmonitor"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "jgavris"; + repo = pname; + rev = "v${version}"; + sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc"; + }; + + cargoSha256 = "0kfj09xq1g866507k3gcbm30pyi1xzfr7gca6dab7sjlvf83h9xs"; + + nativeBuildInputs = [ makeWrapper ]; + + fixupPhase = '' + wrapProgram $out/bin/rs-git-fsmonitor --prefix PATH ":" "${lib.makeBinPath [ watchman ]}" ; + ''; + + meta = with lib; { + description = "A fast git core.fsmonitor hook written in Rust"; + homepage = "https://github.com/jgavris/rs-git-fsmonitor"; + license = licenses.mit; + maintainers = [ maintainers.SuperSandro2000 ]; + }; +} From 80f10fd1c34c75cf6cecf5a7e257653177667887 Mon Sep 17 00:00:00 2001 From: sohalt Date: Thu, 10 Sep 2020 14:50:57 +0200 Subject: [PATCH 438/499] maintainers: add sohalt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce853b8b587b..e772f3c366dd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7853,6 +7853,12 @@ githubId = 3371635; name = "Salar Rahmanian"; }; + sohalt = { + email = "nixos@sohalt.net"; + github = "sohalt"; + githubId = 2157287; + name = "sohalt"; + }; solson = { email = "scott@solson.me"; github = "solson"; From 1c8a1b220e1c5c529c2488511a3dd046085ffc3a Mon Sep 17 00:00:00 2001 From: sohalt Date: Wed, 9 Sep 2020 15:29:05 +0200 Subject: [PATCH 439/499] mpdscribble: 0.22 -> 0.23 --- pkgs/tools/misc/mpdscribble/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 49f9c6bc0313..b3665bb6dcf1 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; - version = "0.22"; + version = "0.23"; src = fetchurl { url = - "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; - sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; + sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib curl glib ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; meta = with stdenv.lib; { - description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)"; homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ maintainers.sohalt ]; platforms = platforms.linux; }; } From 213623e2911da27800a9c44e6f360082e89650fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 10 Sep 2020 12:23:11 +0200 Subject: [PATCH 440/499] nagios: fix build The compiler complains about dl* function missing, this commit adds the necessary flag to pass to gcc to make it build correctly --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/monitoring/nagios/default.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 584f7d174747..4fda49dfa06c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3553,6 +3553,12 @@ githubId = 993484; name = "Greg Hale"; }; + immae = { + email = "ismael@bouya.org"; + github = "immae"; + githubId = 510202; + name = "Ismaël Bouya"; + }; imuli = { email = "i@imu.li"; github = "imuli"; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index b8246c27b47d..12957f6d1bb5 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = [ "all" ]; + CFLAGS = "-ldl"; # Do not create /var directories preInstall = '' @@ -36,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nagios.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; + maintainers = with stdenv.lib.maintainers; [ immae thoughtpolice relrod ]; }; } From 2120ad1dc699c4eb2d6ebea939fb9c97afdb7e91 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 10 Sep 2020 16:43:18 +0300 Subject: [PATCH 441/499] tectonic: 0.1.12 -> 0.1.15 --- pkgs/tools/typesetting/tectonic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 3b9c0581ecac..23432e1d460a 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.1.12"; + version = "0.1.15"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; - rev = "v${version}"; - sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9"; + rev = "tectonic@${version}"; + sha256 = "0pzhdfsi4jsj9p5cv8ia4kc4inl7q7jsw694dfyxkcpka6ywyzsh"; }; - cargoSha256 = "1axrf7d01gmhvrap13rydfvwcsg0lk1zw7z1i7zzm898bc7c02qn"; + cargoSha256 = "017f1f49svx4inyv6xjx31lnb7dbl6gzwrrzpfz1gimqvdj2gm6j"; nativeBuildInputs = [ pkgconfig ]; From c640e0688b2279ef58144f77a4882473b7aba7e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:22:56 -0400 Subject: [PATCH 442/499] linux: 4.14.196 -> 4.14.197 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 05fc466f0f97..25cc9ac3d32f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.196"; + version = "4.14.197"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "16mhqymwkgqi8zalcij5c754smc8ysvfw6l2cwshr4scipsv4qay"; + sha256 = "029h46yki2hxdbn7afmnf3yar1pnwrpszx76irsa5mf8gnrasyp0"; }; } // (args.argsOverride or {})) From 2b2376b6fa3d4553933d922e05320f7a184d7699 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:07 -0400 Subject: [PATCH 443/499] linux: 4.19.143 -> 4.19.144 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c683b222f0c7..5270372418b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.143"; + version = "4.19.144"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "1383yfwb962mhn25b3b3zqrwnpyp01g5xclsv14wra0fdz33ahra"; + sha256 = "0jnj65bdy5y9lcj5zhrn4iaszpww8z41ac66j00l75sd931l1g9k"; }; } // (args.argsOverride or {})) From 71bfcebbc21b05dfc427ce9f3b6bf7d7971a8766 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:15 -0400 Subject: [PATCH 444/499] linux: 5.4.63 -> 5.4.64 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 89fcf2f6429f..9ba456bfcfd0 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.63"; + version = "5.4.64"; # 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 = "1h7zlzylxql2v6hyi6g141kj5r3frk2xk6i8lfqn64d01np0s9p0"; + sha256 = "1vymhl6p7i06gfgpw9iv75bvga5sj5kgv46i1ykqiwv6hj9w5lxr"; }; } // (args.argsOverride or {})) From 2f88ac4ba9982297dd9d8ff8c3076ad9cbeefd03 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:23 -0400 Subject: [PATCH 445/499] linux: 5.8.7 -> 5.8.8 --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 5c5f8259406c..2855f0201306 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.7"; + version = "5.8.8"; # 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 = "1zhpzlhl2ykna2nc70m72wlgyv1pkvkpfssb4k8p5pwlkh1ga2vv"; + sha256 = "0xm901zvvrwsb9k88la6pb65nybi43bygiyz1z68njwsx6ripxik"; }; } // (args.argsOverride or {})) From 46f7ee04743163359e8d41a8993c02d08a9d454a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:46 -0400 Subject: [PATCH 446/499] linux/hardened/patches/4.14: 4.14.196.a -> 4.14.197.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 02330f59b506..d26cd7e34a10 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.196.a.patch", - "sha256": "0z96y39zghadbzcwnlj588652mfsqs0vdyvx25794y8yl77z6lnl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.196.a/linux-hardened-4.14.196.a.patch" + "name": "linux-hardened-4.14.197.a.patch", + "sha256": "171bgi7pw64v8byqmplafnyx26h1yrxhci9b12ndjyfg91fkhw31", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.197.a/linux-hardened-4.14.197.a.patch" }, "4.19": { "name": "linux-hardened-4.19.143.a.patch", From 86933fba8051a41420eef0b41ca4985b93c73f85 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:48 -0400 Subject: [PATCH 447/499] linux/hardened/patches/4.19: 4.19.143.a -> 4.19.144.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d26cd7e34a10..6a30e6272ab0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.197.a/linux-hardened-4.14.197.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.143.a.patch", - "sha256": "0g5x1arpz2ac7q5m0xyd90frnzmgl96vc7lvshki2s86nn8lwcig", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.143.a/linux-hardened-4.19.143.a.patch" + "name": "linux-hardened-4.19.144.a.patch", + "sha256": "0vs48h3zcir6s72rnvkjxvjl6cscfaigwji00q940v7lgqyq8lvl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" }, "5.4": { "name": "linux-hardened-5.4.63.a.patch", From aa9b48747b2d4ccacd5e0b811aaa57ccc621c746 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:50 -0400 Subject: [PATCH 448/499] linux/hardened/patches/5.4: 5.4.63.a -> 5.4.64.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6a30e6272ab0..88c04ced4615 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.63.a.patch", - "sha256": "0vafplb73ysyqwikil5gl4ipvlhgb8n94qvzbgg8bjv78nk99lm0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.63.a/linux-hardened-5.4.63.a.patch" + "name": "linux-hardened-5.4.64.a.patch", + "sha256": "1wkkvs66bmgqvgy1iqjck0c0mdad8lnwl42n5npw4ynjhfgiwp3b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.64.a/linux-hardened-5.4.64.a.patch" }, "5.7": { "name": "linux-hardened-5.7.19.a.patch", From 505ff0526e00df3da558ab0da59085752b97a5fd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:23:52 -0400 Subject: [PATCH 449/499] linux/hardened/patches/5.8: 5.8.7.a -> 5.8.8.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 88c04ced4615..eacebab1cffa 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.7.a.patch", - "sha256": "13l486lyj9wm1v3gvrwpqbr3z3ps63qwx64ykh982mrv9bkrn1ia", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.7.a/linux-hardened-5.8.7.a.patch" + "name": "linux-hardened-5.8.8.a.patch", + "sha256": "0nm6k8mb51wwwpmb65ragdkxrvljr3dxslaad3l4x0d0yah4d93z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.8.a/linux-hardened-5.8.8.a.patch" } } From edc18966fa94b0aaeec62c5f0c4881a2053e0468 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:25:34 -0400 Subject: [PATCH 450/499] oh-my-zsh: 2020-09-04 -> 2020-09-09 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index b236c848e14e..57ab86d4a27a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-04"; + version = "2020-09-09"; pname = "oh-my-zsh"; - rev = "708ea42384d378343a590fc34a3dee536a1651df"; + rev = "3667f94538c24ebaa9abd46e797a2610f3b67c5e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1gcpqwzqfaaa4fkyfk5gik6k9fwk8mwyp80xqin1zizaaz8vzr23"; + sha256 = "1pa4240rhxj5gi5m63xi5wm8b91pzpzsmqp72mqd9b394bgsd3wy"; }; installPhase = '' From bc0dd710e5e2eb9a9652c18fb53e985033e5cd63 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Sep 2020 09:25:36 -0400 Subject: [PATCH 451/499] jenkins: 2.235.5 -> 2.249.1 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 8723ca2b443f..310755fb5324 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.235.5"; + version = "2.249.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "02zpnqhdkhg8p8cddkqklgihjpwcbnybkcw5rspipz6kiyqzg1n7"; + sha256 = "1mjvxl48v0rdrs6hzwh4mx5xvx3lnqs6njx3d7nfdfp2nf2s9353"; }; buildCommand = '' From b4756fe0c473f40f337c2c7d1059a5de5d47e181 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 10 Sep 2020 16:51:28 +0300 Subject: [PATCH 452/499] nixos/mpd: Mention in /etc/mpd.conf it was autogenerated --- nixos/modules/services/audio/mpd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 9e77ee85b893..ba20b1b98d97 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -11,6 +11,10 @@ let cfg = config.services.mpd; mpdConf = pkgs.writeText "mpd.conf" '' + # This file was automatically generated by NixOS. Edit mpd's configuration + # via NixOS' configuration.nix, as this file will be rewritten upon mpd's + # restart. + music_directory "${cfg.musicDirectory}" playlist_directory "${cfg.playlistDirectory}" ${lib.optionalString (cfg.dbFile != null) '' From 213feab38ab6d6d0af036705a81c8abf50c7476f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 10 Sep 2020 17:11:26 +0200 Subject: [PATCH 453/499] mlton: use $TMPDIR --- pkgs/development/compilers/mlton/from-git-source.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index dc5862e6e3d8..ec0b96bbf23a 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { preBuild = '' find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" + sed -i "s|/tmp|$TMPDIR|" bin/regression makeFlagsArray=( MLTON_VERSION="${version} ${rev}" From 336ce7a797ecab930b0218f4a4d3da4cdf140ca0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 10 Sep 2020 17:13:49 +0200 Subject: [PATCH 454/499] python3.pkgs.fastparquet: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 46c6cfb06caf..0a52d89df5ad 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -3,13 +3,13 @@ thrift, pytest, python-snappy, lz4, zstd }: buildPythonPackage rec { pname = "fastparquet"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "0y89gmcfylxqm8rs1fbirwjzmhcvlfx8fhvkm3ssbj1ivfd5mdlr"; + sha256 = "ViZRGEv227/RgCBYAQN8F3Z0m8WrNUT5KUdyFosjg9s="; }; postPatch = '' From 3bdf44875a656cc3276560d1bf80f5e0ac10ddc0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:05:14 -0500 Subject: [PATCH 455/499] plasma-workspace: remove dependency on qtbase.dev --- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 2c4287f8edf7..8df146068cf2 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -48,6 +48,11 @@ mkDerivation { ./0002-absolute-wallpaper-install-dir.patch ]; + postPatch = '' + substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \ + --replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus + ''; + NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' From ca5687c4dd25feac7ac264c1b27c15339dd1ffd2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 8 Sep 2020 05:29:19 -0500 Subject: [PATCH 456/499] appstream-qt: multiple outputs --- pkgs/development/libraries/appstream/qt.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 22f1566ad0ac..c9fc96b32512 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,17 +1,24 @@ -{ stdenv, appstream, qtbase, qttools }: +{ stdenv, mkDerivation, appstream, qtbase, qttools }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation { +mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; + outputs = [ "out" "dev" ]; + buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ]; mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + postFixup = '' + sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ + -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" + ''; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; From 58b66c0dcb7e4e720360fac85ed99ca30a3723ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 10 Sep 2020 17:45:09 +0200 Subject: [PATCH 457/499] postgresqlPackages.age: fix build The build broke by a recent bison update. Use bison_3_5. --- pkgs/servers/sql/postgresql/packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 6dbb7a8ed11a..d45c2d37c8db 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -1,6 +1,8 @@ self: super: { - age = super.callPackage ./ext/age.nix { }; + age = super.callPackage ./ext/age.nix { + bison = self.bison_3_5; + }; periods = super.callPackage ./ext/periods.nix { }; From 3d75e5d5eccad7fd37b167fefcb4d60e95fd164e Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 11 Sep 2020 00:10:05 +0800 Subject: [PATCH 458/499] go-ethereum: 1.9.20 -> 1.9.21 --- pkgs/applications/blockchains/go-ethereum.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 5c3f22076434..6952d469adbd 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.20"; + version = "1.9.21"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "031cbl8yqw5g5yrm5h1x8s5ckdw2xkym46009l579zvafn2vcnj7"; + sha256 = "0mr5pw08jka11lzgl28555nb90cqxx9vlqd1plfmyic6rb5z11df"; }; runVend = true; - vendorSha256 = "1744df059bjksvih4653nnvb4kb1xvzdhypd0nnz36m1wrihqssv"; + vendorSha256 = "155hmny3543h02ryn1nnlpmvs0qvhd0lb66vmkhw5351m6gkbx7x"; doCheck = false; @@ -31,7 +31,6 @@ buildGoModule rec { "cmd/puppeth" "cmd/rlpdump" "cmd/utils" - "cmd/wnode" ]; # Fix for usb-related segmentation faults on darwin From 6e72633c4202e1a22bbd0d3d7950e92e6de73f1d Mon Sep 17 00:00:00 2001 From: marius david Date: Thu, 10 Sep 2020 10:00:38 +0200 Subject: [PATCH 459/499] libreoffice-qt: fix compilation --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae19e77cadb8..5d43bc8d13a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21544,6 +21544,7 @@ in (libreoffice-args // { kdeIntegration = true; variant = "fresh"; + jdk = jdk11; }); }); From 0cad09a68a6959ab5d304d23a54a3a4f29b22fab Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:50:59 +0100 Subject: [PATCH 460/499] docs/rust: fix typo Co-authored-by: Drew --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 6c51da87cab3..7f9d93216ed9 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { `buildRustPackage` requires a `cargoSha256` attribute which is computed over all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct -checksum can be then take from the failed build. +checksum can then be taken from the failed build. Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) best practices guide, Rust applications should always commit the `Cargo.lock` From ec49caa0b0a07c9d89a961a2a9211024de0ea8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Sep 2020 19:57:21 +0200 Subject: [PATCH 461/499] nixos release notes: fixup build after #96991 --- nixos/doc/manual/release-notes/rl-2009.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8a2d15660180..87eeadbe13a6 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -902,8 +902,10 @@ CREATE ROLE postgres LOGIN SUPERUSER; + The installer now enables sshd by default. This improves installation on headless machines especially ARM single-board-computer. To login through ssh, either a password or an ssh key must be set for the root user or the nixos user. + From 2e0a15fce1780ccd74e023a59b7f23a4f47fa666 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 10 Aug 2020 23:30:04 +0200 Subject: [PATCH 462/499] inkscape-extensions.hexmap: init at 2020-06-06 --- .../graphics/inkscape/extensions.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/graphics/inkscape/extensions.nix diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix new file mode 100644 index 000000000000..66a758f9fe51 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +}: + +{ + hexmap = stdenv.mkDerivation { + name = "hexmap"; + version = "2020-06-06"; + + src = fetchFromGitHub { + owner = "lifelike"; + repo = "hexmapextension"; + rev = "11401e23889318bdefb72df6980393050299d8cc"; + sha256 = "1a4jhva624mbljj2k43wzi6hrxacjz4626jfk9y2fg4r4sga22mm"; + }; + + preferLocalBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/inkscape/extensions" + cp -p *.inx *.py "$out/share/inkscape/extensions/" + find "$out/share/inkscape/extensions/" -name "*.py" -exec chmod +x {} \; + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "This is an extension for creating hex grids in Inkscape. It can also be used to make brick patterns of staggered rectangles"; + homepage = "https://github.com/lifelike/hexmapextension"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raboof ]; + platforms = platforms.all; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 658e7f38e9ab..6448719aabfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20929,6 +20929,8 @@ in inkscape-with-extensions = callPackage ../applications/graphics/inkscape/with-extensions.nix { }; + inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); + inkscape_0 = callPackage ../applications/graphics/inkscape/0.x.nix { lcms = lcms2; }; From 18f0fdce61f7768b7c794f94421792a9ee8e7b03 Mon Sep 17 00:00:00 2001 From: Sohalt Date: Thu, 10 Sep 2020 20:34:44 +0200 Subject: [PATCH 463/499] picoloop: init at 0.77e (#92269) --- pkgs/applications/audio/picoloop/default.nix | 50 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/audio/picoloop/default.nix diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix new file mode 100644 index 000000000000..1dc9c70af87b --- /dev/null +++ b/pkgs/applications/audio/picoloop/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }: + +stdenv.mkDerivation rec { + pname = "picoloop"; + version = "0.77e"; + + src = fetchFromGitHub { + repo = pname; + owner = "yoyz"; + rev = "${pname}-${version}"; + sha256 = "0i8j8rgyha3ara6d4iis3wcimszf2csxdwrm5yq0wyhg74g7cvjd"; + }; + + buildInputs = [ + libpulseaudio + SDL2 + SDL2.dev + SDL2_image + SDL2_ttf + alsaLib + libjack2 + ]; + + sourceRoot = "source/picoloop"; + + makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; + + NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ]; + + hardeningDisable = [ "format" ]; + + patchPhase = '' + substituteInPlace SDL_GUI.cpp \ + --replace "\"font.ttf\"" "\"$out/share/font.ttf\"" \ + --replace "\"font.bmp\"" "\"$out/share/font.bmp\"" + ''; + + installPhase = '' + mkdir -p $out/{bin,share} + cp PatternPlayer_debian_RtAudio_sdl20 $out/bin/picoloop + cp {font.*,LICENSE} $out/share + ''; + + meta = with stdenv.lib; { + description = "Picoloop is a synth and a stepsequencer (a clone of the famous nanoloop)."; + homepage = "https://github.com/yoyz/picoloop"; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f10a4490282b..71a8e0c83688 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22486,6 +22486,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + picoloop = callPackage ../applications/audio/picoloop { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if config.pidgin.openssl or true then openssl else null; gnutls = if config.pidgin.gnutls or false then gnutls else null; From b32701bc5404ae37cfa01429962588b833913d7d Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Thu, 10 Sep 2020 20:10:30 +0200 Subject: [PATCH 464/499] nixos/systemd-boot: Temporarily ignore errors This is a temporary fix for #97433. A more proper fix has been implemented upstream in systemd/systemd#17001, however until it gets backported, we are stuck with ignoring the error. After the backport lands, this commit should be reverted. --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 97e824fe629c..65c7b825f855 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -200,7 +200,9 @@ def main(): else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] - sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) + # Ideally this should use check_output as well, but as a temporary + # work-around for #97433 we ignore any errors. + sdboot_status = subprocess.run(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True, stdout=subprocess.PIPE).stdout # See status_binaries() in systemd bootctl.c for code which generates this m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$", From b8e0f0cd723acab5cac53e72e704369bcb0c6474 Mon Sep 17 00:00:00 2001 From: Ted Reed Date: Wed, 9 Sep 2020 21:40:28 -0700 Subject: [PATCH 465/499] rpm: add openmp when building with clang The Darwin build has been broken with a missing header file "omp.h"; llvmPackages.openmp provides it. Including this library is only necessary when clang is used. --- pkgs/tools/package-management/rpm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index fee282de52fc..8acf57570d7c 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , pkgconfig, autoreconfHook -, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua +, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages }: stdenv.mkDerivation rec { @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] From 2e69b42a816ce259416da462ccedfd345ad5cc25 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 14 Aug 2019 17:59:35 +0000 Subject: [PATCH 466/499] wyvern: init at 1.4.1 --- pkgs/games/wyvern/cargo-lock.patch | 2514 ++++++++++++++++++++++++++++ pkgs/games/wyvern/default.nix | 36 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 2552 insertions(+) create mode 100644 pkgs/games/wyvern/cargo-lock.patch create mode 100644 pkgs/games/wyvern/default.nix diff --git a/pkgs/games/wyvern/cargo-lock.patch b/pkgs/games/wyvern/cargo-lock.patch new file mode 100644 index 000000000000..89b2517e26de --- /dev/null +++ b/pkgs/games/wyvern/cargo-lock.patch @@ -0,0 +1,2514 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..8be5b39 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2508 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "adler32" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "argon2rs" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bit-set" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2-rfc" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "build_const" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "butlerd" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "byteorder" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bzip2" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bzip2-sys" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap-verbosity-flag" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clicolors-control" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cloudabi" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "confy" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "directories 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "console" ++version = "0.7.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cookie" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cookie" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cookie_store" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cookie_store" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crc" ++version = "1.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "curl-sys 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dialoguer" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "directories" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "eidolon" ++version = "1.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "encode_unicode" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.5.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "futf" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "futures" ++version = "0.1.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "futures-cpupool" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gog" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "select 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "user_agent 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "h2" ++version = "0.1.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "html5ever" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "http" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "human-panic" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "humantime" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hyper" ++version = "0.12.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "indicatif" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inflate" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libflate" ++version = "0.1.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "markup5ever" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memoffset" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime" ++version = "0.3.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mime_guess" ++version = "2.0.0-alpha.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miniz_oxide_c_api" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio" ++version = "0.6.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nodrop" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-traits" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "number_prefix" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl" ++version = "0.10.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "os_type" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "owning_ref" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "phf" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_codegen" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.7.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "podio" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "publicsuffix" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "quote" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.3.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_isaac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_jitter" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_os" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_xorshift" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "reqwest" ++version = "0.9.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rle-decode-fast" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "scoped_threadpool" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "security-framework" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "select" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.98" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.98" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "smallvec" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "socket2" ++version = "0.3.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "string" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "string_cache" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "string_cache_codegen" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "string_cache_shared" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "structopt" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "0.15.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "take_mut" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tendril" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termios" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-buf" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-current-thread" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-executor" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-io" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-reactor" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-sync" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-tcp" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-threadpool" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tokio-timer" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "try_from" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ucd-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicase" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "user_agent" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cookie_store 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "utf-8" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "uuid" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "2.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "want" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wincolor" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wincolor" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winreg" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wyvern" ++version = "1.4.1" ++dependencies = [ ++ "clap-verbosity-flag 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "confy 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dialoguer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "eidolon 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gog 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indicatif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "zip 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "zip" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libflate 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[metadata] ++"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" ++"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" ++"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" ++"checksum backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)" = "b5164d292487f037ece34ec0de2fcede2faa162f085dd96d2385ab81b12765ba" ++"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" ++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" ++"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" ++"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" ++"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" ++"checksum butlerd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "095899eb6b69e0a1c98215e51a44c67b8e3c902ebb9440afaafe2eb45e650a09" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" ++"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" ++"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum clap-verbosity-flag 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda14f5323b2b747f52908c5b7b8af7790784088bc7c2957a11695e39ad476dc" ++"checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9" ++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" ++"checksum confy 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4b1400cd0dae7f27d2c7ced9492e1398d2e2df614570092a4936c73b416dedea" ++"checksum console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628" ++"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" ++"checksum cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "99be24cfcf40d56ed37fd11c2123be833959bbc5bddecb46e1c2e442e15fa3e0" ++"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" ++"checksum cookie_store 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b0d2f2ecb21dce00e2453268370312978af9b8024020c7a37ae2cc6dbbe64685" ++"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" ++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" ++"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" ++"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" ++"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13" ++"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" ++"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" ++"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" ++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++"checksum curl 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f8ed9a22aa8c4e49ac0c896279ef532a43a7df2f54fcd19fa36960de029f965f" ++"checksum curl-sys 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "5e90ae10f635645cba9cad1023535f54915a95c58c44751c6ed70dbaeb17a408" ++"checksum dialoguer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "116f66c4e7b19af0d52857aa4ff710cc3b4781d9c16616e31540bc55ec57ba8c" ++"checksum directories 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2561db021b6f1321d0f16b67ed28ce843ef4610dfaa432e3ffa2e8a3050ebf" ++"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" ++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum eidolon 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8a501eef266fdb28e1414b6104ca799a216bce6dc4ae1217ad0f40d591351671" ++"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" ++"checksum encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" ++"checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed" ++"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" ++"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" ++"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" ++"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" ++"checksum flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8" ++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++"checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" ++"checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" ++"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" ++"checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" ++"checksum gog 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "19bfb6c45ea1fba86f5880b4f239ef8034230387d90a0dfea70e094caeabf0be" ++"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" ++"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++"checksum html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7" ++"checksum http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "372bcb56f939e449117fb0869c2e8fd8753a8223d92a172c6e808cf123a5b6e4" ++"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" ++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" ++"checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" ++"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" ++"checksum hyper 0.12.33 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb44cbce9d8ee4fb36e4c0ad7b794ac44ebaad924b9c8291a63215bb44c2c8f" ++"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" ++"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" ++"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" ++"checksum indicatif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "40ecd1e2ee08e6c255ce890f5a99d17000850e664e7acf119fb03b25b0575bfe" ++"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" ++"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" ++"checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" ++"checksum libflate 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "90c6f86f4b0caa347206f916f8b687b51d77c6ef8ff18d52dd007491fd580529" ++"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" ++"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" ++"checksum markup5ever 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" ++"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" ++"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" ++"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" ++"checksum miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c061edee74a88eb35d876ce88b94d77a0448a201de111c244b70d047f5820516" ++"checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4" ++"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" ++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30" ++"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" ++"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee" ++"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.48 (registry+https://github.com/rust-lang/crates.io-index)" = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" ++"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" ++"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" ++"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" ++"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" ++"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" ++"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" ++"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" ++"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" ++"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" ++"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" ++"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" ++"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" ++"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" ++"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" ++"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" ++"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" ++"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" ++"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" ++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" ++"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" ++"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" ++"checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" ++"checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" ++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" ++"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" ++"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" ++"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" ++"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++"checksum reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0777154c2c3eb54f5c480db01de845652d941e47191277cc673634c3853939" ++"checksum rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" ++"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" ++"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" ++"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" ++"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" ++"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" ++"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" ++"checksum select 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ac645958c62108d11f90f8d34e4dc2799c838fc995ed4c2075867a2a8d5be76b" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113" ++"checksum serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "01e69e1b8a631f245467ee275b8c757b818653c6d704cdbcaeb56b56767b529c" ++"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" ++"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" ++"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" ++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" ++"checksum socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df028e0e632c2a1823d920ad74895e7f9128e6438cbc4bc6fd1f180e644767b9" ++"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" ++"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" ++"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423" ++"checksum string_cache_codegen 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1eea1eee654ef80933142157fdad9dd8bc43cf7c74e999e369263496f04ff4da" ++"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" ++"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" ++"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e" ++"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" ++"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" ++"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b" ++"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" ++"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" ++"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" ++"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" ++"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" ++"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" ++"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" ++"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" ++"checksum tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7" ++"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" ++"checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" ++"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" ++"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" ++"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" ++"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" ++"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" ++"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" ++"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" ++"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" ++"checksum user_agent 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "970a778e2284bd68e55ca4e93b858da333cd85c3d5d8b4eab2c6e729cd6f47c4" ++"checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" ++"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" ++"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" ++"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" ++"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" ++"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" ++"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum zip 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c18fc320faf909036e46ac785ea827f72e485304877faf1a3a39538d3714dbc3" diff --git a/pkgs/games/wyvern/default.nix b/pkgs/games/wyvern/default.nix new file mode 100644 index 000000000000..4723a6c52fa7 --- /dev/null +++ b/pkgs/games/wyvern/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchgit +, rustPlatform +, unzip +, rsync +, innoextract +, curl +, cmake +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "wyvern"; + version = "1.4.1"; + + src = fetchgit { + url = "https://git.sr.ht/~nicohman/wyvern"; + rev = "${version}"; + sha256 = "1sl3yhash1527amc8rs4374fd7jbgnkyy7qpw94ms2gs80sdv3s5"; + }; + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "sha256:1nd5qla3p1jrssg5fqal8m3jcbxax0wsfc8cp97jdrpqlcgqfmrx"; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "A simple CLI client for installing and maintaining linux GOG games"; + homepage = "https://git.sr.ht/~nicohman/wyvern"; + license = licenses.gpl3; + maintainers = with maintainers;[ _0x4A6F ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e570f24741a2..07a49f117d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27396,6 +27396,8 @@ in wxGTK = wxGTK30; }; + wyvern = callPackage ../games/wyvern { }; + x11idle = callPackage ../tools/misc/x11idle {}; x11docker = callPackage ../applications/virtualization/x11docker { }; From 538e558f48d111f46c86489eed87aff2791c0226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Sep 2020 21:22:01 +0200 Subject: [PATCH 467/499] Revert "Merge #96844: nixos/nfsd: run rpc-statd as a normal user" This reverts commit 42eebd7adef51b36c597753b3aaf6347864d176e, reversing changes made to b169bfc9e2c981a46680c53343258d90be6f6d9f. This breaks nfs3.simple test and even current PR #97656 wouldn't fix it. Therefore let's revert for now to unblock the channels. --- .../services/network-filesystems/nfsd.nix | 62 +++++++++---------- nixos/modules/tasks/filesystems/nfs.nix | 9 ++- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 398ef73449fa..1b62bfa82035 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -8,8 +8,6 @@ let exports = pkgs.writeText "exports" cfg.exports; - rpcUser = "statd"; - in { @@ -142,40 +140,36 @@ in environment.etc.exports.source = exports; - systemd.services.nfs-server = { - enable = true; - wantedBy = [ "multi-user.target" ]; - }; + systemd.services.nfs-server = + { enable = true; + wantedBy = [ "multi-user.target" ]; - systemd.services.nfs-mountd = { - enable = true; - restartTriggers = [ exports ]; - - preStart = optionalString cfg.createMountPoints '' - # create export directories: - # skip comments, take first col which may either be a quoted - # "foo bar" or just foo (-> man export) - sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \ - | xargs -d '\n' mkdir -p - ''; - }; - - # rpc-statd will drop privileges by changing user from root to the owner of - # /var/lib/nfs - systemd.tmpfiles.rules = [ - "d /var/lib/nfs 0700 ${rpcUser} ${rpcUser} - -" - ] ++ map (e: - "d /var/lib/nfs/${e} 0755 root root - -" - ) [ "recovery" "v4recovery" "sm" "sm.bak" ]; - - users = { - groups."${rpcUser}" = {}; - users."${rpcUser}" = { - description = "NFS RPC user"; - group = rpcUser; - isSystemUser = true; + preStart = + '' + mkdir -p /var/lib/nfs/v4recovery + ''; }; - }; + + systemd.services.nfs-mountd = + { enable = true; + restartTriggers = [ exports ]; + + preStart = + '' + mkdir -p /var/lib/nfs + + ${optionalString cfg.createMountPoints + '' + # create export directories: + # skip comments, take first col which may either be a quoted + # "foo bar" or just foo (-> man export) + sed '/^#.*/d;s/^"\([^"]*\)".*/\1/;t;s/[ ].*//' ${exports} \ + | xargs -d '\n' mkdir -p + '' + } + ''; + }; + }; } diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 67e5aa0bd58f..ddcc0ed8f5a4 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -101,6 +101,13 @@ in }; systemd.services.rpc-statd = - { restartTriggers = [ nfsConfFile ]; }; + { restartTriggers = [ nfsConfFile ]; + + preStart = + '' + mkdir -p /var/lib/nfs/{sm,sm.bak} + ''; + }; + }; } From c36dabdbddea22bd4856b2a41652a491a987455e Mon Sep 17 00:00:00 2001 From: Philip Nelson Date: Thu, 10 Sep 2020 15:54:54 -0400 Subject: [PATCH 468/499] nextdns: 1.7.1 -> 1.8.3 --- pkgs/applications/networking/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index de3ff40e43c0..8cdacf6d8380 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.7.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "001swxmf7ga2g0ri3gsnwvgjcarwdhfg476ymblg34kk9wclidmy"; + sha256 = "1bl6ky258hnai4v7d0gskn6nf5sdsc3xlwl959iwzqhpp0j3q9xg"; }; vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj"; From 7f797b9521862886e00a404f2ff7462f0b15f543 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 4 Sep 2020 09:09:56 +0200 Subject: [PATCH 469/499] coqPackages.paco: enable for Coq 8.12 --- pkgs/development/coq-modules/paco/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 9d8a7a315a55..e8958fa1ada5 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -21,6 +21,7 @@ let "8.9" = versions.post_8_6; "8.10" = versions.post_8_6; "8.11" = versions.post_8_6; + "8.12" = versions.post_8_6; }; param = params.${coq.coq-version}; in From 5f3be6b66961a5ea148d83faa2ec949d39b65a1e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 4 Sep 2020 09:10:00 +0200 Subject: [PATCH 470/499] coqPackages.Verdi: enable for Coq 8.12 --- pkgs/development/coq-modules/Cheerios/default.nix | 2 +- pkgs/development/coq-modules/InfSeqExt/default.nix | 2 +- pkgs/development/coq-modules/Verdi/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 194a1a0752ad..3f9f3b1ac9cd 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index e97b44999014..387e41859039 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 1fd06a9c5560..927cd832452b 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } From d3875340df9bb8c19a8eae771982fae59f981716 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Sep 2020 21:24:24 +1000 Subject: [PATCH 471/499] conmon: 2.0.20 -> 2.0.21 https://github.com/containers/conmon/releases/tag/v2.0.21 --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 064500fde7fd..d2f1f2debe54 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.20"; + version = "2.0.21"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1f09wx5k98fa55r73y5v0sgf2lha675xhk40piyf0b7zqknl6lya"; + sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; }; nativeBuildInputs = [ pkg-config ]; From 977147bd04b8e48ab54e126b75a20c46c9afc6bb Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Thu, 10 Sep 2020 21:08:48 +0200 Subject: [PATCH 472/499] discord: 0.0.11 -> 0.0.12 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index eadf90a0bae4..d6f15f928e58 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,10 +7,10 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54"; + sha256 = "0qrzvc8cp8azb1b2wb5i4jh9smjfw5rxiw08bfqm8p3v74ycvwk8"; }; }; ptb = callPackage ./base.nix rec { From 3ca40eebf9314d5bfcaa30d70644deeb59690a98 Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Thu, 10 Sep 2020 21:09:24 +0200 Subject: [PATCH 473/499] discord-ptb: 0.0.21 -> 0.0.22 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d6f15f928e58..0399dc89b7a7 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,10 +17,10 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "1i164wpi07d45w19i7l5hs47crc29k3plg4y9kc97x75rhh4xym1"; + sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j"; }; }; canary = callPackage ./base.nix rec { From 1937fd3f1906e2c0909e889ddd31f2e77cbd8bfc Mon Sep 17 00:00:00 2001 From: Tethys Svensson Date: Thu, 10 Sep 2020 21:10:00 +0200 Subject: [PATCH 474/499] discord-canary: 0.0.111 -> 0.0.112 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0399dc89b7a7..649e3b673df9 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.111"; + version = "0.0.112"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0ngmb40pwfwydvxyfby89yp17lsvmv642jci9b12cyc3hlkf85n4"; + sha256 = "1ibw3lsk1060g6b79v78292q45ayqj3izrs3ilvg4gfwmfxmm1a0"; }; }; }.${branch} From 195842dd869182d86e3bd2c29f741ea2c457188d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 10 Sep 2020 23:37:00 +0200 Subject: [PATCH 475/499] vorta: 0.7.0 -> 0.7.1 https://github.com/borgbase/vorta/releases/tag/v0.7.1 --- pkgs/applications/backup/vorta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 1a233b3d93ee..3c6a9587a656 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "vorta"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1hz19c0lphwql881n7w0ls39bbl63lccx57c3klwfyzgsxcgdy2j"; + sha256 = "069fq5gv324l2ap3g6m6i12lhq1iqm27dsmaagyc3sva945j0gxw"; }; postPatch = '' From 5916b9637048446755629c84ae6f13361f623d13 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Sep 2020 18:12:19 -0700 Subject: [PATCH 476/499] python3Packages.executor: 21.3 -> 23.1, fix tests --- .../python-modules/executor/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index e36c0e41c45d..3e14074f186c 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -1,27 +1,31 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytestCheckHook, mock, virtualenv }: buildPythonPackage rec { pname = "executor"; - version = "21.3"; + version = "23.1"; disabled = isPy27; src = fetchFromGitHub { owner = "xolox"; repo = "python-executor"; rev = version; - sha256 = "0rc14vjx3d6irfaw0pczzw1pn0xjl7xikv32hc1fvxv2ibnldv5d"; + sha256 = "1jfmagw126di0qd82bydwvryqcxc54pqja3rbx3ny3fv1ahi5s7k"; }; propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; - checkInputs = [ pytest mock virtualenv ]; + checkInputs = [ pytestCheckHook mock virtualenv ]; # ignore impure tests - checkPhase = '' - pytest . -k "not option and not retry \ - and not remote and not ssh \ - and not foreach and not local_context" - ''; + disabledTests = [ + "option" + "retry" + "remote" + "ssh" + "foreach" + "local_context" + "release" # meant to be ran on ubuntu to succeed + ]; meta = with lib; { description = "Programmer friendly subprocess wrapper"; From 29ddc028472b659b80b13e5292489353aa66cab6 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 10 Sep 2020 23:45:40 +0200 Subject: [PATCH 477/499] cargo-kcov: init at 0.5.2 (#97691) Signed-off-by: Sascha Grunert --- .../package-management/cargo-kcov/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/package-management/cargo-kcov/default.nix diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/tools/package-management/cargo-kcov/default.nix new file mode 100644 index 000000000000..6b825919b60f --- /dev/null +++ b/pkgs/tools/package-management/cargo-kcov/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-kcov"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "kennytm"; + repo = pname; + rev = "v${version}"; + sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; + }; + + cargoSha256 = "1dzm33cfriwgq4zvg6l6y76d5lp9hpcywdkwpl92qyjqg1hx8a1w"; + doCheck = false; + + meta = with lib; { + description = "Cargo subcommand to run kcov to get coverage report on Linux"; + homepage = "https://github.com/kennytm/cargo-kcov"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ saschagrunert ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80596031aacb..c03b9d7a8ed3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9611,6 +9611,7 @@ in cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; From 8f6436a82585450cb283ea0d3d10f8d05e9d40ea Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 9 Sep 2020 22:07:05 -0400 Subject: [PATCH 478/499] python3Packages.parso: disable on python 2.7 * Disabled on python 2.7 * Updated meta * Changed to pytestCheckHook --- pkgs/development/python-modules/parso/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 4ab09f5938ef..f9a87fa5f65f 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "parso"; version = "0.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - meta = { + meta = with lib; { description = "A Python Parser"; - homepage = "https://github.com/davidhalter/parso"; - license = lib.licenses.mit; + homepage = "https://parso.readthedocs.io/en/latest/"; + changelog = "https://github.com/davidhalter/parso/blob/master/CHANGELOG.rst"; + license = licenses.mit; }; - } From 483fa86c3695ab411d914cdedfe8cbcd82e18865 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 10 Sep 2020 22:07:17 +0100 Subject: [PATCH 479/499] pythonPackages.hiredis: fix tests just requires the source-directory-hiding trick --- pkgs/development/python-modules/hiredis/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index eaeb45627b1f..891c79f1b7b8 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -16,8 +16,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis ]; checkPhase = '' + mv hiredis _hiredis ${python.interpreter} test.py ''; + pythonImportsCheck = [ "hiredis" ]; meta = with stdenv.lib; { description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies"; From 70c56dd486b3494319658dcaaa4b970944621956 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 10 Sep 2020 21:56:40 +0100 Subject: [PATCH 480/499] pythonPackages.pq: fix build we can't run the tests anyway, so remove fragile attempts to patch them --- pkgs/development/python-modules/pq/default.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 75a722d831ee..cfc5419bd239 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, psycopg2 , isPy27 }: @@ -15,22 +14,9 @@ buildPythonPackage rec { sha256 = "f54143844e73f4182532e68548dee447dd78dd00310a087e8cdee756d476a173"; }; - # psycopg2cffi is compatible with psycopg2 and author states that - # module is compatible with psycopg2 - postConfigure = '' - substituteInPlace setup.py \ - --replace "psycopg2cffi" "psycopg2" - - substituteInPlace pq/tests.py \ - --replace "psycopg2cffi" "psycopg2" - ''; - - checkInputs = [ - psycopg2 - ]; - # tests require running postgresql cluster doCheck = false; + pythonImportsCheck = [ "pq" ]; meta = with lib; { description = "PQ is a transactional queue for PostgreSQL"; From ef82f49fc04bc7c4e03ea2dcf4ee6fa251a96912 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 10 Sep 2020 21:16:39 +0100 Subject: [PATCH 481/499] pythonPackages.pyjet: fix tests tests are now pytest tests, and not included in the pypi tarball --- .../python-modules/pyjet/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index c535ddad1089..abf4beaada0d 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -1,12 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, cython, nose, numpy }: +{ lib, buildPythonPackage, fetchFromGitHub, cython, pytest, numpy }: buildPythonPackage rec { pname = "pyjet"; version = "1.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "ab6e63f8a8fd73bbd76ef2a384eea69bc1c201f2ce876faa4151ade6c0b20615"; + # tests not included in pypi tarball + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = version; + sha256 = "0b68jnbfk2rw9i1nnwsrbrbgkj7r0w1nw0i9f8fah1wmn78k9csv"; }; # fix for python37 @@ -19,7 +22,11 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; + checkPhase = '' + mv pyjet _pyjet + pytest tests/ + ''; meta = with lib; { homepage = "https://github.com/scikit-hep/pyjet"; From 98b8f5d2a6251deff0f024eecc6915de6da3a42e Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 10 Sep 2020 16:57:58 -0600 Subject: [PATCH 482/499] croc: 8.3.0 -> 8.3.1 --- pkgs/tools/networking/croc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 54dd51ba9189..29bc6140b516 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "croc"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0kl6sbq0lzrvf4wzz5bvz81ncmfw5lm7pjr2r2xx4sws1w006nq2"; + sha256 = "118lx0phq68rxv71s5gy00qzzrp00qwh6kr85dx83nn1sbp54xx9"; }; vendorSha256 = "0qfrc3c4fsg3w2zcpdr93ilknxhshcysvin029va154sq3zmggbn"; From 9627ae4f9a9ac84268fc46337a3069df4215a0df Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 10 Sep 2020 23:00:52 +0100 Subject: [PATCH 483/499] pythonPackages.pysnow: fix build & tests --- .../python-modules/pysnow/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 11a670e394b8..d8d6b4f4401b 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, pythonAtLeast +, fetchFromGitHub +, poetry , brotli , ijson , nose +, httpretty , requests_oauthlib , python_magic , pytz @@ -15,11 +16,23 @@ buildPythonPackage rec { pname = "pysnow"; version = "0.7.16"; - src = fetchPypi { - inherit pname version; - sha256 = "5df61091470e48b5b3a6ea75637f69d3aacae20041487ea457a9a0e3093fba8c"; + # tests not included in pypi tarball + src = fetchFromGitHub { + owner = "rbw"; + repo = pname; + rev = version; + sha256 = "0dj90w742klfcjnx7yhp0nzki2mzafqzzr0rk2dp6vxn8h58z8ww"; }; + format = "pyproject"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'ijson = "^2.5.1"' 'ijson = "*"' \ + --replace 'pytz = "^2019.3"' 'pytz = "*"' \ + --replace 'oauthlib = "^3.1.0"' 'oauthlib = "*"' + ''; + + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ brotli ijson @@ -28,11 +41,11 @@ buildPythonPackage rec { requests_oauthlib ]; - checkInputs = [ nose ]; - + checkInputs = [ nose httpretty ]; checkPhase = '' nosetests --cover-package=pysnow --with-coverage --cover-erase ''; + pythonImportsCheck = [ "pysnow" ]; meta = with lib; { description = "ServiceNow HTTP client library written in Python"; From 1839c5cd7b85a5b5bc4586d9bc0b1d9439d34b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 10 Sep 2020 20:18:22 +0200 Subject: [PATCH 484/499] python3Packages.datasets: init at 1.0.0 This library provides open-access datasets an evaluation metrics for natural language processing using PyTorch, TensorFlow, NumPy, and Pandas. --- .../python-modules/datasets/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/datasets/default.nix diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix new file mode 100644 index 000000000000..4bddd69ed991 --- /dev/null +++ b/pkgs/development/python-modules/datasets/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dill +, filelock +, numpy +, pandas +, pyarrow +, requests +, tqdm +, xxhash +}: + +buildPythonPackage rec { + pname = "datasets"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = version; + sha256 = "13l52r7nhj2c1a10isy5309d2g6pmaivyqs5w6yjbjj4195jxya5"; + }; + + propagatedBuildInputs = [ + dill + filelock + numpy + pandas + pyarrow + requests + tqdm + xxhash + ]; + + # Tests require pervasive internet access. + doCheck = false; + + # Module import will attempt to create a cache directory. + postFixup = "export HF_MODULES_CACHE=$TMPDIR"; + + pythonImportsCheck = [ "datasets" ]; + + meta = with lib; { + homepage = "https://github.com/huggingface/datasets"; + description = "Fast, efficient, open-access datasets and evaluation metrics for natural language processing"; + changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 610e50fe84d0..702e209650b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1436,6 +1436,8 @@ in { datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + datasets = callPackage ../development/python-modules/datasets { }; + datasette = callPackage ../development/python-modules/datasette { }; datashader = callPackage ../development/python-modules/datashader { }; From 25bd44cea3cdba0261bda305aa37395982c181e9 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Thu, 10 Sep 2020 13:26:45 +1000 Subject: [PATCH 485/499] aws-sam-cli: fix version bounds --- pkgs/development/tools/aws-sam-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index c2ebf2235084..a486d318608c 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -79,8 +79,8 @@ buildPythonApplication rec { --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.6.0" \ - --replace "requests==2.22.0" "requests~=2.22" + --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" \ + --replace "requests==2.23.0" "requests~=2.24" ''; meta = with lib; { From 240d8246e858aa62d70441a733e77484a6c8ae55 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Sep 2020 21:10:09 +1000 Subject: [PATCH 486/499] go: 1.15.1 -> 1.15.2 --- pkgs/development/compilers/go/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index adc3185babbe..8dd48e3396eb 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0c2d2ngckcfsgrb7a4p6ag83mk5yd15npiq7q1f1p211li93fx6k"; + sha256 = "0kabkmc3759g5hpsdwh3l8p1fywibnha8c72m8f02lg2rl5rvgr8"; }; # perl is used for testing go vet From 619061532aabb4a7c6341b0674b9d9dd4faef1bd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 10 Sep 2020 21:10:47 +1000 Subject: [PATCH 487/499] go_1_14: 1.14.8 -> 1.14.9 --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 4cd281872307..b467c998c3ed 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.8"; + version = "1.14.9"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0sp3ss9mqcysc3h7ynwxhdjq4g0id9y6liakwy2cy27mapxi79nr"; + sha256 = "0m2581pi1iid39dd0k81r6zypasr8byc6d75nprapg09ri4ci1y6"; }; # perl is used for testing go vet From 4607f02589cb891092a952f1a1aefb47d30ad6eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Sep 2020 02:33:11 +0200 Subject: [PATCH 488/499] pythonPackages.supervisor: drop glibc-2.31 patch A fix was integrated into the 4.2.1 release. --- .../python-modules/supervisor/default.nix | 7 ------- .../python-modules/supervisor/glibc-2.31.patch | 13 ------------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/python-modules/supervisor/glibc-2.31.patch diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 280adcee2322..10c8f28e4463 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -14,13 +14,6 @@ buildPythonPackage rec { sha256 = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d"; }; - patches = [ - # SOMAXCONN limit of glibc-2.31 has been increased from 128 to 4096: - # * https://sourceware.org/git/?p=glibc.git;a=commit;h=96958e2700f5b4f4d1183a0606b2b9848a53ea44 - # * https://github.com/Supervisor/supervisor/issues/1346 - ./glibc-2.31.patch - ]; - # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/supervisor/glibc-2.31.patch b/pkgs/development/python-modules/supervisor/glibc-2.31.patch deleted file mode 100644 index b2d9564eea1f..000000000000 --- a/pkgs/development/python-modules/supervisor/glibc-2.31.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/supervisor/tests/base.py b/supervisor/tests/base.py -index 643e609..8aa45e7 100644 ---- a/supervisor/tests/base.py -+++ b/supervisor/tests/base.py -@@ -358,7 +358,7 @@ class DummySocketConfig: - return not self.__eq__(other) - - def get_backlog(self): -- return 128 -+ return 4096 - - def create_and_bind(self): - return DummySocket(self.fd) From 4c9b89a764a80d9f280a9197a40454f54d3728a3 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 6 Sep 2020 03:25:28 +0000 Subject: [PATCH 489/499] mamba: 1.3 -> 1.4 --- pkgs/applications/audio/mamba/default.nix | 13 ++++++------- pkgs/applications/audio/mamba/fix-build.patch | 10 ---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/audio/mamba/fix-build.patch diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index a3e33471cee8..ad0a41bc0059 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , cairo +, fluidsynth , libX11 , libjack2 , liblo @@ -11,20 +12,18 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d"; + sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j"; fetchSubmodules = true; }; - patches = [ ./fix-build.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/mamba/fix-build.patch b/pkgs/applications/audio/mamba/fix-build.patch deleted file mode 100644 index ed366963676c..000000000000 --- a/pkgs/applications/audio/mamba/fix-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libxputty/Build/Makefile -+++ b/libxputty/Build/Makefile -@@ -20,1 +20,1 @@ -- LDFLAGS += -fPIC `pkg-config --static --cflags --libs cairo x11` -lm -+ LDFLAGS += -fPIC `pkg-config --cflags --libs cairo x11` -lm ---- a/src/Makefile -+++ b/src/Makefile -@@ -84,1 +83,1 @@ ifneq ("$(wildcard ./$(BUILD_DIR))","") -- update-desktop-database -+ update-desktop-database || true diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c03b9d7a8ed3..30889e14d570 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26824,7 +26824,7 @@ in icu = icu58; }; - mamba = callPackage ../applications/audio/mamba{ }; + mamba = callPackage ../applications/audio/mamba { }; mame = libsForQt514.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; From 98a3c772969e1432bb4caeb6d40a9e0cce8b57bd Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 11 Sep 2020 05:12:10 +0000 Subject: [PATCH 490/499] seq66: init at 0.90.5 (#97728) --- pkgs/applications/audio/seq66/default.nix | 35 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/seq66/default.nix diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix new file mode 100644 index 000000000000..6b3a3939b43f --- /dev/null +++ b/pkgs/applications/audio/seq66/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which +, alsaLib, libjack2, liblo, qtbase +}: + +stdenv.mkDerivation rec { + pname = "seq66"; + version = "0.90.5"; + + src = fetchFromGitHub { + owner = "ahlstromcj"; + repo = pname; + rev = version; + sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; + + buildInputs = [ alsaLib libjack2 liblo qtbase ]; + + postPatch = '' + for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do + substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}' + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/ahlstromcj/seq66"; + description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30889e14d570..246bcaa86889 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22945,6 +22945,8 @@ in seq24 = callPackage ../applications/audio/seq24 { }; + seq66 = qt5.callPackage ../applications/audio/seq66 { }; + setbfree = callPackage ../applications/audio/setbfree { }; sfizz = callPackage ../applications/audio/sfizz { }; From 21b2900bd4791436737277a054095c2ebc9737a5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 11 Sep 2020 05:29:57 +0000 Subject: [PATCH 491/499] nixos/plasma5: fix build with hardware.bluetooth.enable = true after #97456 --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 94bc2ae491b8..205410852f68 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -305,7 +305,7 @@ in ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc # Optional hardware support features - ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ] + ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ] ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil From b47cabb6acc98fee8f47b780456844bc88c975d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Fri, 11 Sep 2020 08:28:24 +0200 Subject: [PATCH 492/499] prosody: 0.11.5 -> 0.11.6 See https://blog.prosody.im/prosody-0.11.6-released/ for the release notes. --- pkgs/servers/xmpp/prosody/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 0a0cc9aeaf93..54c4a4c52161 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.11.5"; # also update communityModules + version = "0.11.6"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m"; + sha256 = "0m8p2kwiy4l87ifpygricpyixi1vpx6j1jb6ki1zi4az3iixp8fd"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "2dcbc01c9931"; - sha256 = "0ydhbvfp7vk5zqpsc54ihxz6y2gmzh0bcgyz0xidlxrmxzwcvvyh"; + rev = "e77122025080"; + sha256 = "1pjax8lzgcwcn3mq5q4kbwfyyzaifqcc3a0s4rl9gib5rhwddybh"; }; buildInputs = [ @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://prosody.im"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ninjatrappeur ]; }; } From e571b315e22bb5a09e86f8b76a2473b9a65fbcd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Fri, 11 Sep 2020 10:47:03 +0200 Subject: [PATCH 493/499] test-driver.py: defaulting keepVmState in Machine init ecb73fd5557d6d438aa7c155e5b1aad89373c6ae introduced a new keepVmState CLI flag for test-driver.py. This CLI flags gets forwarded to the Machine class through create_machine. It created a regression for the boot tests where __main__ end up not being evaluated. See https://github.com/NixOS/nixpkgs/pull/97346#issuecomment-690951837 for bug report. Defaulting keepVmState to false when __main__ ends up not being evaluated. --- nixos/lib/test-driver/test-driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 5d3e632fac2c..156392ad1e32 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -228,7 +228,7 @@ class Machine: return path self.state_dir = os.path.join(tmp_dir, f"vm-state-{self.name}") - if not args["keepVmState"]: + if not args.get("keepVmState", False): self.cleanup_statedir() os.makedirs(self.state_dir, mode=0o700, exist_ok=True) self.shared_dir = create_dir("shared-xchg") From 0a21d06682e09f998807d3bdaf77be100d247908 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 11 Sep 2020 10:23:33 +0200 Subject: [PATCH 494/499] wdisplays: fix startup on sway 1.5 Starting `wdisplays` on a NixOS 20.09 with `sway-1.5` breaks with the following output: ``` (wdisplays:28400): Gtk-WARNING **: 10:26:38.619: Could not load a pixbuf from /org/gtk/libgtk/theme/Adwaita/assets/bullet-symbolic.svg. This may indicate that pixbuf loaders or the mime database could not be found. Gdk-Message: 10:26:38.752: Error reading events from display: Success ``` The first two warnings can be fixed by adding `wrapGAppsHook`. The last error is an upstream bug that can be fixed by applying the patch from a pending PR[1]. [1] https://github.com/cyclopsian/wdisplays/pull/20 --- pkgs/tools/graphics/wdisplays/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 0993a39983ed..eb7598dce206 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland, wrapGAppsHook +, fetchpatch +}: stdenv.mkDerivation rec { pname = "wdisplays"; version = "1.0"; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook ]; buildInputs = [ gtk3 epoxy wayland ]; @@ -15,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; }; + patches = [ + # Fixes `Gdk-Message: 10:26:38.752: Error reading events from display: Success` + # https://github.com/cyclopsian/wdisplays/pull/20 + (fetchpatch { + url = "https://github.com/cyclopsian/wdisplays/commit/5198a9c94b40ff157c284df413be5402f1b75118.patch"; + sha256 = "1xwphyn0ksf8isy9dz3mfdhmsz4jv02870qz5615zs7aqqfcwn85"; + }) + ]; + meta = let inherit (stdenv) lib; in { description = "A graphical application for configuring displays in Wayland compositors"; homepage = "https://github.com/cyclopsian/wdisplays"; From 5c3abccfaf9b28a8a4427dc962a3ed656f5ecc7f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 11 Sep 2020 12:07:54 +0300 Subject: [PATCH 495/499] Update pkgs/development/tools/gotools/default.nix Co-authored-by: Roman Volosatovs --- pkgs/development/tools/gotools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 7724f5b34fe0..255b664d95e3 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; - # The gopls folder has its own module definition which causes a build failure. + # The gopls folder contains a Go submodule which causes a build failure. # Given that, we can't have the gopls binary be part of the gotools # derivation. # From 79e055eb3b70a16df924b369b8ebc9d319c6c287 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 11 Sep 2020 12:08:04 +0300 Subject: [PATCH 496/499] Update pkgs/development/tools/gotools/default.nix --- pkgs/development/tools/gotools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 255b664d95e3..f3cc37fa64aa 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { # Given that, we can't have the gopls binary be part of the gotools # derivation. # - # We have a seperate derivation to build the gopls tool. + # The attribute "gopls" provides the gopls binary. # # Related # From f19263630482343081c45d3d36f3726ea606a54e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Sep 2020 11:26:02 +0200 Subject: [PATCH 497/499] signal-desktop: 1.35.1 -> 1.36.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c4eef754cd42..dc8fc81d35e2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.35.1"; # Please backport all updates to the stable channel. + version = "1.36.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1nxj7h8yrp2sbxxd49q9xdh1zsqixcd01i83lr492f4322cg1yjf"; + sha256 = "0lc56g09g2xfwxwm046bcykvxd0nq63zazamnp268z28lnn937mc"; }; nativeBuildInputs = [ From 786d9316ad2dd77ebc9e72e47f64698095b25962 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 11 Sep 2020 11:30:46 +0200 Subject: [PATCH 498/499] gnome3.eog: format * format with nixpkgs-fmt * replace name with pname & version * use pkg-config instead of pkgconfig alias --- pkgs/desktops/gnome-3/core/eog/default.nix | 62 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 9885d0de37fa..6ad0834724d1 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,23 +1,65 @@ -{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3 -, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk-pixbuf, exempi -, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobject-introspection, python3 }: +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, itstool +, pkg-config +, libxml2 +, libjpeg +, libpeas +, gnome3 +, gtk3 +, glib +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +, lcms2 +, gdk-pixbuf +, exempi +, shared-mime-info +, wrapGAppsHook +, librsvg +, libexif +, gobject-introspection +, python3 +}: -let +stdenv.mkDerivation rec { pname = "eog"; version = "3.36.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1p1lrnsgk5iyw7h02qzax4s74dqqsh5lk85b0qsj7hwx91qm61xp"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + wrapGAppsHook + libxml2 + gobject-introspection + python3 + ]; buildInputs = [ - libjpeg gtk3 gdk-pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi - gsettings-desktop-schemas shared-mime-info adwaita-icon-theme + libjpeg + gtk3 + gdk-pixbuf + glib + libpeas + librsvg + lcms2 + gnome-desktop + libexif + exempi + gsettings-desktop-schemas + shared-mime-info + adwaita-icon-theme ]; postPatch = '' From 8149ab158b6a6210db36cf698e6e63039e0c96ae Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 11 Sep 2020 13:03:01 +0200 Subject: [PATCH 499/499] bandwhich: 0.17.0 -> 0.18.1 ChangeLogs: * https://github.com/imsnif/bandwhich/releases/tag/0.18.1 * https://github.com/imsnif/bandwhich/releases/tag/0.18.0 Also applied a fix[1] for rDNS support which broke with `systemd-v246` because the `resolv-conf` crate didn't support the `options trust_ad`-declaration in systemd's `/etc/resolv.conf`[2]. [1] https://github.com/imsnif/bandwhich/pull/184 [2] https://github.com/imsnif/bandwhich/issues/166#issuecomment-691014450 --- pkgs/tools/networking/bandwhich/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 7e815c6ccf07..1048b3e49834 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -1,17 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, Security, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0fhy3zys41bkpjmvhkxf413004hvv2kngcgf4819mw22w14zfvgr"; + sha256 = "0qzmkhrg7pqgblmva7xcww6zc4rryba6kkfkhj05mvd31z3c1rz8"; }; - cargoSha256 = "015ff049xb699gig0cwr5i7n8hgw1316dkdpnqd4843h54x7bp5y"; + cargoSha256 = "0iakw42nip0vxq50jjk73r0xl7xp426szb091ap4isad3zxq6saj"; + cargoPatches = [ + # Fixes rDNS support for systems using `systemd-networkd` from v246. + # See https://github.com/imsnif/bandwhich/pull/184 for context + (fetchpatch { + url = "https://github.com/imsnif/bandwhich/commit/19e485a1ce9f749c121d235147e3117cc847379e.patch"; + sha256 = "03hg73gwlfq0l36k3aq7cfak3js7j05ssfpdbfiiwqq7lynm83jr"; + }) + (fetchpatch { + url = "https://github.com/imsnif/bandwhich/commit/35f03b716832fba9a735628d1c728d3e305f75c8.patch"; + sha256 = "1bv837wc1dgg26s640f3lfya28ypnjs0675dykzxxxv5y9ns58l3"; + }) + ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security;