From 891d1aa885ab86c60aa0d6feafb2a94a803204ec Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Sat, 30 Jan 2021 12:52:02 +0100 Subject: [PATCH 01/99] nixos/nginx: serve unknown MIME-Types as binary The built-in default for unknown MIME-Types is `text/plain` whereas the upstream default config changes it to `application/octet-stream`. By changing the default tpye, unknown files will be downloaded by browsers instead of being displayed. --- nixos/modules/services/web-servers/nginx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index d6f463be9e81..145b45e0748d 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -79,6 +79,8 @@ let include ${pkgs.mailcap}/etc/nginx/mime.types; include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/uwsgi_params; + + default_type application/octet-stream; ''; configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' From 4dd63848b1d70cab375149a03ffb810f43393f34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 15:57:37 +0000 Subject: [PATCH 02/99] libebur128: 1.2.4 -> 1.2.5 --- pkgs/development/libraries/libebur128/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index ba4f84f8c803..db6c9f93faec 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.5"; pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; + sha256 = "sha256-B6MOSbLfPvadXtXHSvxZCIpAH1Bnj6sItYRp+xH5HDA="; }; nativeBuildInputs = [ cmake pkg-config ]; From 013635e98c677f065b66a1f6de8bd543fb725f0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 16:10:43 +0000 Subject: [PATCH 03/99] librepo: 1.12.1 -> 1.13.0 --- pkgs/tools/package-management/librepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 9ec5c3c13b39..4009d1113073 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.1"; + version = "1.13.0"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; + sha256 = "sha256-gK1pkcZAJVXx0cYGs8PA4iPSMOwgJZI9Hqrrs1ZITDo="; }; nativeBuildInputs = [ From 01b013e7bd95a802315d94f21df9c3fd5d88e7e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 17:05:24 +0000 Subject: [PATCH 04/99] minio: 2021-01-16T02-19-44Z -> 2021-02-01T22-56-52Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 9477da8a3f80..ff6e23bc05bf 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-01-16T02-19-44Z"; + version = "2021-02-01T22-56-52Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-eYOarXgx5+rXCw2gMzrH1vVSsIdN4WrHrAUnnCcLtN8="; + sha256 = "sha256-cAQErFWFqyHJpTGxbzY5JCSH/ZV0ZZOWbh1lJmK8MlY="; }; - vendorSha256 = "sha256-6p/DBgHawsT5PjpzwjrKgZfWm5Z6v1ozMWzGpEiB2jM="; + vendorSha256 = "sha256-1wnnt4QuOn+1NqZcuA43naP3KtIL5VbVr6VF3+Cu41w="; doCheck = false; From 26552bfc4331c36b6730ff77151a1c840beedbff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 17:09:20 +0000 Subject: [PATCH 05/99] minio-client: 2021-01-16T02-45-34Z -> 2021-01-30T00-50-42Z --- pkgs/tools/networking/minio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 9d667d0ee1dc..98abf7e843e3 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-01-16T02-45-34Z"; + version = "2021-01-30T00-50-42Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-1JUCoeLFMDvzT5KdQw+ZdYWPgdWKIL3kJ/LCIsqc6xE="; + sha256 = "sha256-6t9x2kViSUyZMbe9OFdoCFN4y/swelMVOm80YvOizwM="; }; vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A="; From 2cfab8b61c7d302f6dd768f5bf48b119d3a5d888 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 18:10:45 +0000 Subject: [PATCH 06/99] node-problem-detector: 0.8.5 -> 0.8.6 --- .../networking/cluster/node-problem-detector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 6be32ed17a4b..ffc682ca4d90 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "0lm691w4v2sdv5i2dkszwv6g11ig2aavlbxh40kjlmc05dz7dapv"; + sha256 = "sha256-8qY99sEEOFY2eMfuZSWv49nw1LKVHn50P1gYQN6y2f4="; }; vendorSha256 = null; From 65a42ceda5554125704954e25c1331c0c82fd61b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 18:45:30 +0000 Subject: [PATCH 07/99] openlibm: 0.7.3 -> 0.7.4 --- pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 2c4198d9679a..5bfef9e8ba3b 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k"; + sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4="; }; makeFlags = [ "prefix=$(out)" ]; From 5f14314d61e0631c83b78752958b7eafbf03390b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 21:20:07 +0000 Subject: [PATCH 08/99] pwsafe: 3.53.0 -> 3.55.0 --- pkgs/applications/misc/pwsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 2e7c77c0935a..6aa1099c35c8 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "3.53.0"; + version = "3.55.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; + sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o="; }; nativeBuildInputs = [ From 292c68c253fd7c6556fcf9f1b5fe46d3d12bb05a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 21:57:28 +0000 Subject: [PATCH 09/99] rar2fs: 1.29.2 -> 1.29.4 --- 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 a3056a80aa1f..ddd37387fae6 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.2"; + version = "1.29.4"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "0j7ai0gcbln2lyfc87xxmj0zpf3lnqa6fdm5rar3kdqhczb7s93y"; + sha256 = "sha256-O14KuzngzsGazvwz3FCPe0SplO8I6CPJjpCLBPcZq6k="; }; postPatch = '' From 9db38e5fea8ec396ef317d6349aac3671d28ef7f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 22:34:24 +0000 Subject: [PATCH 10/99] rng-tools: 6.9 -> 6.11 --- pkgs/tools/security/rng-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 617224a6af36..76aea2bbd514 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -14,13 +14,13 @@ with lib; stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.9"; + version = "6.11"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; rev = "v${version}"; - sha256 = "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98"; + sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M="; }; postPatch = '' From 90fd0c071415142429e979525a7e4cb1564f328f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 23:11:03 +0000 Subject: [PATCH 11/99] samurai: 1.1 -> 1.2 --- pkgs/development/tools/build-managers/samurai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index 4360a3f3a308..1fb4206d5cec 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "samurai"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "michaelforney"; repo = pname; rev = version; - sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz"; + sha256 = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; }; makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; From ebc8eea8cb062baf86074e9a18d1f1f097f9dabc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 23:37:31 +0000 Subject: [PATCH 12/99] semver-tool: 2.1.0 -> 3.2.0 --- pkgs/development/tools/misc/semver-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 0c1bb8ede1b8..0cfbd0680ba6 100644 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ b/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "2.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr"; + sha256 = "sha256-coy/g4nEvSN+0/aqK2r3EEIaoUcnsZhzX66H1qsK9ac="; }; dontBuild = true; # otherwise we try to 'make' which fails. From 2ba43fb19146a59e5151b6f79aaa6e289c097bfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 23:41:28 +0000 Subject: [PATCH 13/99] sensu-go-agent: 6.1.2 -> 6.2.3 --- pkgs/servers/monitoring/sensu-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 6755aeb9968c..e63cf4851668 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "6.1.2"; + version = "6.2.3"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "1g4vh4ay5m3sl00j8rn4db87kfdyxcmnaf0rxnv4ah2fbj5nrh2n"; + sha256 = "sha256-8+ibl2D8hSzFV+snJAxRNTiyYqCndUDGVCVKt2bkPlQ="; }; inherit subPackages postInstall; - vendorSha256 = "12qi94k8fjx0kaq2x977yhan8ynd6j6cbqx1l60gqs2xgkm71k9r"; + vendorSha256 = "sha256-KykxKJxel4E5VB8QAkEpBBaA7hKfSnTDkJ9qlNEln80="; doCheck = false; From caa9794fcef7fe6d5dc48e4780b01e470ae5927d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 23:57:49 +0000 Subject: [PATCH 14/99] sickgear: 0.23.5 -> 0.23.10 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index afae82b4d391..d9a3332e0214 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.5"; + version = "0.23.10"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "03wxrf9iyaianlnlcx8ks04r0snpg32a3qbq36cykcq2x55qnczq"; + sha256 = "sha256-EkExTDU7T7FYZrDtF0AF8wjn9fp8y9SLmINYGv8zvXk="; }; dontBuild = true; From 3c3fcfc5d39f780b1ef78882eabd3acdb384333d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 01:38:18 +0000 Subject: [PATCH 15/99] bitwig-studio: 3.3.1 -> 3.3.2 --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 2a12632494b0..9644182861d0 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi"; + sha256 = "sha256-R1e+eTheS9KqPIHw1QoMJgpSB1ss0gwTUGAojdJM0Zw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; From 0cc64a97716998655c65fcd089d38805a025ecee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 07:56:11 +0000 Subject: [PATCH 16/99] fasm: 1.73.25 -> 1.73.27 --- pkgs/development/compilers/fasm/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 8013b443162c..daadebf4c4dc 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.25"; + version = "1.73.27"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "0k3h61mfwslyb34kf4dnapfwl8jxlmrp4dv666wc057hkj047knn"; + sha256 = "sha256-aAFIN3+207ZmOFKID6oDUU1zJrWZV0LTOofiRPSM8LE="; }; installPhase = '' From 46c5a7c57f95f913da1ea22f517a17c13cce2356 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 13:15:43 +0000 Subject: [PATCH 17/99] grisbi: 2.0.0 -> 2.0.1 --- pkgs/applications/office/grisbi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 9fc7a84231b8..9d085b6c8830 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-b3I87tlXhIjM/bFjhsJTNFQvZxIGKsIbsf4zZT5sHXg="; + sha256 = "sha256-hFLiVHyEekCP9btO75e5ni70ZcLhjbBGCBjF2gERIqs="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; From 1d474062fb4153dccbcfc2b7dbd0a57d99bfb32b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 17:20:40 +0000 Subject: [PATCH 18/99] leftwm: 0.2.5 -> 0.2.6 --- pkgs/applications/window-managers/leftwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index cdef71c965e9..72170401d793 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "03kk3vg0r88317zv8j2bj44wq2fwxi25rv1aasvayrh1i5j6zr10"; + sha256 = "sha256-hirT0gScC2LFPvygywgPiSVDUE/Zd++62wc26HlufYU="; }; - cargoSha256 = "0m4sv4chxzk60njixlyja44rpn04apf3bm04fgd3v7abpr169f2s"; + cargoSha256 = "sha256-j57LHPU3U3ipUGQDrZ8KCuELOVJ3BxhLXsJePOO6rTM="; buildInputs = [ makeWrapper libX11 libXinerama ]; From fe4f809ff451193220572c3ef15ed40550ba59f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 21:48:44 +0000 Subject: [PATCH 19/99] libosinfo: 1.8.0 -> 1.9.0 --- pkgs/development/libraries/libosinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a6b170167198..c3852f25741f 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1988l5rykpzvml1l7bi2hcax0gdc811vja0f92cnr7r01nz35zs9"; + sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k="; }; outputs = [ "out" "dev" "devdoc" ]; From 532f38e64541207b4e107db97b4047d7e9573df1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 21:58:14 +0000 Subject: [PATCH 20/99] openmpt123: 0.5.4 -> 0.5.5 --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5a610284c21e..8e6113a716d2 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.4"; + version = "0.5.5"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk"; + sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s="; }; enableParallelBuilding = true; From 08fdd03217532673881ccb534809659a26273638 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 22:23:10 +0000 Subject: [PATCH 21/99] lighttpd: 1.4.58 -> 1.4.59 --- pkgs/servers/http/lighttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index afc7c5c7453a..be631dd341e9 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.58"; + name = "lighttpd-1.4.59"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4="; + sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU="; }; postPatch = '' From ad41cccf90f0b1fc7bf397006a4e45b17cc78fec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 22:47:35 +0000 Subject: [PATCH 22/99] logcheck: 1.3.20 -> 1.3.22 --- pkgs/tools/system/logcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index bdf2a4bcd302..6fd66b40e15e 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "logcheck"; - version = "1.3.20"; + version = "1.3.22"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz"; + sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4="; }; prePatch = '' From ec7c5b9aa08d134220a4de70907f50a71f2efb27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 04:23:50 +0000 Subject: [PATCH 23/99] metabase: 0.37.5 -> 0.37.8 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 0e1b207a755a..48b5a7195b5b 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.5"; + version = "0.37.8"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1wvq5nx3y28w8wn6wyy650gc32hgkx7inbcylrdirhagzqhcm8z6"; + sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30="; }; nativeBuildInputs = [ makeWrapper ]; From 80b5e32b196f73aab1b84b771f5e25ff7f457764 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 04:42:25 +0000 Subject: [PATCH 24/99] libngspice: 33 -> 34 --- pkgs/development/libraries/libngspice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 72fbcd1ab084..2f8aab830da0 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "33"; + version = "34"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "1wa1hmpn13spmxqgbb1m7vgy32mwvjqwrxhymzll8z65q5nbd7dr"; + sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; }; nativeBuildInputs = [ flex bison ]; From da35462fd6976852ad05b66c0bc88b1f07ee9079 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 07:10:42 +0000 Subject: [PATCH 25/99] oauth2_proxy: 6.1.1 -> 7.0.0 --- pkgs/servers/oauth2_proxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 4fd6a398a30d..8e57e253435a 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "10vvib4089yywd10kigjszsfxkzv8xzj7dy3wr5df8h80rcfa74n"; + sha256 = "sha256-yH60mfuYRv31I0DOEtWxqGCzKOwDYsQh4yjvYO3vq3I="; rev = "v${version}"; }; - vendorSha256 = "0z8ibmpil899xvjaw7siswy22shjhx17a6lnjpr62paqdxy1sfwc"; + vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); From 5cd325c344d4c4f9f097768d765de203556fc1ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 07:50:17 +0000 Subject: [PATCH 26/99] okteta: 0.26.4 -> 0.26.5 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index b2011c5d8e65..296a1eb2ad89 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.4"; + version = "0.26.5"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "00qgzm5mqx0j8f0fznhnw76l9pjyw3lxirvy8ssq59nqqjbb08pg"; + sha256 = "sha256-n8ft//c+ewWDr1QLDAUvkiHKPxHqP8NgTCvO2wnCmpc="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From 486ce11fa8624da806649700a15102e0ef23b3a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 08:13:11 +0000 Subject: [PATCH 27/99] osinfo-db-tools: 1.8.0 -> 1.9.0 --- pkgs/tools/misc/osinfo-db-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index e7a5d38a9161..cb3e8bd057ad 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; + sha256 = "sha256-JV8ch4us7HDDAg/1qcsPa9hhygAJ8kYI31729i1SQ8A="; }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; From 0a23b3dd94032290c5c4165041443a12f6fe2db5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 14:14:48 +0000 Subject: [PATCH 28/99] plantuml: 1.2021.0 -> 1.2021.1 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 0355c65ac6c1..eb267e6007a4 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2021.0"; + version = "1.2021.1"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-QERrsTB8GO+B8DZkl1Ruru9Bw+uL9ojQbJ321sbqIws="; + sha256 = "sha256-FOM+hao1lx6EJMccbhLzvVVmCR3F/igHTGN1vhhdmdQ="; }; nativeBuildInputs = [ makeWrapper ]; From 96270247aed6319e9e681a1dfcf4bd42ebdba0f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 15:05:35 +0000 Subject: [PATCH 29/99] prometheus-pushgateway: 1.3.1 -> 1.4.0 --- pkgs/servers/monitoring/prometheus/pushgateway.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 6eb9b4eb580d..0bdb0680ae9d 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "pushgateway"; - version = "1.3.1"; + version = "1.4.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "sha256-z8xM9rq7wKH7bwzjSmGh+2pO5Y10szmIH82ztRrOCNs="; + sha256 = "sha256-230JgG+TtAuopkkcUda+0hl8E6WXOtTUygWoyorLiEU="; }; buildUser = "nix@nixpkgs"; From fd472b24d2d1b3c4ab85245536b11e5d87441635 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 Feb 2021 23:04:43 +0000 Subject: [PATCH 30/99] python37Packages.confluent-kafka: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index cd2ddf9da69a..589753cd1cb5 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "9ac812006000887f76c95b8a33a9f0b65845bf072fbc54a42a1acffd34e41120"; + sha256 = "8a9caabdb02e87cd65c7f10f689ba3f1a15f8774de455e96fa5fc56eecfee63c"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; From 507d7154fbd183121aa0b2168f8eb67be871b161 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 5 Feb 2021 19:14:31 -0500 Subject: [PATCH 31/99] supertuxkart: fix build --- pkgs/games/super-tux-kart/default.nix | 71 +++++++++++++++++++++------ 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 1729e2fc2853..961842e8701c 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,15 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper -, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz -, mcpp, wiiuse, angelscript +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, fetchsvn +, cmake +, pkg-config +, makeWrapper +, SDL2 +, glew +, openal +, libvorbis +, libogg +, curl +, freetype +, bluez +, libjpeg +, libpng +, enet +, harfbuzz +, mcpp +, wiiuse +, angelscript }: - let dir = "stk-code"; assets = fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18218"; + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18218"; sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw"; - name = "stk-assets"; + name = "stk-assets"; }; # List of bundled libraries in stk-code/lib to keep @@ -36,19 +55,28 @@ let # Not packaged to this date "sheenbidi" ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "supertuxkart"; version = "1.2"; src = fetchFromGitHub { - owner = "supertuxkart"; - repo = "stk-code"; - rev = version; + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6"; - name = dir; + name = dir; }; + patches = [ + (fetchpatch { + # Fix build with SDL 2.0.14 + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch?id=288360dc7ce2f968a2f12099edeace3f3ed1a705"; + sha256 = "1jgab9393qan8qbqf5bf8cgw4mynlr5a6pggqhybzsmaczgnns3n"; + }) + ]; + # Deletes all bundled libs in stk-code/lib except those # That couldn't be replaced with system packages postPatch = '' @@ -58,12 +86,25 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ - SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz - mcpp wiiuse angelscript + SDL2 + glew + openal + libvorbis + libogg + freetype + curl + bluez + libjpeg + libpng + enet + harfbuzz + mcpp + wiiuse + angelscript ]; cmakeFlags = [ - "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs + "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 "-DCHECK_ASSETS=OFF" "-DUSE_SYSTEM_WIIUSE=ON" From 9856c3a49dda334f8413d18181616d2a0a3d8162 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 08:39:31 +0000 Subject: [PATCH 32/99] calamares: 3.2.35.1 -> 3.2.36 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index a671090460ea..e79774da9177 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.35.1"; + version = "3.2.36"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4="; + sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From d141355ca59a72374728a5e823e331312709796b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 09:05:05 +0000 Subject: [PATCH 33/99] chezmoi: 1.8.10 -> 1.8.11 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 48d8b7c89301..dc1a49a40bf2 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY="; + sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; }; - vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY="; + vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; doCheck = false; From 9864d3a4ca506b6634bbba07ecf6eb6899ef44ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 09:23:11 +0000 Subject: [PATCH 34/99] cloudflared: 2021.1.5 -> 2021.2.1 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 810ea11b017b..6b1df1acf5ad 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.1.5"; + version = "2021.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00="; + sha256 = "sha256-kmlyj6Q+OAJ0cKMeWxajPDBm99WpRf+Gpvc+Jy79DCo="; }; vendorSha256 = null; From f2212b86d8ee112109b176faa91665c37c20351d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 09:33:52 +0000 Subject: [PATCH 35/99] code-minimap: 0.4.3 -> 0.5.0 --- pkgs/tools/misc/code-minimap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 4808fe3ef564..462fc51b2890 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc"; + sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; }; - cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; + cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; meta = with lib; { description = "A high performance code minimap render"; From f5bac9f2e98d3551c0ba3e679d3074f14f9f0149 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 09:46:08 +0000 Subject: [PATCH 36/99] crawl: 0.26.0 -> 0.26.1 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 8d16b2fe59cc..7b644aa71476 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi"; + sha256 = "sha256-lh0lCMZRH+c6jSHjLFDU3wjy6Oyp59ZcPaqg5PWVrkk="; }; # Patch hard-coded paths and remove force library builds From 9002c3fa0f34742923bae7721d73dd15fa233bd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 10:22:30 +0000 Subject: [PATCH 37/99] doppler: 3.21.0 -> 3.22.0 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 08a83f8c9b2d..1222ade4ad70 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.21.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ll4PabDy5xnyi+cZdjvSySizRCxthRY7uHLzdYP6U5M="; + sha256 = "sha256-Vx+f2IgCOdRxCVppkJNzVDBnsWjt4X96PyCJl9MmfWI="; }; vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; From 65fb91887536dfbae95c25328164276f8644e6c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 10:39:49 +0000 Subject: [PATCH 38/99] emplace: 0.4.3 -> 0.4.4 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 1497d09734f0..d70d7af30b0f 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qx989u2893Jv4/ZUdSqZk+q/FUjo0GDoVzeS63AO2HA="; + sha256 = "sha256-OKKAYZz2ytiuc/U4fOZepBDvupzQdWC0Wk3wDi+Ih6w="; }; - cargoSha256 = "sha256-s0RIEZw8FOdKqMXgDPNXmqp7V6flzE8eF1J/rSK+qKs="; + cargoSha256 = "sha256-jEplQ/r/XPvLIQrQAiR1Fde5yfE98UuqDazPcEgvo+w="; meta = with lib; { description = "Mirror installed software on multiple machines"; From dbc901b1ab47b7ab9da283af15e80711cf9d0852 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 12:08:59 +0000 Subject: [PATCH 39/99] git-quick-stats: 2.1.5 -> 2.1.6 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index ed9205ee2516..3fda533c5277 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-d5B+SSUXtOD4x+dChQsUCkiHuHcW3lOrL4QhQekY7cA="; + sha256 = "sha256-l3Aftu1RkcDgzdzrKIAlziDgbjYfj5xLIbysS0a5JZw="; }; nativeBuildInputs = [ makeWrapper ]; From 2118f68aefe0fdf3ae53644b69d04ed3478680df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 12:23:47 +0000 Subject: [PATCH 40/99] go-swagger: 0.26.0 -> 0.26.1 --- pkgs/development/tools/go-swagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 1515dae3391d..94f9b6d8ebe8 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mBBjZRjaD1m6sIKR1/MRAKW25bGVNihxBwQMbw/lby4="; + sha256 = "sha256-gA7YpzroIP26u/kmbwlcYkWVfeJ8YDEAl0H9GGQrXA8="; }; - vendorSha256 = "sha256-Am0ypcViUcAcf96qv5qE7K3FvQuQs1XlpIqZf2upWyc="; + vendorSha256 = "sha256-eRcE6ai7076HqTWRJ8zKoV6/PJRgUpKvKF+0T7MgLQE="; doCheck = false; From 7cb90ef9bbc617548d39841ce97d82278a9853d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 12:44:24 +0000 Subject: [PATCH 41/99] grafana-agent: 0.11.0 -> 0.12.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 520aedf2c3f5..1d5715176cae 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "092ry9gq9fpkkgsdymfwzdxz982pp0ljf2gs6mp419ivvllzwhiv"; + sha256 = "sha256-kWl6wkyN/ytnct2MseZ5FQgOL2WeGJDFPPGJxkdcDX8="; }; vendorSha256 = null; From 6808c1088af86e734a3bd004483d631c7252bab4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 15:09:22 +0000 Subject: [PATCH 42/99] moolticute: 0.44.21 -> 0.45.0 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 804ba33209af..eabc93492378 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.21"; + version = "0.45.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1m3iy2v8mimyb25xisr7i4ga6qlggv1i2aji9qfgagns7ffp53nf"; + sha256 = "sha256-azJ63NI0wzzv3acgoPaeF+lTM1WKpXg595FrK908k1U="; }; outputs = [ "out" "udev" ]; From 38cad09782514cb041a18dbf6712755c00ff7bc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 15:25:30 +0000 Subject: [PATCH 43/99] mysqltuner: 1.7.17 -> 1.7.21 --- pkgs/tools/misc/mysqltuner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 6297e6131222..783f93daab45 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mysqltuner"; - version = "1.7.17"; + version = "1.7.21"; src = fetchFromGitHub { owner = "major"; repo = "MySQLTuner-perl"; rev = version; - sha256 = "0wjdqraa6r6kd6rsgrn177dq6xsnnr1sgnbs9whknjbs4fn3wwl5"; + sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0="; }; buildInputs = [ perl ]; From d05f856057a32b85d8605ad7405089a7e44a3884 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 19:31:02 +0000 Subject: [PATCH 44/99] spicetify-cli: 1.1.0 -> 1.2.0 --- pkgs/applications/misc/spicetify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index a042cc53c055..2b97d2f0188b 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff"; + sha256 = "sha256-Gkq19OlX6ci2i5mno77O/v3VfUkv6FRQFcH98qaUuXs="; }; - vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601"; + vendorSha256 = "sha256-ARhWKYh8Wy2UEYGabn6l/kbnJ0nHYTIt4hn9wuVgBkw="; # used at runtime, but not installed by default postInstall = '' From 0f7d5747c7d5cab9701b749cd8b7e9acbd70a681 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 19:46:35 +0000 Subject: [PATCH 45/99] ssmsh: 1.4.4 -> 1.4.5 --- pkgs/tools/admin/ssmsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 8ed8b0b812b0..3ed29af25fdc 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssmsh"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bwhaley"; repo = pname; rev = "v${version}"; - sha256 = "0mgx4q21f6rxih79l0hwgzwafxviz5a33dpvc5k0z172sfw0dmj1"; + sha256 = "sha256-WZ2glv/f4LwTK/G8QdaVRIAHvgGLPLPL8xjAg/kUokQ="; }; - vendorSha256 = "147f02bl3sf073dy2ximbavdcbphdn7djgisla1cyyy4ng6dhf7f"; + vendorSha256 = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ="; doCheck = true; From ef6ed50cb498e2aa29a83d07f5e0286053008035 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 19:50:22 +0000 Subject: [PATCH 46/99] star: 2.7.6a -> 2.7.7a --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index a7fe948ecfd6..345863847377 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.6a"; + version = "2.7.7a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1zw9f4jbhz0y51namnmid42pa7pviviy94q9db8w0774nksdf8is"; + sha256 = "sha256-0K49yjcnTzC56ZIB20OeTiMJ5EW8mRx+xEpyWEfFcts="; }; sourceRoot = "source/source"; From 96766b0bc2a89f66b6bc779f552efd3a2a8f139a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 20:08:54 +0000 Subject: [PATCH 47/99] stripe-cli: 1.5.5 -> 1.5.8 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 309bf4803fb6..2545a051080b 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.5"; + version = "1.5.8"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv"; + sha256 = "sha256-TE6+X2UEvHyUiPB61JA9JHCJTDOvHhyt5A44cgd2Meo="; }; - vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; + vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU="; subPackages = [ "cmd/stripe" From a057b67019e262921449347f2db689d6bbde1b28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 20:34:51 +0000 Subject: [PATCH 48/99] svlint: 0.4.8 -> 0.4.16 --- pkgs/development/tools/analysis/svlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 51b363c6be33..3455d78b23f4 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.8"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf"; + sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU="; }; - cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0"; + cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE="; meta = with lib; { description = "SystemVerilog linter"; From 817d58f98e21914e954648021ee814e51ef9aae0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 20:44:31 +0000 Subject: [PATCH 49/99] svls: 0.1.18 -> 0.1.25 --- pkgs/development/tools/misc/svls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 9cae7b901691..c6915e294d2e 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.18"; + version = "0.1.25"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "08n2sp0yj7ql5aagxw94dn8bx2jkigs9zlylf5zkg673bh54829x"; + sha256 = "sha256-+o15rElJZXQu2Hq1/79ms9wqYimINrViSdQltSJlGN8="; }; - cargoSha256 = "0k8x6kgxc2w7ldi456s4kg4v80b064drfa26zg5chcmcrr5zgmyv"; + cargoSha256 = "sha256-zLDUQcnvjyr+QJLVq6ADGPee0Fd7HeDhPAkb05hYLcE="; meta = with lib; { description = "SystemVerilog language server"; From e4e8f908a3db82ca38d176e894dd7ef205080604 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 20:57:06 +0000 Subject: [PATCH 50/99] tanka: 0.12.0 -> 0.14.0 --- pkgs/applications/networking/cluster/tanka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 293cdb673711..44ad3dfd72c7 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "1f67b236njz1qdxjyf2568vkigjmpylqlra29jlgm6vhd5qky7ia"; + sha256 = "sha256-y2HhtYKgC9Y397dZ14eQoPZxqS1fTOXVD8B4wdLIHzM="; }; - vendorSha256 = "1pr265g11lcviqw974lf05q52qrfpwnpn9a64q6088g0nfp4ly06"; + vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; doCheck = false; From eb7fd47b63f3cd358b101c95031bbbc707707beb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 21:01:17 +0000 Subject: [PATCH 51/99] tarssh: 0.5.0 -> 0.7.0 --- pkgs/servers/tarssh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index 9240b9c51a28..ac7f26782601 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "tarssh"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Freaky"; repo = pname; - sha256 = "1waxfbw9lqbqv8igb291pjqg22324lzv4p7fsdfrkvxf95jd2i03"; + sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk="; }; - cargoSha256 = "1f3anrh2y8yg7l4nilwk0a7c7kq5yvg07cqh75igjdb5a7p9di0j"; + cargoSha256 = "sha256-7X9klYVZ2yE8BPuLhzWkuT7VFpmdOZGSD0D1x3kBNEs="; meta = with lib; { description = "A simple SSH tarpit inspired by endlessh"; From 21f1c98aeec7bdec3268b221d8aabd9d5b5d30b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 21:21:22 +0000 Subject: [PATCH 52/99] termshark: 2.1.1 -> 2.2.0 --- pkgs/tools/networking/termshark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 65ba8d17bcb4..7b9a3c42d606 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b"; + sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; + vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM="; doCheck = false; From 0a01ca956bd568d3a556c06a1431dbe7a4cc3506 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 21:51:03 +0000 Subject: [PATCH 53/99] thanos: 0.17.2 -> 0.18.0 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 755dc1517751..2b0be2803e2e 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6"; + sha256 = "sha256-GJKTQGMmFJeUQn02GWP4KKpKdM8eT+VxDBDzST+5NXk="; }; - vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8"; + vendorSha256 = "sha256-s11iJFcJ1Ez6TkhCU3VD2ThU5/9otHz5rDF8z9ux79E="; doCheck = false; From 2d12b884efbc4c50927944927ddae05ce33d6ffc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 21:59:42 +0000 Subject: [PATCH 54/99] thicket: 0.1.3 -> 0.1.4 --- .../version-management/git-and-tools/thicket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 3abfd3a31392..3129bd2e2083 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -8,13 +8,13 @@ let in crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; + sha256 = "sha256-A89E0CbV7VFB7W4ycFcZloP0J/d42agEuD+hs9a6a6E="; }; format = "shards"; From 978e03994de1d6f8c613bc01e49f2bb8792fb43d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 22:08:37 +0000 Subject: [PATCH 55/99] tiledb: 2.1.3 -> 2.2.3 --- pkgs/development/libraries/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 560a991c44af..4e6e49d68c45 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.1.3"; + version = "2.2.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g"; + sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; }; # (bundled) blosc headers have a warning on some archs that it will be using From 07bbbc64ee49842250cff4451ea9bcacc68afb19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 22:18:12 +0000 Subject: [PATCH 56/99] tilt: 0.18.5 -> 0.18.8 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index a185c64646f9..415a895e523f 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.5"; + version = "0.18.8"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5"; + sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E="; }; vendorSha256 = null; From cb1f0b7eb61ab595b7d76ef77945908fb331f136 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 23:03:42 +0000 Subject: [PATCH 57/99] tuptime: 5.0.1 -> 5.0.2 --- pkgs/tools/system/tuptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index 92878c5386bc..0d3b6f4d6b82 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls"; + sha256 = "sha256-2Q1czKvwdVq+2+64k4SOghw05CUlT5HdZpvKMRbGdDY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From d9cbe889f843e1f3d893b8ec7fbc474ad03f669d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 23:09:35 +0000 Subject: [PATCH 58/99] turbo-geth: 2021.01.01 -> 2021.02.01 --- pkgs/applications/blockchains/turbo-geth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index dcfba4171494..3c56e0bbb2be 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.01.01"; + version = "2021.02.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls"; + sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI="; }; - vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392"; + vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk="; runVend = true; subPackages = [ From 8cce78f067b74f10b655c6dde6562844a508c335 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 23:28:23 +0000 Subject: [PATCH 59/99] unciv: 3.12.8 -> 3.12.12 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 917cf328e7ed..af3740ae926c 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.12.8"; + version = "3.12.12"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7"; + sha256 = "sha256-C5Mhn4v0dCAVGuYxi/3YMQKGUBkdBBXYGfsM1heJkQg="; }; dontUnpack = true; From de61f56ee2d8d426b5c4d8ed0597b92c040b0fbe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 00:53:54 +0000 Subject: [PATCH 60/99] aws-checksums: 0.1.10 -> 0.1.11 --- pkgs/development/libraries/aws-checksums/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index bf50401a213e..75b26695e2f2 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"; + sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4="; }; nativeBuildInputs = [ cmake ]; From ae51186cb01602afd8117a8ce34bf86430fb7d05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 01:36:56 +0000 Subject: [PATCH 61/99] ansifilter: 2.17 -> 2.18 --- pkgs/tools/text/ansifilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 5b03f6e89a6a..97b06b9a0c7e 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ansifilter"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "0by4rhy30l7jgxvq6mwf8p43s1472q96l3g7n2skq2lnkjrvx1ar"; + sha256 = "sha256-Zs8BfTakPV9q4gYJzjtYZHSU7mwOQfxoLFmL/859fTk="; }; nativeBuildInputs = [ pkg-config ]; From e5cd5b33ed4b9b86dfa3f02f710d7bd6b5a6e99d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 04:17:55 +0000 Subject: [PATCH 62/99] cfr: 0.150 -> 0.151 --- pkgs/development/tools/java/cfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 35ac0dbc6a51..68841d48d47e 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.150"; + version = "0.151"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj"; + sha256 = "sha256-MW6QFbmvKVP8/0/oa/O7pwXzLnzSW9blNcaY3ool6Dc="; }; nativeBuildInputs = [ makeWrapper ]; From be34c917b32b40c8a344c20721c83c0c19645838 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 04:29:40 +0000 Subject: [PATCH 63/99] clamav: 0.103.0 -> 0.103.1 --- pkgs/tools/security/clamav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index eb9fc8e7b957..bad5f3f476e3 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.103.0"; + version = "0.103.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j"; + sha256 = "sha256-cwjEe4myaK87nzYUBSiSekn/PmM6nJwKrCcS2BBW4lc="; }; # don't install sample config files into the absolute sysconfdir folder From 6ba66bc32307e936867e5cfd4287b0a6d87a899a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 07:04:50 +0000 Subject: [PATCH 64/99] gensio: 2.2.3 -> 2.2.4 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 3e4b68ec79c2..4efc713bb1d7 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME="; + sha256 = "sha256-tdMdIudB8zZWXF+Q0YhFo9Q4VHjLJh3rdfQsYhgo2DU="; }; passthru = { From f620a1067263d4bf63d35c138e27c8d992156e7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 08:27:57 +0000 Subject: [PATCH 65/99] flrig: 1.3.53 -> 1.3.54 --- pkgs/applications/radio/flrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 276581d80e52..c927d77bef44 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.53"; + version = "1.3.54"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1m0fa891scpaf719002w9gpg1famx84kpzav1mw1fafmbzyvjw1i"; + sha256 = "sha256-zw0xi4AVnm8Vi/oWkh13C9BjabOKUtZaVmLN++zKGug="; }; buildInputs = [ From 07b50561d60fa4aad7d295bf6e58e4cd7a77e0bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 08:52:04 +0000 Subject: [PATCH 66/99] gmic: 2.9.4 -> 2.9.5 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 07d4d1dd303a..92956aa53e34 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.4"; + version = "2.9.5"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr"; + sha256 = "sha256-KV/Ti6mPW+FASjug6q8Qfgra8L/TIyl/Y6JwANzQreE="; }; nativeBuildInputs = [ From 475fb48d6bd541658c98835359b4b0e6cee971ec Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 7 Feb 2021 19:32:57 +0700 Subject: [PATCH 67/99] libuchardet: disable tests on i686 --- pkgs/development/libraries/libuchardet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 443791f24519..8bf2e2acff9f 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; - doCheck = true; + doCheck = !stdenv.isi686; # tests fail on i686 meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; From 21de5708b4fbd254669e02c4a3700f9587cc972b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 16:05:56 +0000 Subject: [PATCH 68/99] libewf: 20201210 -> 20201230 --- pkgs/development/libraries/libewf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index f38f09410ff1..01c10dab60a0 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,12 +1,12 @@ { fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }: stdenv.mkDerivation rec { - version = "20201210"; + version = "20201230"; pname = "libewf"; src = fetchurl { url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; - sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc="; + sha256 = "sha256-10r4jPzsA30nHQzjdg/VkwTG1PwOskwv8Bra34ZPMgc="; }; nativeBuildInputs = [ pkg-config ]; From 4623281417e918a5e5d16c4c573647cc5fd0e904 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 17:27:10 +0000 Subject: [PATCH 69/99] lxpanel: 0.10.0 -> 0.10.1 --- pkgs/desktops/lxde/core/lxpanel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 95e5061a9852..15a3d918b95a 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "lxpanel"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; - sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; + sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug="; }; nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; From d890c17a7e5bca74053e6125d239fde55136e2dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Feb 2021 00:01:49 +0000 Subject: [PATCH 70/99] nx-libs: 3.5.99.25 -> 3.5.99.26 --- pkgs/tools/X11/nx-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index bb763962cebf..b92344bf9c4b 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { pname = "nx-libs"; - version = "3.5.99.25"; + version = "3.5.99.26"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; rev = version; - sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc"; + sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config which From 01d6a70116a9e2cc5afd7e3b102ff713e3b56f26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Feb 2021 03:13:49 +0000 Subject: [PATCH 71/99] pcmanfm: 1.3.1 -> 1.3.2 --- pkgs/applications/misc/pcmanfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index da1c79865a77..474fddb25201 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -7,10 +7,10 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - name = "pcmanfm-1.3.1"; + name = "pcmanfm-1.3.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; + sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; From c0d9f38b75b177d194f840fbd5f6c79427161763 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Feb 2021 04:20:00 +0000 Subject: [PATCH 72/99] satysfi: 0.0.5 -> 0.0.6 --- pkgs/tools/typesetting/satysfi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 03ce2eb5ee80..b175704f7102 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages +{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -35,12 +35,12 @@ let in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n"; + sha256 = "1wdmcz2b7v37msmsvjvbyj7x5a80qfws8a7w72q0g5959pw5fdxj"; fetchSubmodules = true; }; @@ -70,6 +70,7 @@ in meta = with lib; { homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; + changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3; maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; From 9987a87a786d73da57ab9afa0a571a26651ee014 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Feb 2021 04:20:00 +0000 Subject: [PATCH 73/99] lxd: 4.10 -> 4.11 https://discuss.linuxcontainers.org/t/lxd-4-11-has-been-released/10135 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 1c263a1969d1..ba6f9d074b24 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.10"; + version = "4.11"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8"; + sha256 = "1pcgxpmiiskq770sn25861dj0z8l24nzc1jbzyql7cxn0w5bnw1x"; }; postPatch = '' From bebd399724bc21225299a211e27fa02f2f4d5cf1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Feb 2021 06:55:47 +0000 Subject: [PATCH 74/99] psmisc: 23.3 -> 23.4 --- pkgs/os-specific/linux/psmisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 0902ce3d612a..4cf3e1f7dd1b 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "psmisc"; - version = "23.3"; + version = "23.4"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1132xvrldv0dar2mf221mv5kvajq0v6yrq8k3nl0wslnh5baa0r0"; + sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8="; }; nativeBuildInputs = [ autoconf automake gettext ]; From cc26d8592f6c6fb39b8ac8b4ad83a73df71675bc Mon Sep 17 00:00:00 2001 From: Zhenya Vinogradov Date: Mon, 8 Feb 2021 15:04:23 +0300 Subject: [PATCH 75/99] nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect Fixes redirection after signing in when you use a single oauth2_proxy instance for multiple domains. X-Auth-Request-Redirect header is used to decide which URL to redirect to after signing in. Specifying `request_uri` is enough in case you need to redirect to the same domain that serves oauth2 callback endpoint, but with multiple domains the you should include the scheme and the host. --- nixos/modules/services/security/oauth2_proxy_nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix index be6734f439f3..553638ad4965 100644 --- a/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -31,7 +31,7 @@ in proxyPass = cfg.proxy; extraConfig = '' proxy_set_header X-Scheme $scheme; - proxy_set_header X-Auth-Request-Redirect $request_uri; + proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; ''; }; locations."/oauth2/auth" = { From 81a0660e1ab952eb6b9f299bfd89c788b6703eca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Feb 2021 09:06:00 -0500 Subject: [PATCH 76/99] satysfi: update license --- pkgs/tools/typesetting/satysfi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index b175704f7102..73370eb011e4 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -71,7 +71,7 @@ in homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; changelog = "https://github.com/gfngfn/SATySFi/blob/v${version}/CHANGELOG.md"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ maintainers.mt-caret maintainers.marsam ]; platforms = platforms.all; }; From 76dc1086dc3f4fe74b7c3866c5768730d39c2a88 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:02:11 -0800 Subject: [PATCH 77/99] firefox: remove flash support --- .../networking/browsers/firefox/wrapper.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 31cfe0247ee4..96a4e15adf87 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,6 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, flashplayer, hal-flash , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire @@ -47,28 +46,31 @@ let assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let - enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; + # FIXME: This should probably be an assertion now? plugins = let removed = lib.filter (a: builtins.hasAttr a cfg) [ - "enableVLC" - "enableDjvu" - "enableMPlayer" - "jre" - "icedtea" - "enableGoogleTalkPlugin" - "enableFriBIDPlugin" - "enableBluejeans" + "enableAdobeFlash" "enableAdobeReader" + "enableBluejeans" + "enableDjvu" + "enableFriBIDPlugin" + "enableGoogleTalkPlugin" + "enableMPlayer" + "enableVLC" + "icedtea" + "jre" ]; - in if removed != [] - then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." - else lib.optional enableAdobeFlash flashplayer; + in if removed != [] then + throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." + else + [] + ; nativeMessagingHosts = ([ ] @@ -88,7 +90,6 @@ let ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) - ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsaLib ++ pkcs11Modules; From 6ca28ab28eafedc9852ac5faa4af505b30ca17d5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:02:53 -0800 Subject: [PATCH 78/99] lib: remove mention of flashplayer in docs --- lib/lists.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lists.nix b/lib/lists.nix index 56af4d9daa18..e469f3ef2652 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -241,7 +241,7 @@ rec { /* Return a singleton list or an empty list, depending on a boolean value. Useful when building lists with optional elements - (e.g. `++ optional (system == "i686-linux") flashplayer'). + (e.g. `++ optional (system == "i686-linux") firefox'). Type: optional :: bool -> a -> [a] From 6eb8979452f0df2bd560b09261ca4b82480e6a45 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:04:03 -0800 Subject: [PATCH 79/99] doc: remove mentions of flashplayer --- doc/using/configuration.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index 1e1df867e08e..2cd2615f54ae 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -138,11 +138,11 @@ - For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code: + For a more useful example, try the following. This configuration only allows unfree packages named roon-server and visual studio code: { allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "flashplayer" + "roon-server" "vscode" ]; } From 129ec8a4a53ef9f52dda3300b427ec11b1642693 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:05:25 -0800 Subject: [PATCH 80/99] stdenv: remove mention of flashplayer (in comments) --- pkgs/stdenv/generic/check-meta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 160ca5d4e068..e170aae73700 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -66,7 +66,7 @@ let # {pkgs, ...}: # { # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "vscode" x.name); # } allowUnfreePredicate = config.allowUnfreePredicate or (x: false); From 3de724310dd6c837ac072919b141627b5574e66b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:05:53 -0800 Subject: [PATCH 81/99] flashplayer: drop --- .../mozilla-plugins/flashplayer/default.nix | 147 ------------------ .../flashplayer/standalone.nix | 106 ------------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 8 - 4 files changed, 3 insertions(+), 261 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix deleted file mode 100644 index 1a4f9b4ec7b4..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv -, lib -, fetchurl -, alsaLib -, atk -, bzip2 -, cairo -, curl -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, graphite2 -, gtk2 -, harfbuzz -, libICE -, libSM -, libX11 -, libXau -, libXcomposite -, libXcursor -, libXdamage -, libXdmcp -, libXext -, libXfixes -, libXi -, libXinerama -, libXrandr -, libXrender -, libXt -, libXxf86vm -, libdrm -, libffi -, libglvnd -, libpng -, libvdpau -, libxcb -, libxshmfence -, nspr -, nss -, pango -, pcre -, pixman -, zlib -, unzip -, debug ? false - -/* you have to add ~/mm.cfg : - - TraceOutputFileEnable=1 - ErrorReportingEnable=1 - MaxWarnings=1 - - in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt - Then FlashBug (a FireFox plugin) shows the log as well -*/ - -}: - -let - arch = - if stdenv.hostPlatform.system == "x86_64-linux" then - "x86_64" - else if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else throw "Flash Player is not supported on this platform"; - lib_suffix = - if stdenv.hostPlatform.system == "x86_64-linux" then - "64" - else - ""; -in -stdenv.mkDerivation rec { - pname = "flashplayer"; - version = "32.0.0.465"; - - src = fetchurl { - url = - if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz" - else - "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; - sha256 = - if debug then - if arch == "x86_64" then - "04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y" - else - "1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw" - else - if arch == "x86_64" then - "0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9" - else - "1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - - mkdir -p $out/bin - cp -pv usr/bin/flash-player-properties $out/bin - - mkdir -p $out/lib${lib_suffix}/kde4 - cp -pv usr/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so $out/lib${lib_suffix}/kde4 - - patchelf --set-rpath "$rpath" \ - $out/lib/mozilla/plugins/libflashplayer.so \ - $out/lib${lib_suffix}/kde4/kcm_adobe_flash_player.so - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $out/bin/flash-player-properties - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = lib.makeLibraryPath - [ stdenv.cc.cc - alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib - glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite - libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng - libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib - ]; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = "http://www.adobe.com/products/flashplayer/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix deleted file mode 100644 index ed95d02ade45..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv -, lib -, fetchurl -, alsaLib -, atk -, bzip2 -, cairo -, curl -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, graphite2 -, gtk2 -, harfbuzz -, libICE -, libSM -, libX11 -, libXau -, libXcomposite -, libXcursor -, libXdamage -, libXdmcp -, libXext -, libXfixes -, libXi -, libXinerama -, libXrandr -, libXrender -, libXt -, libXxf86vm -, libdrm -, libffi -, libglvnd -, libpng -, libvdpau -, libxcb -, libxshmfence -, nspr -, nss -, pango -, pcre -, pixman -, zlib -, unzip -, debug ? false -}: - -stdenv.mkDerivation { - pname = "flashplayer-standalone"; - version = "32.0.0.465"; - - src = fetchurl { - url = - if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz" - else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; - sha256 = - if debug then - "1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs" - else - "1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8"; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - dontStrip = true; - dontPatchELF = true; - - preferLocalBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp -pv flashplayer${lib.optionalString debug "debugger"} $out/bin - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$rpath" \ - $out/bin/flashplayer${lib.optionalString debug "debugger"} - ''; - - rpath = lib.makeLibraryPath - [ stdenv.cc.cc - alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib - glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite - libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama - libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng - libvdpau libxcb libxshmfence nspr nss pango pcre pixman zlib - ]; - - meta = { - description = "Adobe Flash Player standalone executable"; - homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = [ "x86_64-linux" ]; - # Application crashed with an unhandled SIGSEGV - # Not on all systems, though. Video driver problem? - broken = false; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 27c2b48e66bd..f0d8ceb9e20e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -178,6 +178,9 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25 flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc5c9fff4816..c31d99398f45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22243,14 +22243,6 @@ in flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; - flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); - - flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {}); - - flashplayer-standalone-debugger = flashplayer-standalone.override { - debug = true; - }; - fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { From 544fdb05a5c4ade5c90caf7fdffd61cff648dde0 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:06:15 -0800 Subject: [PATCH 82/99] hal-flash: drop --- pkgs/os-specific/linux/hal-flash/default.nix | 29 -------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/os-specific/linux/hal-flash/default.nix diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix deleted file mode 100644 index 70dab152c728..000000000000 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }: - -stdenv.mkDerivation { - name = "hal-flash-0.3.3"; - - src = fetchurl { - url = "https://github.com/cshorler/hal-flash/archive/v0.3.3.tar.gz"; - sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake dbus glib libtool udisks2 ]; - - preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; - - meta = with lib; { - homepage = "https://github.com/cshorler/hal-flash"; - description = "libhal stub library to satisfy the Flash Player DRM requirements"; - longDescription = - '' - Stub library based loosely upon libhal.[ch] from the hal-0.5.14 - package. Provides the minimum necessary functionality to enable - libflashplayer.so/libadobecp.so to play back DRM content. - ''; - license = with licenses; [ afl21 gpl2 ]; - maintainers = with maintainers; [ malyn ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0d8ceb9e20e..6452b0e49a16 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -264,6 +264,7 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # added 2019-12-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c31d99398f45..f96145a8bea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5013,8 +5013,6 @@ in haste-client = callPackage ../tools/misc/haste-client { }; - hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; From 3e5ee83513ceab7ae5ae5c97d5994f94009a4d2d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:08:22 -0800 Subject: [PATCH 83/99] qt48: remove flashplayerFix --- .../libraries/qt-4.x/4.8/default.nix | 7 +-- .../qt-4.x/4.8/dlopen-webkit-nsplugin.diff | 52 ------------------- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 7dddd2bc67d2..a4ac41d81df7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -5,8 +5,7 @@ , libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi , alsaLib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, flashplayerFix ? false, gdk-pixbuf -, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2 +, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs , developerBuild ? false , docs ? false @@ -108,10 +107,6 @@ stdenv.mkDerivation rec { libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; })) - ++ lib.optional flashplayerFix (substituteAll { - src = ./dlopen-webkit-nsplugin.diff; - gtk = gtk2.out; - }) ++ lib.optional stdenv.isAarch64 (fetchpatch { url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff deleted file mode 100644 index d2ebbf3b45a8..000000000000 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index 19941d6..0ec15e2 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -index 2fe69d1..b658e4a 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -857,7 +857,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -index 2c9b465..56b3074 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -+++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp -@@ -42,7 +42,7 @@ namespace WebKit { - #if PLATFORM(QT) - static void initializeGTK() - { -- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = reinterpret_cast(library.resolve("gtk_init_check")); -diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index b8c8f2a..e7f4dc5 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -54,7 +54,7 @@ static Display *getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - From b95c84c964f023494f7a7d899eac16bb2f187c57 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:09:52 -0800 Subject: [PATCH 84/99] qt5.qtwebkit: remove flashplayerFix --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index ed41a4ac9bc0..288a0e30f690 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -1,10 +1,9 @@ { qtModule, stdenv, lib, fetchurl , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel -, fontconfig, gtk2, libwebp, libxml2, libxslt +, fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake , bison, flex, gdb, gperf, perl, pkg-config, python2, ruby , darwin -, flashplayerFix ? false }: let @@ -58,12 +57,6 @@ qtModule { ++ optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" - ++ optionals flashplayerFix - [ - ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' - # this file used to exist in gdk_pixbuf? - ''-DNIXPKGS_LIBGDK2="${getLib gtk2}/lib/libgdk-x11-2.0"'' - ] ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"''; doCheck = false; # fails 13 out of 13 tests (ctest) From ecaefda84a41dead4c1a054dde914cdbbf885667 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:11:08 -0800 Subject: [PATCH 85/99] nixos.flashpolicyd: drop --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../services/networking/flashpolicyd.nix | 86 ------------------- 3 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 nixos/modules/services/networking/flashpolicyd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7a656a58e9c2..260ee8d923cd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -650,7 +650,6 @@ ./services/networking/fireqos.nix ./services/networking/firewall.nix ./services/networking/flannel.nix - ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix ./services/networking/gale.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1dd8b48d76b5..2d07e421efe4 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -71,6 +71,7 @@ with lib; (mkRemovedOptionModule [ "services" "seeks" ] "") (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix deleted file mode 100644 index d3ac78430ca3..000000000000 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.flashpolicyd; - - flashpolicyd = pkgs.stdenv.mkDerivation { - name = "flashpolicyd-0.6"; - - src = pkgs.fetchurl { - name = "flashpolicyd_v0.6.zip"; - url = "https://download.adobe.com/pub/adobe/devnet/flashplayer/articles/socket_policy_files/flashpolicyd_v0.6.zip"; - sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3"; - }; - - buildInputs = [ pkgs.unzip pkgs.perl ]; - - installPhase = "mkdir $out; cp -pr * $out/; chmod +x $out/*/*.pl"; - }; - - flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd" - '' - #! ${pkgs.runtimeShell} - exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \ - --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \ - 2> /dev/null - ''; - -in - -{ - - ###### interface - - options = { - - services.flashpolicyd = { - - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable the Flash Policy server. This is - necessary if you want Flash applications to make - connections to your server. - ''; - }; - - policy = mkOption { - type = types.lines; - default = - '' - - - - - - - ''; - description = "The policy to be served. The default is to allow connections from any domain to any port."; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.xinetd.enable = true; - - services.xinetd.services = singleton - { name = "flashpolicy"; - port = 843; - unlisted = true; - server = "${flashpolicydWrapper}/bin/flashpolicyd"; - }; - - }; - -} From 77a76e2ff82e3478e4b862a58cf25883b7d9c9a1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 7 Feb 2021 14:57:01 -0800 Subject: [PATCH 86/99] release-notes/rl-2103: mention removal of flashplayer support from tree --- nixos/doc/manual/release-notes/rl-2103.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 2105ff9f3d76..b76d09302904 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -479,6 +479,21 @@ self: super: thinkfan documentation before updating. + + + Adobe Flash Player support has been dropped from the tree. In particular, + the following packages no longer support it: + + chromium + firefox + qt48 + qt5.qtwebkit + + Additionally, packages flashplayer and + hal-flash were removed along with the + services.flashpolicyd module. + + From 7a6d18c8e75d573d57cfafa64f91b7cbd85e5899 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 8 Feb 2021 20:54:13 +0100 Subject: [PATCH 87/99] python3Packages.py-multihash: 1.0.0 -> 2.0.1 https://github.com/multiformats/py-multihash/releases/tag/v2.0.1 The `variants` package is not in the list of requirements for py-multihash, so remove it. Switch to `pytestCheckHook` for the tests instead of using `pytest`. Also slightly change the Python version requirements check. --- .../python-modules/py-multihash/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index 1b49ffa15399..73307c75b8b8 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -1,49 +1,44 @@ { base58 , buildPythonPackage , fetchFromGitHub -, isPy27 , lib , morphys -, pytest -, pytestcov -, pytestrunner +, pytest-runner +, pytestCheckHook +, pythonOlder , six -, variants , varint }: buildPythonPackage rec { pname = "py-multihash"; - version = "1.0.0"; + version = "2.0.1"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z"; + sha256 = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ base58 morphys six - variants varint ]; checkInputs = [ - pytest - pytestcov + pytestCheckHook ]; pythonImportsCheck = [ "multihash" ]; - disabled = isPy27; - meta = with lib; { description = "Self describing hashes - for future proofing"; homepage = "https://github.com/multiformats/py-multihash"; From 21bce9b36bdd62be05107a623eb32fb9b1ca88bd Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Mon, 8 Feb 2021 17:57:08 -0600 Subject: [PATCH 88/99] factorio: 1.1.19 -> 1.1.21 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 4208df3acd05..a8f49d599548 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.19.tar.xz", + "name": "factorio_alpha_x64-1.1.21.tar.xz", "needsAuth": true, - "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", + "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_alpha_x64-1.1.19.tar.xz", + "name": "factorio_alpha_x64-1.1.21.tar.xz", "needsAuth": true, - "sha256": "1ip855iaw2pzgijpnp7bazj7qm3zqr2599xzaf7wx8gcdviq1k5r", + "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/alpha/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", + "version": "1.1.21" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.19.tar.xz", + "name": "factorio_demo_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", + "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/demo/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/demo/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_demo_x64-1.1.19.tar.xz", + "name": "factorio_demo_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "1p9avwkdqpaw9insji9v711rylqn9kxg0gzd8s7hdrmci3ah0ifr", + "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/demo/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/demo/linux64", + "version": "1.1.21" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.19.tar.xz", + "name": "factorio_headless_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", + "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/headless/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/headless/linux64", + "version": "1.1.21" }, "stable": { - "name": "factorio_headless_x64-1.1.19.tar.xz", + "name": "factorio_headless_x64-1.1.21.tar.xz", "needsAuth": false, - "sha256": "0w0ir1dzx39vq1w09ikgw956q1ilq6n0cyi50arjhgcqcg44w1ks", + "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.19/headless/linux64", - "version": "1.1.19" + "url": "https://factorio.com/get-download/1.1.21/headless/linux64", + "version": "1.1.21" } } } From 9a3190a960b9c3e15ce1518b6545b4bc921cf459 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Mon, 14 Sep 2020 03:49:42 -0700 Subject: [PATCH 89/99] power-profiles-daemon: init at 0.1, add service module --- nixos/modules/module-list.nix | 1 + .../hardware/power-profiles-daemon.nix | 53 +++++++++++++++ .../linux/power-profiles-daemon/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 122 insertions(+) create mode 100644 nixos/modules/services/hardware/power-profiles-daemon.nix create mode 100644 pkgs/os-specific/linux/power-profiles-daemon/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7a656a58e9c2..f4416a06fc97 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -374,6 +374,7 @@ ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix + ./services/hardware/power-profiles-daemon.nix ./services/hardware/ratbagd.nix ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix diff --git a/nixos/modules/services/hardware/power-profiles-daemon.nix b/nixos/modules/services/hardware/power-profiles-daemon.nix new file mode 100644 index 000000000000..70b7a72b8bae --- /dev/null +++ b/nixos/modules/services/hardware/power-profiles-daemon.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.power-profiles-daemon; + package = pkgs.power-profiles-daemon; +in + +{ + + ###### interface + + options = { + + services.power-profiles-daemon = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable power-profiles-daemon, a DBus daemon that allows + changing system behavior based upon user-selected power profiles. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + assertions = [ + { assertion = !config.services.tlp.enable; + message = '' + You have set services.power-profiles-daemon.enable = true; + which conflicts with services.tlp.enable = true; + ''; + } + ]; + + services.dbus.packages = [ package ]; + + services.udev.packages = [ package ]; + + systemd.packages = [ package ]; + + }; + +} diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix new file mode 100644 index 000000000000..c477e6f36793 --- /dev/null +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, pkg-config +, meson +, ninja +, fetchFromGitLab +, libgudev +, glib +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 +, libxml2 +, libxslt +, upower +, systemd +}: + +stdenv.mkDerivation rec { + pname = "power-profiles-daemon"; + version = "0.1"; + + outputs = [ "out" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "hadess"; + repo = "power-profiles-daemon"; + rev = version; + sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + ]; + + buildInputs = [ + libgudev + systemd + upower + glib + ]; + + mesonFlags = [ + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dgtk_doc=true" + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon"; + description = "Makes user-selected power profiles handling available over D-Bus"; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mvnetbiz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd6d5e94e1ae..3b097d27d00c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7173,6 +7173,8 @@ in povray = callPackage ../tools/graphics/povray { }; + power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; + ppl = callPackage ../development/libraries/ppl { }; pplatex = callPackage ../tools/typesetting/tex/pplatex { }; From 65968a1f5948b8c428c42770a5739ebe75cf5a06 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Tue, 15 Sep 2020 01:15:48 -0700 Subject: [PATCH 90/99] power-profiles-daemon: add test --- nixos/tests/power-profiles-daemon.nix | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 nixos/tests/power-profiles-daemon.nix diff --git a/nixos/tests/power-profiles-daemon.nix b/nixos/tests/power-profiles-daemon.nix new file mode 100644 index 000000000000..422008316f07 --- /dev/null +++ b/nixos/tests/power-profiles-daemon.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "power-profiles-daemon"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mvnetbiz ]; + }; + machine = { pkgs, ... }: { + services.power-profiles-daemon.enable = true; + environment.systemPackages = [ pkgs.glib ]; + }; + + testScript = '' + def get_profile(): + return machine.succeed( + """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile' + """ + ) + + + def set_profile(profile): + return machine.succeed( + """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>" + """.format( + profile=profile + ) + ) + + + machine.wait_for_unit("multi-user.target") + + set_profile("power-saver") + profile = get_profile() + if not "power-saver" in profile: + raise Exception("Unable to set power-saver profile") + + + set_profile("balanced") + profile = get_profile() + if not "balanced" in profile: + raise Exception("Unable to set balanced profile") + ''; +}) From 347c7fb266a0d806babed76d1f9cbfd2375dfd74 Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Mon, 8 Feb 2021 18:37:24 -0600 Subject: [PATCH 91/99] factorio: change help message to output "$HOME" Since $HOME was not escaped the user was shown a path inside /homeless-shelter which could be confusing for inexperienced users. --- pkgs/games/factorio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 9db8a95746d4..356cedd3507e 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -42,7 +42,7 @@ let releaseType=alpha version=0.17.74 - nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + nix-prefetch-url file://\''$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz Note the ultimate "_" is replaced with "-" in the --name arg! ''; From e95bf384292f15ece90ec423faa019f5d3d21e51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Feb 2021 02:05:41 +0100 Subject: [PATCH 92/99] qt.section.md: fix xml syntax --- doc/languages-frameworks/qt.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index b8b438e88584..fe2b853f18e6 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -22,7 +22,7 @@ stdenv.mkDerivation { version = "1.0"; buildInputs = [ qtbase ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ wrapQtAppsHook ]; } From 1977cce2304ea49038d7489fe51fe6882c67a202 Mon Sep 17 00:00:00 2001 From: Tyler Slabinski Date: Mon, 8 Feb 2021 20:07:37 -0500 Subject: [PATCH 93/99] glpaper: unstable-2020-03-30 -> unstable-2020-10-11 --- pkgs/development/tools/glpaper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix index 9ad85e840bad..6b7b13437cc6 100644 --- a/pkgs/development/tools/glpaper/default.nix +++ b/pkgs/development/tools/glpaper/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "glpaper"; - version = "unstable-2020-03-30"; + version = "unstable-2020-10-11"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/glpaper"; - rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; - sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + rev = "9e7ec7cd270af330039c395345c7d23c04682267"; + sha256 = "sha256-yBHRg6eg+PK/ixuM0MBty3RJY9qcemr3Dt+8SAitqnk="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 1c99286e1a6b13a8401dc10fbe611e1d61258411 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Feb 2021 01:19:54 +0100 Subject: [PATCH 94/99] home-assistant: 2021.2.1 -> 2021.2.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 95506e378f28..2f97cb4a9684 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.2.1"; + version = "2021.2.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 86d19a1694e1..ed2e75317ad0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.2.1"; + hassVersion = "2021.2.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m"; + sha256 = "0y7yj3kwk2454yghslvv5s2783rch9pznhxrw4mh3plr6qzi70rp"; }; # leave this in, so users don't have to constantly update their downstream patch handling From aa0af354b2d93d83beb682cce9f0ef477262e6b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Feb 2021 01:59:57 +0100 Subject: [PATCH 95/99] home-assistant: disable test_scan_match_st --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ed2e75317ad0..bb697d1035ad 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -201,6 +201,8 @@ in with py.pkgs; buildPythonApplication rec { "test_secrets_credstash" # system_log/test_init.py: assert 0 == 1 where 0 = len([]) "test_error_posted_as_event" + # ssdp/test_init.py: RuntimeError: Event loop is closed + "test_scan_match_st" ]; preCheck = '' From f34aeeab8cf46b894f2a5c63a13c9b0637a1b6d6 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Tue, 9 Feb 2021 02:16:04 +0000 Subject: [PATCH 96/99] zsh-prezto: make zshrc aware of where zsh-prezto is installed (#112448) Without this, the bundled zshrc runcom is useless as it assumes that zsh-prezto is installed in $ZDOTDIR:-$HOME/.zprezto, so it can't find its entrypoint. Crucially, the home-manager zsh-prezto module uses this runcom so is broken without this also. --- pkgs/shells/zsh/zsh-prezto/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 98cbf2c80f0f..d3e2c6534aa2 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + # make zshrc aware of where zsh-prezto is installed + sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc + ''; + installPhase = '' mkdir -p $out/share/zsh-prezto cp -R ./ $out/share/zsh-prezto From 2bd3aa4bc265d34b8ab18e917261b0dc24c5076d Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 9 Feb 2021 12:51:09 +0900 Subject: [PATCH 97/99] Revert "Revert "stdenv/patchShebangs: avoid temporary time reference file"" This reverts commit df21fb8afa235a71b4e814f1ed1c4003ce34b220. --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index bd254be24f96..d0efe039ced8 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -88,17 +88,15 @@ patchShebangs() { newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}} if [[ -n "$oldPath" && "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]]; then - if [[ -n "$newPath" ]] && [[ "$newPath" != "$oldPath" ]]; then + if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" # escape the escape chars so that sed doesn't interpret them escapedInterpreterLine=${newInterpreterLine//\\/\\\\} # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 - timestamp=$(mktemp) - touch -r "$f" "$timestamp" + timestamp=$(stat --printf "%y" "$f") sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" - touch -r "$timestamp" "$f" - rm "$timestamp" + touch --date "$timestamp" "$f" fi fi done < <(find "$@" -type f -perm -0100 -print0) From ca156a66b75999153d746f57a11a19222fd5cdfb Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 9 Feb 2021 12:51:42 +0900 Subject: [PATCH 98/99] stdenv/patchShebangs: fix off by one reading old interpreter This caused shebangs that were already store paths to be rewritten. Introduced by ab4c35982269e8f1f15e07afa7fedf65c749f276 in #94642 Example difference: $ echo "hello world" | tail -c+3 llo world $ str="hello world"; echo ${str:3} lo world --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index d0efe039ced8..04ebcd2cc64e 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -51,7 +51,7 @@ patchShebangs() { isScript "$f" || continue read -r oldInterpreterLine < "$f" - read -r oldPath arg0 args <<< "${oldInterpreterLine:3}" + read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" if [[ -z "$pathName" ]]; then if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then From 93a7e96c87ebb206dd18fb81376be573acb74828 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 9 Feb 2021 12:50:20 +0900 Subject: [PATCH 99/99] tests.patch-shebangs: add case for ignoring store paths --- pkgs/test/patch-shebangs/default.nix | 76 ++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 16 deletions(-) diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index 5e1d859c1389..5c49787eee3b 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -1,26 +1,70 @@ { lib, stdenv, runCommand }: let - bad-shebang = stdenv.mkDerivation { - name = "bad-shebang"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - echo "#!/bin/sh" > $out/bin/test - echo "echo -n hello" >> $out/bin/test - chmod +x $out/bin/test - ''; + tests = { + bad-shebang = stdenv.mkDerivation { + name = "bad-shebang"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/bin/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep -v '^#!/bin/sh' $out/bin/test > /dev/null"; + }; + }; + + ignores-nix-store = stdenv.mkDerivation { + name = "ignores-nix-store"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!$NIX_STORE/path/to/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep \"^#!$NIX_STORE/path/to/sh\" $out/bin/test > /dev/null"; + }; + }; }; in runCommand "patch-shebangs-test" { - passthru = { inherit bad-shebang; }; + passthru = { inherit (tests) bad-shebang ignores-nix-store; }; meta.platforms = lib.platforms.all; } '' - printf "checking whether patchShebangs works properly... ">&2 - if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then - echo "yes" >&2 - touch $out - else - echo "no" >&2 + validate() { + local name=$1 + local testout=$2 + local assertion=$3 + + echo -n "... $name: " >&2 + + local rc=0 + (out=$testout eval "$assertion") || rc=1 + + if [ "$rc" -eq 0 ]; then + echo "yes" >&2 + else + echo "no" >&2 + fi + + return "$rc" + } + + echo "checking whether patchShebangs works properly... ">&2 + + fail= + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' + validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1 + '') tests)} + + if [ "$fail" ]; then + echo "failed" exit 1 + else + echo "succeeded" + touch $out fi ''