From c1e3414044cc623e68bb26fe94bf504b46b0ac26 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Tue, 30 Jul 2019 12:33:11 -0700 Subject: [PATCH 01/63] nixos/sd-image-aarch64: update deprecated option --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index a9241870fa7..e91b2cd36cf 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -39,7 +39,7 @@ in kernel=u-boot-rpi3.bin # Boot in 64-bit mode. - arm_control=0x200 + arm_64bit=1 # U-Boot used to need this to work, regardless of whether UART is actually used or not. # TODO: check when/if this can be removed. From cc2fee8ac182a7562b4d4e1aa784ee52a10a1437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 14 Dec 2020 15:01:01 +0100 Subject: [PATCH 02/63] phpExtensions.imagick: upgrade to ImageMagick 7 --- pkgs/development/php-packages/imagick/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 504e15ae16d..8f9eed0c1c3 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -12,9 +12,14 @@ buildPecl { url = "https://github.com/Imagick/imagick/pull/336.patch"; sha256 = "nuRdh02qaMx0s/5OzlfWjyYgZG1zgrYnAjsZ/UVIrUM="; }) + # Fix detection of ImageMagick 7. + (fetchpatch { + url = "https://github.com/Imagick/imagick/commit/09551fbf38c16cdaf4ade7c08744501cd82d2747.patch"; + sha256 = "qUeQHP08kKOzuQdEpR8RSZ18Yhi0U9z24KwQcAx1UVg="; + }) ]; - configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; + configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; From 7e8b2b7e988cfd7e8e0745f0af3eb42b6a1918cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 15 Dec 2020 17:42:21 +0100 Subject: [PATCH 03/63] phpPackages: convert to scope This will make it easier to make overridable. Had to rename `packages` attribute to `tools` in `php-packages.nix` because `packages` is shadowed by `makeScope`. --- pkgs/development/interpreters/php/generic.nix | 5 +++-- pkgs/top-level/php-packages.nix | 15 +++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 4a96abcf9b6..a3559de9440 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -49,7 +49,7 @@ let php = generic filteredArgs; php-packages = (callPackage ../../../top-level/php-packages.nix { - php = phpWithExtensions; + phpPackage = phpWithExtensions; }); allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; @@ -112,7 +112,8 @@ let phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; tests = nixosTests.php; - inherit (php-packages) packages extensions buildPecl; + inherit (php-packages) extensions buildPecl; + packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d5bebb9bd84..cc8ba346ae5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -6,7 +6,7 @@ , readline, rsync, fetchpatch, valgrind }: -let +lib.makeScope pkgs.newScope (self: with self; { buildPecl = import ../build-support/build-pecl.nix { php = php.unwrapped; inherit lib; @@ -21,15 +21,10 @@ let pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; - callPackage = pkgs.newScope { - inherit mkDerivation php buildPecl pcre'; - }; -in -{ - inherit buildPecl; + php = phpPackage; # This is a set of interactive tools based on PHP. - packages = { + tools = { box = callPackage ../development/php-packages/box { }; composer = callPackage ../development/php-packages/composer { }; @@ -550,4 +545,4 @@ in # Produce the final attribute set of all extensions defined. in builtins.listToAttrs namedExtensions); -} +}) From 3557bb49b065495de31b0cbe71de8f2f380c2706 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 15 Dec 2020 21:05:38 -0500 Subject: [PATCH 04/63] sqitch: package cleanup --- .../development/tools/misc/sqitch/default.nix | 38 +++++++++++++------ pkgs/top-level/all-packages.nix | 16 +++----- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 66d40ae3127..5e3c3bc37c6 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -1,32 +1,46 @@ -{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule, shortenPerlShebang }: +{ stdenv +, lib +, perlPackages +, makeWrapper +, shortenPerlShebang +, mysqlSupport ? false +, postgresqlSupport ? false +}: + +let + sqitch = perlPackages.AppSqitch; + modules = with perlPackages; [ ] + ++ lib.optional mysqlSupport DBDmysql + ++ lib.optional postgresqlSupport DBDPg; +in stdenv.mkDerivation { - name = "${name}-${sqitchModule.version}"; + pname = "sqitch"; + version = sqitch.version; - buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; - src = sqitchModule; + src = sqitch; dontBuild = true; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do # make sure dest alreay exists before symlink # this prevents installing a broken link into the path - if [ -e ${sqitchModule}/$d ]; then - ln -s ${sqitchModule}/$d $out/$d + if [ -e ${sqitch}/$d ]; then + ln -s ${sqitch}/$d $out/$d fi done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; - postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; + postFixup = '' + wrapProgram $out/bin/sqitch --prefix PERL5LIB : ${perlPackages.makeFullPerlPath modules} + ''; meta = { - platforms = stdenv.lib.platforms.unix; - inherit (sqitchModule.meta) license; + inherit (sqitch.meta) description homepage license platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c412e5c9b..75205bde5de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16803,17 +16803,13 @@ in perlcritic = perlPackages.PerlCritic; - sqitchMysql = callPackage ../development/tools/misc/sqitch { - name = "sqitch-mysql"; - databaseModule = perlPackages.DBDmysql; - sqitchModule = perlPackages.AppSqitch; - }; + sqitchMysql = (callPackage ../development/tools/misc/sqitch { + mysqlSupport = true; + }).overrideAttrs (oldAttrs: { pname = "sqitch-mysql"; }); - sqitchPg = callPackage ../development/tools/misc/sqitch { - name = "sqitch-pg"; - databaseModule = perlPackages.DBDPg; - sqitchModule = perlPackages.AppSqitch; - }; + sqitchPg = (callPackage ../development/tools/misc/sqitch { + postgresqlSupport = true; + }).overrideAttrs (oldAttrs: { pname = "sqitch-pg"; }); ### DEVELOPMENT / R MODULES From bdc2af4486175de81fa51ef1d303c1643656f296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 05/63] lxqt.libqtxdg: 3.5.0 -> 3.6.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index f5da7a4b235..f2d00a5869e 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85"; + sha256 = "0wiannhaydnbqd8ni3nflx2s4036grxs8aklcb95j88v3cgr2gck"; }; nativeBuildInputs = [ From 5c3c31a2f8d3ab13a62a1b9306bf2503e53469ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 06/63] lxqt.compton-conf: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/compton-conf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index b41d766c1ad..38dfd621848 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "compton-conf"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py"; + sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q"; }; nativeBuildInputs = [ From bc412485ef1b10f594ba230e36fcb039fc8d6a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 07/63] lxqt.libfm-qt: 0.15.1 -> 0.16.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index fc97906ab7d..fb6b759db55 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3"; + sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index bd8181d57f6..ee915491f85 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "01vfy7r7h0c5axlwqwsxg3pzdlaicnf2474bcq3jwk12gipvj5sd"; + sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk"; }; nativeBuildInputs = [ From e0bc5ad2247087c0747c94c4e8c16fe8d3105833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 08/63] lxqt.libsysstat: 0.4.3 -> 0.4.4 --- pkgs/desktops/lxqt/libsysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 642b57fe0d7..6f6e432ad9e 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "libsysstat"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf"; + sha256 = "1pbshhg8pjkzkka5f2rxfxal7rb4fjccpgj07kxvgcnqlah27ydk"; }; nativeBuildInputs = [ From e2be239176bf29a1d3d7793134effa9cc6414882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 09/63] lxqt.lximage-qt: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 22ce26526ac..014898f5326 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lximage-qt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp"; + sha256 = "1z2lvfrw9shpvwxva0vf0rk74nj3mmjgxznsgq8r65645fnj5imb"; }; nativeBuildInputs = [ From ef8dd87b89fe4d89923fdeb7cca88c3c632ea87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 10/63] lxqt.lxqt-about: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 01365129467..0070d31af9a 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x"; + sha256 = "0m7gan31byy80k9jqfqxx4drvfx0d9savj4shnrabsb3z3fj9h8h"; }; nativeBuildInputs = [ From 1e347b53303d1824016234146fa7cd1bb731262f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:41 -0300 Subject: [PATCH 11/63] lxqt.lxqt-admin: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 21a637bc669..b3b74b92f6a 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a"; + sha256 = "0mi119ji0260idi14980nhmylx3krnfmkj9r81nmbbrg02h158nz"; }; nativeBuildInputs = [ From a8afb85b3c29bbccad69903fff3e3e2af4928e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 12/63] lxqt.lxqt-archiver: 0.2.0 -> 0.3.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 93e5ffec2a0..8c5c57045d9 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "1cip2dbvxbdlx1axz5sn4mwigwvfxb1q14byn09crv71adyfprw5"; + sha256 = "0f4nj598w6qhcrhbab15cpfmrda02jcflxhb15vyv7gnplalkya6"; }; nativeBuildInputs = [ From abc28cad9e25cf61139b9d2e2173905ba271875a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 13/63] lxqt.lxqt-build-tools: 0.7.0 -> 0.8.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 92ce3c2fe50..cd39096678f 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf"; + sha256 = "1wf6mhcfgk64isy7bk018szlm18xa3hjjnmhpcy2whnnjfq0jal6"; }; nativeBuildInputs = [ From c6f539130472f41f60cc147eea2ab8f3c24fc025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 14/63] lxqt.lxqt-config: 0.15.0 -> 0.16.1 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 677b90b25c5..c50b258243e 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-config"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s"; + sha256 = "1ppkkz7rg5ddlyk1ikh2s3g7nbb0wnpl0lldg9j68l76d61sfm8z"; }; nativeBuildInputs = [ From d4eeb2c0df53c208c3f7b16bb04575feb142b6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 15/63] lxqt.lxqt-globalkeys: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 59e2096dea4..62bb75e7876 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm"; + sha256 = "00n02mci0wry9l2prc98liiamshacnj8pvmra5wkmygm581q2r19"; }; nativeBuildInputs = [ From 6087c66ed12d6d04fccf5689359b6249ea3fd141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 16/63] lxqt.lxqt-notificationd: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 43f9bf31932..520c0322eaa 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k"; + sha256 = "0ahvjf5102a0pz5bfznjvkg55xix6k9bw381gzv6jqw5553snanc"; }; nativeBuildInputs = [ From 054134c9281f2f0d0407113b4662e54248bedb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 17/63] lxqt.lxqt-openssh-askpass: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index a164571800a..cdfb51a472d 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3"; + sha256 = "163mshrwfwp31bjis66l50krsyp184idw9gyp7pdh047psca5129"; }; nativeBuildInputs = [ From 9e35b5cb5e03b03b61908709c4067630dd040ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 18/63] lxqt.lxqt-panel: 0.15.1 -> 0.16.1 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index a0bdd9bfae6..d333bae3d30 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "0.15.1"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0f3sjzkria61nz342daxps2w57wnx6laq9iww8hha7rbi24yw2sd"; + sha256 = "1mm23fys5npm5fi47y3h2mzvlhlcaz7k1p4wwmc012f0hqcrvqik"; }; nativeBuildInputs = [ From f9aa1bdd94953b5caaf40551c865936db2028390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 19/63] lxqt.lxqt-policykit: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 7575c805a31..5b708d6c036 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h"; + sha256 = "05qi550cjyjzhlma4zxnp1pn8i5cgak2k2mwwh2a5gpicp5axavn"; }; nativeBuildInputs = [ From 31d964b9d80c1fd717c5940f45c9fe2646d9cf97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:42 -0300 Subject: [PATCH 20/63] lxqt.lxqt-powermanagement: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 2b48a2a04b5..22eb060dfd5 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -12,18 +12,19 @@ , kidletime , liblxqt , libqtxdg +, lxqt-globalkeys , lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f"; + sha256 = "1pf3z8hymddk1cm5j5lqgah967xsdl37j66gz5bs3dw7871gbdhy"; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ mkDerivation rec { kidletime liblxqt libqtxdg + lxqt-globalkeys ]; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; From 34d8e34405e852fd0b65cbd9394d78c507872ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 21/63] lxqt.lxqt-qtplugin: 0.15.1 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 7bdd628f458..5fbf9f8f568 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0if01bdhz8ph4k1mwvjjjw0fw6mxzprgz17ap23xbsdr009hxdf0"; + sha256 = "14k5icxjkl5znp59y44791brsmwy54jkwr4vn3kg4ggqjdp3vbh9"; }; nativeBuildInputs = [ From 3dda3eea985d7d7f1651dc7253a8a74204986cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 22/63] lxqt.lxqt-runner: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 8a27ef41610..d99692847f6 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5"; + sha256 = "0bmx5y4l443j8vrzw8967kw5i150braq0pfj8xk0nyz6zz62rrf1"; }; nativeBuildInputs = [ From 657da4a9287d56d5c7b24c00bc669e07da453ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 23/63] lxqt.lxqt-session: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 2e513b23988..bb212cf15a7 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-session"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn"; + sha256 = "1lmj0cx4crdjl2qih3scm2gvsx3qna0nb6mjjrcx0f2k7h744pik"; }; nativeBuildInputs = [ From 2a66e0daf9620f6c0bba86942a28e8e90faa88e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 24/63] lxqt.lxqt-sudo: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 5f8fbcd2a6a..a6fef7479ab 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb"; + sha256 = "0al64v12ddi6bgrr2z86jh21c02wg5l0mxjcmk9xlsvdx0d94cdx"; }; nativeBuildInputs = [ From fa986fe2230c56d1e6cd55b90d6c843c129fdaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 25/63] lxqt.lxqt-themes: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 4613017b8a9..5ab100bd101 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29"; + sha256 = "12pbba7a2rk0kjn3hl2lvn90di58w0s5psbq51kz39ah3rlp9dzz"; }; nativeBuildInputs = [ From b8670865033b026c3d98a5bce6495da3da170220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 26/63] lxqt.obconf-qt: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 91baba60d8a..3b9891053ff 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib"; + sha256 = "0kk5scp1j0hqi27q3yl9cg73ybxzm22nj96pa8adhdn4shg9bpac"; }; nativeBuildInputs = [ From cfcb09ebb680ab7d04413af3c0de4f5cb905d34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 27/63] lxqt.pavucontrol-qt: 0.15.0 -> 0.16.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 24343d42374..dafb8947918 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367"; + sha256 = "1d3kp2y3crrmbqak4mn9d6cfbhi5l5xhchhjh44ng8gpww22k5h0"; }; nativeBuildInputs = [ From 96b695c382ca2ad25e2ed225f9d31e877fafbb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:43 -0300 Subject: [PATCH 28/63] lxqt.pcmanfm-qt: 0.15.1 -> 0.16.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 599dd67828c..9a6085da02c 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "12rzcv5n4s299c8787islkn4xcjb9bbrj12mxcd5ii91jq39aii4"; + sha256 = "09mlv5qkwzpfz5l41pcz0k01kgsikzkghhfkl84hwyjdm4i2vapj"; }; nativeBuildInputs = [ From c6332e6331bb3b298aeb798fe54436fd5223a5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:44 -0300 Subject: [PATCH 29/63] lxqt.qps: 2.1.0 -> 2.2.0 --- pkgs/desktops/lxqt/qps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 7ef9db40f7c..fea3db315cf 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qps"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva"; + sha256 = "0gfw7iz7jzyfl9hiq3aivbgkkl61fz319cfg57fgn2kldlcljhwa"; }; nativeBuildInputs = [ From 3f3c4fc9f009f2b7eb35735b3c57d99977b9ac67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:44 -0300 Subject: [PATCH 30/63] lxqt.qterminal: 0.15.0 -> 0.16.1 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index c7bcf6dad3b..47a621d2198 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qterminal"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3"; + sha256 = "0l1jhkyx7ihv3nvqm1gfvzhrhl4l8yvqxly0c9zgl6mzrd39cj3d"; }; nativeBuildInputs = [ From 7c68c4c367036274c0887b89d247e2170ebb1932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:44 -0300 Subject: [PATCH 31/63] lxqt.qtermwidget: 0.15.0 -> 0.16.1 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index fc3fb4a5db0..2517b7a4447 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m"; + sha256 = "0kpg4b60h6dads8ncwlk0zj1c8y7xpb0kz28j0v9fqjbmxja7x6w"; }; nativeBuildInputs = [ From e0c2ff1f5b826c6569dbe24367f7ca3ed55b253b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:40:44 -0300 Subject: [PATCH 32/63] lxqt.screengrab: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 6a2e14fa50d..cac2ef27d72 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "screengrab"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6"; + sha256 = "0jy2izgl3jg6mnykpw7ji1fjv7dsivdfi6k6i6glrpa0z1p51gic"; }; nativeBuildInputs = [ From 207735b4226135f9ed47a6f37cbab146276495e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 15 Dec 2020 19:50:07 -0300 Subject: [PATCH 33/63] lxqt: use default qt5 and libsForQt5 --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c412e5c9b..395bb7cacc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26455,10 +26455,8 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - # TODO: Update these to qt515 at some point. When doing it, please remove - # the choice of libsForQt5*.sddm in sddm's module. - qt5 = qt514; - libsForQt5 = libsForQt514; + inherit qt5; + inherit libsForQt5; inherit pkgs; inherit (lib) makeScope; }); From c5f07370f7ca15caaec088e301fb369aceb95abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 16 Dec 2020 10:33:40 -0300 Subject: [PATCH 34/63] nixos/sddm: lxqt moved to libsForQt515 --- nixos/modules/services/x11/display-managers/sddm.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index a39bb55b38c..23b4d8ffb13 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,12 +9,7 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services.display-manager.environment; - sddm = if config.services.xserver.desktopManager.lxqt.enable then - # TODO: Move lxqt to libsForQt515 - pkgs.libsForQt514.sddm - else - pkgs.libsForQt5.sddm - ; + sddm = pkgs.libsForQt5.sddm; xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh From b2594c71c248b78b8526a62f43ad74151a31ac3a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Dec 2020 00:06:42 +0100 Subject: [PATCH 35/63] php.packages: Make packages overridable This will allow patching extensions without having to manually having to patch all occurrences in the dependency tree. --- doc/languages-frameworks/php.section.md | 18 ++++++++++++++++++ pkgs/development/interpreters/php/generic.nix | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 763beeb5935..5977363323f 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -135,3 +135,21 @@ Example of building `composer` with additional extensions: enabled ++ (with all; [ imagick redis ])) ).packages.composer ``` + +### Overriding PHP packages {#ssec-php-user-guide-overriding-packages} + +`php-packages.nix` form a scope, allowing us to override the packages defined within. For example, to apply a patch to a `mysqlnd` extension, you can simply pass an overlay-style function to `php`’s `packageOverrides` argument: + +```nix +php.override { + packageOverrides = final: prev: { + extensions = prev.extensions // { + mysqlnd = prev.extensions.mysqlnd.overrideAttrs (attrs: { + patches = attrs.patches or [] ++ [ + … + ]; + }); + }; + }; +} +``` diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index a3559de9440..82134e14406 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -13,6 +13,7 @@ let , version , sha256 , extraPatches ? [] + , packageOverrides ? (final: prev: {}) # Sapi flags , cgiSupport ? true @@ -50,7 +51,7 @@ let php-packages = (callPackage ../../../top-level/php-packages.nix { phpPackage = phpWithExtensions; - }); + }).overrideScope' packageOverrides; allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; enabledExtensions = From e44a5aacee1b37fa75393cd30a84aeee6f2718fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Dec 2020 18:13:01 +0100 Subject: [PATCH 36/63] zsh-powerlevel10k: 0.14.3 -> 0.14.4 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index c8e845eec99..7e39e6779d1 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; + sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; }; patches = [ From d163a443b858004669a3387c2e31c32dae723ac1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 20 Dec 2020 04:20:00 +0000 Subject: [PATCH 37/63] zeek: 3.2.2 -> 3.2.3 https://github.com/zeek/zeek/releases/tag/v3.2.3 --- pkgs/applications/networking/ids/zeek/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 713156a6621..336e3be074d 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc"; + sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr"; }; nativeBuildInputs = [ cmake flex bison file ]; @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; + changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ pSub marsam tobim ]; platforms = platforms.unix; From bfec6c34b4868659d7722583572802795034623e Mon Sep 17 00:00:00 2001 From: "Matthieu Le brazidec (r3v2d0g)" Date: Sun, 20 Dec 2020 21:15:18 +0100 Subject: [PATCH 38/63] emacs: replace 'emacs.nativeComp' in wrapper with 'nativeComp' --- pkgs/build-support/emacs/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 6314c953b74..a3136839122 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -103,7 +103,7 @@ runCommand } mkdir -p $out/bin mkdir -p $out/share/emacs/site-lisp - ${optionalString emacs.nativeComp '' + ${optionalString nativeComp '' mkdir -p $out/share/emacs/native-lisp ''} From 31e7bbc902d0c04daba4e4ef51f0bc7b3e41dd7d Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 21 Dec 2020 20:35:02 +0100 Subject: [PATCH 39/63] prometheus-lnd-exporter: unstable-2020-01-09 -> unstable-2020-12-04 --- pkgs/servers/monitoring/prometheus/lnd-exporter.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 9499f70e71b..cdece121243 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,17 +1,17 @@ { stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { - pname = "lndmon-unstable"; - version = "2020-01-09"; + pname = "lndmon"; + version = "unstable-2020-12-04"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lndmon"; - sha256 = "0d4z8yv2459wsi4c91qs5an13acn73fd8s321xya5vxxiyf51q24"; - rev = "2c7c5ce0fcb4e7eef4df60efe8a644587a309f6c"; + sha256 = "0q72jbkhw1vpwxd0r80l1v4ab71sakc315plfqbijy7al9ywq5nl"; + rev = "f07d574320dd1a6a428fecd47f3a5bb46a0fc4d1"; }; - vendorSha256 = "083h2ksnqmcr48958r5pag9a28xvljpc3prip6wn70ifp2wpjpin"; + vendorSha256 = "06if387b9m02ciqgcissih1x06l33djp87vgspwzz589f77vczk8"; doCheck = false; From 7bc70734309575715c5b3b8c6018a73027e90d5a Mon Sep 17 00:00:00 2001 From: Luke Worth Date: Tue, 22 Dec 2020 10:41:27 +1100 Subject: [PATCH 40/63] bash: 5.0 -> 5.1 --- pkgs/shells/bash/{5.0.nix => 5.1.nix} | 33 +++++++++++-------- pkgs/shells/bash/bash-5.0-patches.nix | 22 ------------- pkgs/shells/bash/bash-5.1-patches.nix | 8 +++++ ...grp-pipe-5.0.patch => pgrp-pipe-5.1.patch} | 0 pkgs/top-level/all-packages.nix | 4 +-- 5 files changed, 29 insertions(+), 38 deletions(-) rename pkgs/shells/bash/{5.0.nix => 5.1.nix} (85%) delete mode 100644 pkgs/shells/bash/bash-5.0-patches.nix create mode 100644 pkgs/shells/bash/bash-5.1-patches.nix rename pkgs/shells/bash/{pgrp-pipe-5.0.patch => pgrp-pipe-5.1.patch} (100%) diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.1.nix similarity index 85% rename from pkgs/shells/bash/5.0.nix rename to pkgs/shells/bash/5.1.nix index 7120910d79e..8950e5f5b1c 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.1.nix @@ -1,9 +1,15 @@ -{ stdenv, buildPackages -, fetchurl, binutils ? null, bison, util-linux +{ stdenv +, buildPackages +, fetchurl +, binutils ? null +, bison +, util-linux -# patch for cygwin requires readline support -, interactive ? stdenv.isCygwin, readline80 ? null -, withDocs ? false, texinfo ? null + # patch for cygwin requires readline support +, interactive ? stdenv.isCygwin +, readline80 ? null +, withDocs ? false +, texinfo ? null }: with stdenv.lib; @@ -11,21 +17,19 @@ with stdenv.lib; assert interactive -> readline80 != null; assert withDocs -> texinfo != null; assert stdenv.hostPlatform.isDarwin -> binutils != null; - let - upstreamPatches = import ./bash-5.0-patches.nix (nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-5.0-patches/bash50-${nr}"; + upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl { + url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}"; inherit sha256; }); in - stdenv.mkDerivation rec { name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "mirror://gnu/bash/bash-${version}.tar.gz"; - sha256 = "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l"; + sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"; }; hardeningDisable = [ "format" ]; @@ -44,7 +48,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" "-T" ]; patches = upstreamPatches - ++ [ ./pgrp-pipe-5.0.patch ]; + ++ [ ./pgrp-pipe-5.1.patch ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") @@ -87,7 +91,8 @@ stdenv.mkDerivation rec { rm -f $out/lib/bash/Makefile.inc ''; - postFixup = if interactive + postFixup = + if interactive then '' substituteInPlace "$out/bin/bashbug" \ --replace '${stdenv.shell}' "$out/bin/bash" @@ -101,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); + (if interactive then " (for interactive use)" else ""); longDescription = '' Bash is the shell, or command language interpreter, that will diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix deleted file mode 100644 index 4315191d193..00000000000 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ /dev/null @@ -1,22 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") -(patch "002" "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") -(patch "003" "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf") -(patch "004" "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") -(patch "005" "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") -(patch "006" "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") -(patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") -(patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") -(patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") -(patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") -(patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c") -(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9") -(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm") -(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") -(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") -(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") -(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") -(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw") -] diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix new file mode 100644 index 00000000000..b834deda0f8 --- /dev/null +++ b/pkgs/shells/bash/bash-5.1-patches.nix @@ -0,0 +1,8 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b") +(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm") +(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2") +(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls") +] diff --git a/pkgs/shells/bash/pgrp-pipe-5.0.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch similarity index 100% rename from pkgs/shells/bash/pgrp-pipe-5.0.patch rename to pkgs/shells/bash/pgrp-pipe-5.1.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8d38227020..55db97c33a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8687,8 +8687,8 @@ in any-nix-shell = callPackage ../shells/any-nix-shell { }; bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); - bash_5 = lowPrio (callPackage ../shells/bash/5.0.nix { }); - bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.0.nix { + bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { }); + bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { interactive = true; withDocs = true; }); From 30a21ff2245d2b216e3ccfc2a3b90eba1bc29bff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Dec 2020 10:31:56 +0000 Subject: [PATCH 41/63] iosevka-bin: 4.0.3 -> 4.1.1 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 42 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 8b8e4f25fef..5d9ef23d1c4 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.0.3"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 13fad48f900..0cb7a0d0b64 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb"; - iosevka-aile = "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc"; - iosevka-curly = "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn"; - iosevka-curly-slab = "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws"; - iosevka-etoile = "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx"; - iosevka-slab = "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh"; - iosevka-sparkle = "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx"; - iosevka-ss01 = "1c6pfv792cjf5xqjnhjmpvcy36mzr7ymv6h0qwjl94mglw8qrhqs"; - iosevka-ss02 = "1j05p2gky2z2bm5gajnm8mbbc7w1isg8m66lhd7mc42y6ygs0b2g"; - iosevka-ss03 = "1kn9khfkk53my4mhpf43gl4ryd4ibw21f7jv553xlrnhm3vn8hxy"; - iosevka-ss04 = "0bc4mqkxvjyvslrv43rwcmmpfyjiszpi77f6bng60h25ah3kdnqs"; - iosevka-ss05 = "01m2z1vr5a404kxbzgcnavhsz0jj7hqda61bcvvir6xdqb881rp3"; - iosevka-ss06 = "1qdlm9ky3rn6m9mgi2idwiy6jd3f0f74j87ms097khvnh6jg2wd7"; - iosevka-ss07 = "14il043liricgxximsrklx36sfs4qa1a4dw017jaaqarr0gyar49"; - iosevka-ss08 = "19la0b99msphhfbbw88fwkh0ni875q73976mdskvr5j63715cqx3"; - iosevka-ss09 = "1m3rh42941r6nk5dq136vs8iaq8vhclcbl955f6zxcgk4aqdmp84"; - iosevka-ss10 = "1kda7k8jqgpfajq1c6n656wpab7hh9icyiy31l21ilpmj0dzsxx6"; - iosevka-ss11 = "1ch0c3i3063955ckp1af384ad70m6fiff6x6rxqk76s2vsywmxcf"; - iosevka-ss12 = "01s16301rm8mr833zlairv19rb5aavb0lidhy9cr2p0d59p96b0h"; - iosevka-ss13 = "0gnlmfka2hyr1g7a4gw97776aa6j7iz9zjhxliam0gh0iwnz5w41"; - iosevka-ss14 = "1rar6cs8d4x9p0qnwvlkjcnfh1bhk6v7r05v1l68wlsmvrvriv17"; + iosevka = "1k87kb2858hy8w7hwdv2cs37x590flm44rrf9ahpjnbzdf22c35y"; + iosevka-aile = "0zlhkbxzi1bdfag0f6cfcpqb347qqbp8h1jr1166zwys5p92hm5n"; + iosevka-curly = "18b6wjq1jr08zpzp1dq63n54cahjyli5ivk7q6gh5qrvc9qa613w"; + iosevka-curly-slab = "0yf613nkpby501xxn4pwxm3c2lij5b98j5mnfa4phc43gls266fa"; + iosevka-etoile = "0ysj6sjrkky79l3330mp0264shprdr0yrrkj1absijywy4dw2k03"; + iosevka-slab = "04hg24iqc9x49m9i72a4pfx8vgyk03vyg9xbh9fnwm9dk58lv450"; + iosevka-sparkle = "100fas1j4ws4plzbcnlfag1kd2xwr8pcikghd8fw648zkrwrrnw4"; + iosevka-ss01 = "16qsb89z3c3n01l6xp813gs29dy81lmvfbmramm9amphrcx6y5n3"; + iosevka-ss02 = "10qjvkhr9az52spax4b9x3d9cxa189j3yznxpiwsgz641mf4mj4k"; + iosevka-ss03 = "028pzjisfqz4vlb2d8cwmmsxi2440vjayiwg13awllgzkpj3ibra"; + iosevka-ss04 = "1xzxwa91yvv8wbz3p1pmb3x559xic8k3qz8vrfgqzmv9ymyw19q4"; + iosevka-ss05 = "1bcdkydpzadb194nm4gmilj1rm46fblbwif4wcalcnypryfxlqgy"; + iosevka-ss06 = "0r436ajlphqm7qjnzwq972wi5ccyvavw6p2vw75cvwc1s7ihwqkg"; + iosevka-ss07 = "0fxwvwzkzc7xc0jhhppxjk9sm1gdr0qjvxa1szqf6nj2vy86cj73"; + iosevka-ss08 = "0aw28i1r48qn42c6m3q900j3b4i6gnwxjxndc88ybak1fg43sf40"; + iosevka-ss09 = "12nsjk9sxy7f0i0p6qjsc4z6d6w637fllabvsg83dblpkxw1yfac"; + iosevka-ss10 = "12sz1nriq2g776kg70gx9lp0ma7rqgvnrkr15fp791wxkvgwqq5b"; + iosevka-ss11 = "0yvcn9h7yxhp08rnl23j61agkb1p86rjgw8md23dkbxda600knqn"; + iosevka-ss12 = "1vvbnqrmgx2krphf08rdlpn4f6zjypnh69m7yh8cakkbvvr4jnv1"; + iosevka-ss13 = "09g3j713kssrkryb83kw803aa5dlnydvkqn80d666q0xyqv2xcfk"; + iosevka-ss14 = "1psbqdscs223yxdlll7779xpdvkzh0al61jn1ka62by3qizmvl4b"; } From 9a9ad8c78b77aded99d0b652368bea177c297da4 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 12 Nov 2020 16:24:42 +0100 Subject: [PATCH 42/63] esptool: 2.7 -> 3.0, fix #82965 --- pkgs/tools/misc/esptool/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 465e30e7615..d1d6bc1cb10 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,17 +2,31 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "2.7"; + version = "3.0"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31"; + sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln"; }; - checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ]; - propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa ]; + checkInputs = with python3.pkgs; + [ flake8 flake8-future-import flake8-import-order openssl ]; + propagatedBuildInputs = with python3.pkgs; + [ pyserial pyaes ecdsa reedsolo bitstring cryptography ]; + + # wrapPythonPrograms will overwrite esptool.py with a bash script, + # but espefuse.py tries to import it. Since we don't add any binary paths, + # use patchPythonScript directly. + dontWrapPythonPrograms = true; + postFixup = '' + buildPythonPath "$out $pythonPath" + for f in $out/bin/*.py; do + echo "Patching $f" + patchPythonScript "$f" + done + ''; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; From 20a3b851c777707427ce6e5e27d4bd4217b5c74b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Dec 2020 11:50:33 +0100 Subject: [PATCH 43/63] python3Packages.daphne: 2.5.0 -> 3.0.1 --- pkgs/development/python-modules/daphne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 80fa1c35d63..cbd80333b2f 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "2.5.0"; + version = "3.0.1"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "0qkhmblj3a5s3z65cgz46xsvq1b6x4m3kr6aljjnxnv7hcwib02n"; + sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk"; }; nativeBuildInputs = [ pytestrunner ]; From 05fe6112c99d2b93b15dafc32bfc43993c6b8bc4 Mon Sep 17 00:00:00 2001 From: Pierre Allix Date: Tue, 22 Dec 2020 12:56:57 +0100 Subject: [PATCH 44/63] Fix small typo in a comment of emacs-packages --- pkgs/top-level/emacs-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d044ed80048..8075b7da4f5 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -4,7 +4,7 @@ # # Recommended: simply use `emacsWithPackages` with the packages you want. # -# Alterative: use `emacs`, install everything to a system or user profile +# Alternative: use `emacs`, install everything to a system or user profile # and then add this at the start your `init.el`: /* (require 'package) From b36e05ef2f0c3df97faa647d9be7ff7685fedae9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Dec 2020 13:01:33 +0100 Subject: [PATCH 45/63] htop: 3.0.3 -> 3.0.4 --- pkgs/tools/system/htop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index a36cb905d25..bf811942c3e 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y"; + sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"; }; nativeBuildInputs = [ autoreconfHook ]; From 6dd858dc300d0f185ca916d90d862927c7bd07cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Mon, 7 Sep 2020 11:59:17 +0200 Subject: [PATCH 46/63] uwsgi: set UWSGICONFIG_PHPPATH to the php.dev store uwsgi needs to run php-config to get the include path. set the UWSGICONFIG_PHPPATH to the php-config in the php.dev store. Patch common.h to directly include php_session.h (since it's a separate package on nixos). NIX_CFLAGS_LINK was removed since it doesn't seem to be used at all https://github.com/unbit/uwsgi/blob/master/plugins/php/common.h --- ...o-ext-session-php_session.h-on-NixOS.patch | 29 +++++++++++++++++++ pkgs/servers/uwsgi/default.nix | 12 +++++--- 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch diff --git a/pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch b/pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch new file mode 100644 index 00000000000..bde8f4fda1d --- /dev/null +++ b/pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch @@ -0,0 +1,29 @@ +From 6b9b3559d8ce59eda6c5cd6f04224cebaaa5d0ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= + =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= + +Date: Tue, 8 Sep 2020 17:11:39 +0200 +Subject: [PATCH] no ext/session/php_session.h on NixOS + +on NixOS php_session.h is in its own package, and is not installed in +ext/session/ +--- + plugins/php/common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/php/common.h b/plugins/php/common.h +index 9bf1c069..be93f519 100644 +--- a/plugins/php/common.h ++++ b/plugins/php/common.h +@@ -10,7 +10,7 @@ + #endif + #include "ext/standard/info.h" + +-#include "ext/session/php_session.h" ++#include "php_session.h" + + #include + +-- +2.28.0 + diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 39a3113eb41..bb2742ecba8 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -38,8 +38,12 @@ let php-embed = php.override { (lib.nameValuePair "php" { # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; - inputs = [ php-embed ] ++ php-embed.buildInputs; - NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ]; + inputs = [ + php-embed + php-embed.extensions.session + php-embed.extensions.session.dev + php-embed.unwrapped.dev + ] ++ php-embed.unwrapped.buildInputs; }) ]; @@ -61,6 +65,8 @@ stdenv.mkDerivation rec { sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn"; }; + patches = [ ./0001-no-ext-session-php_session.h-on-NixOS.patch ]; + nativeBuildInputs = [ python3 pkgconfig ]; buildInputs = [ jansson pcre ] @@ -94,8 +100,6 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); - meta = with stdenv.lib; { homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; From 87bed6c86aa9abb434b18d4e5e4aa47133eac666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Wed, 9 Sep 2020 12:51:40 +0200 Subject: [PATCH 47/63] uwsgi: the php plugin needs to link with session.so On NixOS the session.so php extension is a separate package (and not builtin in libphp.so). But since the uwsgi php plugin uses the session mechanisms, we need to link the plugin to that library too. With this change uwsgipluginpy is hacked to take an additional UWSGICONFIG_PHP_LDFLAGS environment variable and add it to its LDFLAGS, and then in the nix expression the UWSGICONFIG_PHP_LDFLAGS is set to point to php.extensions.session --- pkgs/servers/uwsgi/additional-php-ldflags.patch | 13 +++++++++++++ pkgs/servers/uwsgi/default.nix | 15 ++++++++++++++- ...> no-ext-session-php_session.h-on-NixOS.patch} | 0 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/uwsgi/additional-php-ldflags.patch rename pkgs/servers/uwsgi/{0001-no-ext-session-php_session.h-on-NixOS.patch => no-ext-session-php_session.h-on-NixOS.patch} (100%) diff --git a/pkgs/servers/uwsgi/additional-php-ldflags.patch b/pkgs/servers/uwsgi/additional-php-ldflags.patch new file mode 100644 index 00000000000..8549d5c2d03 --- /dev/null +++ b/pkgs/servers/uwsgi/additional-php-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +index d930c44e..2fcbc22a 100644 +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py +@@ -17,6 +17,8 @@ php_version = os.popen(PHPPATH + ' --version').read().rstrip().split('.')[0] + CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare'] + LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() + ++LDFLAGS.append(os.environ.get('UWSGICONFIG_PHP_LDFLAGS', [])) ++ + if ld_run_path: + LDFLAGS.append('-L%s' % ld_run_path) + os.environ['LD_RUN_PATH'] = ld_run_path diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index bb2742ecba8..17d430a82ef 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -65,7 +65,10 @@ stdenv.mkDerivation rec { sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn"; }; - patches = [ ./0001-no-ext-session-php_session.h-on-NixOS.patch ]; + patches = [ + ./no-ext-session-php_session.h-on-NixOS.patch + ./additional-php-ldflags.patch + ]; nativeBuildInputs = [ python3 pkgconfig ]; @@ -89,6 +92,16 @@ stdenv.mkDerivation rec { substituteAll ${./nixos.ini} buildconf/nixos.ini ''; + # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) + # the hack works in coordination with ./additional-php-ldflags.patch + UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) + (lib.concatStringsSep "," [ + "-Wl" + "-rpath=${php-embed.extensions.session}/lib/php/extensions/" + "--library-path=${php-embed.extensions.session}/lib/php/extensions/" + "-l:session.so" + ]); + buildPhase = '' mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos diff --git a/pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch b/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch similarity index 100% rename from pkgs/servers/uwsgi/0001-no-ext-session-php_session.h-on-NixOS.patch rename to pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch From 06749ba321ee3f284df74ab848985106eea52c13 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 21 Dec 2020 00:22:29 +0100 Subject: [PATCH 48/63] nixos/tests/uwsgi: test PHP plugin --- nixos/tests/uwsgi.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix index 7f4945a8803..5c0b294e2d2 100644 --- a/nixos/tests/uwsgi.nix +++ b/nixos/tests/uwsgi.nix @@ -4,12 +4,13 @@ import ./make-test-python.nix ({ pkgs, ... }: meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ lnl7 ]; }; + machine = { pkgs, ... }: { services.uwsgi.enable = true; - services.uwsgi.plugins = [ "python3" ]; + services.uwsgi.plugins = [ "python3" "php" ]; services.uwsgi.instance = { type = "emperor"; - vassals.hello = { + vassals.python = { type = "normal"; master = true; workers = 2; @@ -25,6 +26,17 @@ import ./make-test-python.nix ({ pkgs, ... }: ''; pythonPackages = self: with self; [ flask ]; }; + vassals.php = { + type = "normal"; + master = true; + workers = 2; + http-socket = ":8001"; + http-socket-modifier1 = 14; + php-index = "index.php"; + php-docroot = pkgs.writeTextDir "index.php" '' + + ''; + }; }; }; @@ -33,6 +45,8 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("multi-user.target") machine.wait_for_unit("uwsgi.service") machine.wait_for_open_port(8000) + machine.wait_for_open_port(8001) assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000") + assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8001") ''; }) From 41af371de27257746af9089b1254277a1599bd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Mon, 21 Dec 2020 17:52:04 +0100 Subject: [PATCH 49/63] uwsgi: add passthru.tests.uwsgi to derivation --- pkgs/servers/uwsgi/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 17d430a82ef..d9ed810cdf4 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre +{ stdenv, nixosTests, lib, fetchurl, pkgconfig, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -120,4 +120,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar schneefux globin ]; platforms = platforms.unix; }; + + passthru.tests.uwsgi = nixosTests.uwsgi; + } From 5d3baeb1897bf6b7a157943e578e2fb9f93966d9 Mon Sep 17 00:00:00 2001 From: wishfort36 <42300264+wishfort36@users.noreply.github.com> Date: Tue, 22 Dec 2020 14:41:43 +0100 Subject: [PATCH 50/63] polybar: 3.5.0 -> 3.5.2 --- pkgs/applications/misc/polybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index df08de7a4a2..940cd1cdc91 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji"; + sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x"; fetchSubmodules = true; }; From c6f65b1d9303897d53bfbca5fc9af6bd9f25be60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Dec 2020 14:24:52 +0000 Subject: [PATCH 51/63] ulauncher: 5.8.1 -> 5.9.0 --- pkgs/applications/misc/ulauncher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index ba388e8038b..d2522360a75 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.8.1"; + version = "5.9.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "1hgzfiwfk3dd50jmp184y754ydzmfv22qcv7z40gxj6pc67ahx3r"; + sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U="; }; nativeBuildInputs = with python3Packages; [ From 0cefcc625d0428af8fab7b3105b81a8eee7772fa Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 22 Dec 2020 17:55:46 +0100 Subject: [PATCH 52/63] pythonPackages.progressbar2: fix build build failed because tests depend on pytest-pep8 which is unmaintained and therefore not worth packaging. it's probably better to wait for upstream to resolve the linked issue. --- .../python-modules/progressbar2/default.nix | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 789828b7143..55590f8bd06 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -2,15 +2,7 @@ , python , buildPythonPackage , fetchPypi -, pytest , python-utils -, sphinx -, flake8 -, pytest-flakes -, pytestcov -, pytestcache -, pytestrunner -, freezegun }: buildPythonPackage rec { @@ -23,17 +15,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ python-utils ]; - nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ - pytest sphinx flake8 pytest-flakes pytestcov - pytestcache freezegun - ]; - # ignore tests on the nix wrapped setup.py - checkPhase = '' - runHook preCheck - ${python.interpreter} setup.py test - runHook postCheck - ''; + + # depends on unmaintained pytest-pep8 + # https://github.com/WoLpH/python-progressbar/issues/241 + doCheck = false; + + pythonImportsCheck = [ "progressbar" ]; meta = with stdenv.lib; { homepage = "https://progressbar-2.readthedocs.io/en/latest/"; From 6fc561f950fd07337d4387a34736e7f963b0cde0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Dec 2020 14:26:34 -0500 Subject: [PATCH 53/63] python3Packages.botocore: 1.19.40 -> 1.19.41 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index d1604ec948d..2d00011526a 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.40"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.41"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-6/qICsjLgTLcZleQK/VG9SzyxDJ4Vw9gyPig+JRVZVU="; + sha256 = "sha256-VKillJeoO6LYn7lPht0HtiLXtfHW6ZJSIuu8ResNY6w="; }; propagatedBuildInputs = [ From d943d0a2a94b3deb732c294d2c0b6f1b06b82fa7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Dec 2020 14:26:41 -0500 Subject: [PATCH 54/63] python3Packages.boto3: 1.16.40 -> 1.16.41 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index c39fe0b22b4..d79fc6ec09d 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.40"; # N.B: if you change this, change botocore too + version = "1.16.41"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-dTJogqpo4ANFLc2PD87gM5/2NiQRWSf7caa10VU1rOU="; + sha256 = "sha256-DYTobuAuMshtMONd6WgDA6SAhz3S6Z3NyDSGuS3/sDw="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 8e3726f3c53271c3448ce9044e43d3f58a5d8bcd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Dec 2020 14:27:20 -0500 Subject: [PATCH 55/63] awscli: 1.18.200 -> 1.18.201 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 98bafb1ac9c..a80536821b2 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.200"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.201"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-UgG9fY7WqHMHpJYXQ7VEkiv9htcqP36OVXlE95eWsZg="; + sha256 = "sha256-w3kZgB8rIEFlJ7cikU0ISTAl/3c8MzKQL2B2Rrr1B8c="; }; postPatch = '' From 96396f35b881522a97546de68772757335bc6343 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Dec 2020 14:36:53 -0500 Subject: [PATCH 56/63] linux-rt_5_4: 5.4.82-rt45 -> 5.4.84-rt47 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 9f64abc55a0..25e3172b0f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.82-rt45"; # updated by ./update-rt.sh + version = "5.4.84-rt47"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1byx163v83aw0ixphwz20znml2s2n3cy1kp89vgwbdiqxbj5hi7v"; + sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0nh7d5b81br3cpljmn5n7lgn877h02aal95782hiflv7cmrb597r"; + sha256 = "0nccxf9l9ycvb782f48zrbl59vi674qq7yjyaks97440pgyd1jg0"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 371b86735f24d8d4aa6453ea9cfa5c8d7658d008 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Dec 2020 14:37:19 -0500 Subject: [PATCH 57/63] linux/hardened/patches/5.4: 5.4.84.a -> 5.4.85.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 ea7ed207642..7c8561ce77b 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.163.a/linux-hardened-4.19.163.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.84.a.patch", - "sha256": "1pwij0bxgf61ahi6fa8qwrr85yhx92z4sif71kdgxkbwcw9qwyzs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.84.a/linux-hardened-5.4.84.a.patch" + "name": "linux-hardened-5.4.85.a.patch", + "sha256": "1ml9vpakhpxry29c4q0fz346ly7s3hwd7rasr4dzkgs71lm5a1sy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.85.a/linux-hardened-5.4.85.a.patch" }, "5.9": { "name": "linux-hardened-5.9.15.a.patch", From bf0589a3c5f049c2aafafcc0bd5d32119d00ddc2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 22 Dec 2020 14:37:21 -0500 Subject: [PATCH 58/63] linux/hardened/patches/5.9: 5.9.15.a -> 5.9.16.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 7c8561ce77b..0ea36ce8f44 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.85.a/linux-hardened-5.4.85.a.patch" }, "5.9": { - "name": "linux-hardened-5.9.15.a.patch", - "sha256": "1iqkw4mnr1p9wzfmjy5lawc6cn9wvg05xsak24fzbp1i22h4dfz4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.15.a/linux-hardened-5.9.15.a.patch" + "name": "linux-hardened-5.9.16.a.patch", + "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch" } } From 0f8e7ab73710a888b244defee981e64e49a4b9fc Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Tue, 22 Dec 2020 19:49:17 +0000 Subject: [PATCH 59/63] mapproxy: 1.12.0 -> 1.13.0 (#107203) Switched to using python3, because pyproj fails to build with python2 --- pkgs/applications/misc/mapproxy/default.nix | 33 ++++----------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 41ae683548d..48e2a3960ee 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -1,38 +1,15 @@ { lib , pkgs -, python +, python3 }: -let - py = python.override { - packageOverrides = self: super: { - pyproj = super.pyproj.overridePythonAttrs (oldAttrs: rec { - version = "1.9.6"; - src = pkgs.fetchFromGitHub { - owner = "pyproj4"; - repo = "pyproj"; - rev = "v${version}rel"; - sha256 = "18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy"; - }; - nativeBuildInputs = with python.pkgs; [ cython ]; - patches = [ ]; - checkPhase = '' - runHook preCheck - pushd unittest # changing directory should ensure we're importing the global pyproj - ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])" - popd - runHook postCheck - ''; - }); - }; - }; -in -with py.pkgs; + +with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "622e3a7796ef861ba21e42231b49c18d00d75f03eaf3f01a2b7687be7568e2ec"; + sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4"; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" From fd4e4bd8bee303ac4756f806ec910f426fd5c447 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 Dec 2020 14:10:01 -0800 Subject: [PATCH 60/63] waffle: Use meson instead of cmake The cmake build system is deprecated upstream. --- pkgs/development/libraries/waffle/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 66a1b7ab145..aa59bf6fb9e 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchFromGitLab , lib -, cmake +, meson +, ninja , libGL , libglvnd , makeWrapper @@ -9,6 +10,7 @@ , wayland , libxcb , libX11 +, python3 }: stdenv.mkDerivation rec { @@ -32,12 +34,16 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake + meson + ninja makeWrapper pkg-config + python3 ]; - cmakeFlags = [ "-Dplatforms=x11,wayland" ]; + mesonFlags = [ + "-Dgbm=disabled" + ]; postInstall = '' wrapProgram $out/bin/wflinfo \ From 807c0b0df59b597ed3682a06be00eb058b03bdb2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 Dec 2020 15:01:27 -0800 Subject: [PATCH 61/63] waffle: Add support for non-linux platforms Waffle works perfectly well on macOS and Windows. Because the meson options do proper dependency checking already, we can just leave them out. This has the additional benefit of allowing gbm, surfaceless_egl and x11_egl supoort to be built on Linux, which are useful in conjunction with the piglit test suite. --- pkgs/development/libraries/waffle/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index aa59bf6fb9e..0f1e36b3579 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -4,15 +4,20 @@ , meson , ninja , libGL -, libglvnd +, libglvnd ? null , makeWrapper , pkg-config -, wayland -, libxcb -, libX11 , python3 +, x11Support ? true, libxcb ? null, libX11 ? null +, waylandSupport ? true, wayland ? null +, useGbm ? true, mesa ? null, libudev ? null }: +assert x11Support -> (libxcb != null && libX11 != null); +assert waylandSupport -> wayland != null; +assert useGbm -> (mesa != null && libudev != null); +assert with stdenv.hostPlatform; isUnix && !isDarwin -> libglvnd != null; + stdenv.mkDerivation rec { pname = "waffle"; version = "1.6.1"; @@ -27,10 +32,16 @@ stdenv.mkDerivation rec { buildInputs = [ libGL + ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ libglvnd + ] ++ stdenv.lib.optionals x11Support [ libX11 libxcb + ] ++ stdenv.lib.optionals waylandSupport [ wayland + ] ++ stdenv.lib.optionals useGbm [ + mesa + libudev ]; nativeBuildInputs = [ @@ -41,10 +52,6 @@ stdenv.mkDerivation rec { python3 ]; - mesonFlags = [ - "-Dgbm=disabled" - ]; - postInstall = '' wrapProgram $out/bin/wflinfo \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} From dd5ffa7b94a19f4aeadbe49f53f6e3008fc1d7ad Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Tue, 22 Dec 2020 15:48:49 -0800 Subject: [PATCH 62/63] libdnf: init at 0.55.2 --- .../package-management/libdnf/darwin.patch | 35 ++++++++++ .../package-management/libdnf/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 103 insertions(+) create mode 100644 pkgs/tools/package-management/libdnf/darwin.patch create mode 100644 pkgs/tools/package-management/libdnf/default.nix diff --git a/pkgs/tools/package-management/libdnf/darwin.patch b/pkgs/tools/package-management/libdnf/darwin.patch new file mode 100644 index 00000000000..56bafb2f7b8 --- /dev/null +++ b/pkgs/tools/package-management/libdnf/darwin.patch @@ -0,0 +1,35 @@ +--- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800 ++++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800 +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800 ++++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800 +@@ -24,7 +24,20 @@ + #include + #include + #include +-#include ++ ++// Darwin compatibility hacks ++typedef int auxv_t; ++#ifndef AT_HWCAP2 ++#define AT_HWCAP2 26 ++#endif ++#ifndef AT_HWCAP ++#define AT_HWCAP 16 ++#endif ++static unsigned long getauxval(unsigned long type) ++{ ++ unsigned long ret = 0; ++ return ret; ++} + + // hawkey + #include "dnf-types.h" diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix new file mode 100644 index 00000000000..480222a45de --- /dev/null +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -0,0 +1,66 @@ +{ gcc9Stdenv, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check +, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: + +gcc9Stdenv.mkDerivation rec { + pname = "libdnf"; + version = "0.55.2"; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = pname; + rev = version; + sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + ]; + + buildInputs = [ + check + gpgme + openssl + json_c + libsmartcols + libyaml + libmodulemd + ]; + + propagatedBuildInputs = [ + sqlite + libsolv + librepo + rpm + ]; + + # See https://github.com/NixOS/nixpkgs/issues/107430 + prePatch = '' + cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ + ''; + + # See https://github.com/NixOS/nixpkgs/issues/107428 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "enable_testing()" "" \ + --replace "add_subdirectory(tests)" "" + ''; + + cmakeFlags = [ + "-DWITH_GTKDOC=OFF" + "-DWITH_HTML=OFF" + "-DWITH_BINDINGS=OFF" + "-DWITH_ZCHUNK=OFF" + ]; + + meta = with stdenv.lib; { + description = "Package management library."; + homepage = "https://github.com/rpm-software-management/libdnf"; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ rb2k ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af37c084485..2c6cf079777 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13977,6 +13977,8 @@ in libdnet = callPackage ../development/libraries/libdnet { }; + libdnf = callPackage ../tools/package-management/libdnf { }; + libdrm = callPackage ../development/libraries/libdrm { }; libdv = callPackage ../development/libraries/libdv { }; From 638eefae70a0d8954e043f77a5fc9021d0a8fa25 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Tue, 22 Dec 2020 15:48:59 -0800 Subject: [PATCH 63/63] microdnf: init at 3.6.0 --- .../package-management/microdnf/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/package-management/microdnf/default.nix diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix new file mode 100644 index 00000000000..de473cf6a89 --- /dev/null +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }: + +stdenv.mkDerivation rec { + pname = "microdnf"; + version = "3.6.0"; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = pname; + rev = version; + sha256 = "0a7lc3qsnblvznzsz3544l3n84184xi85zf7c3m3jhnmpmxsg39h"; + }; + + nativeBuildInputs = [ pkg-config cmake gettext help2man ]; + buildInputs = [ libdnf glib libpeas libsmartcols ]; + + meta = with stdenv.lib; { + description = "Lightweight implementation of dnf in C"; + homepage = "https://github.com/rpm-software-management/microdnf"; + license = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ rb2k ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c6cf079777..6e8e4f713e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5741,6 +5741,8 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + microdnf = callPackage ../tools/package-management/microdnf { }; + microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { };