From 5f6f35497dee97d94c075c3dfdbcccc0d4c076cf Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 19 May 2021 08:28:09 +0200 Subject: [PATCH 01/58] sanoid: 2.0.3 -> 2.1.0 Signed-off-by: Michael Adler --- pkgs/tools/backup/sanoid/default.nix | 35 +++++++--------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/tools/backup/sanoid/default.nix index a60683a27e19..3a59dcc06408 100644 --- a/pkgs/tools/backup/sanoid/default.nix +++ b/pkgs/tools/backup/sanoid/default.nix @@ -1,46 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs +{ lib, stdenv, fetchFromGitHub, makeWrapper, zfs , perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }: with lib; stdenv.mkDerivation rec { pname = "sanoid"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jimsalterjrs"; repo = pname; rev = "v${version}"; - sha256 = "1wmymzqg503nmhw8hrblfs67is1l3ljbk2fjvrqwyb01b7mbn80x"; + sha256 = "12g5cjx34ys6ix6ivahsbr3bbbi1fmjwdfdk382z6q71w3pyxxzf"; }; - patches = [ - # Make sanoid look for programs in PATH - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/dc2371775afe08af799d3097d47b48182d1716eb.patch"; - sha256 = "16hlwcbcb8h3ar1ywd2bzr3h3whgbcfk6walmp8z6j74wbx81aav"; - }) - # Make findoid look for programs in PATH - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/44bcd21f269e17765acd1ad0d45161902a205c7b.patch"; - sha256 = "0zqyl8q5sfscqcc07acw68ysnlnh3nb57cigjfwbccsm0zwlwham"; - }) - # Add --cache-dir option - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/a1f5e4c0c006e16a5047a16fc65c9b3663adb81e.patch"; - sha256 = "1bb4g2zxrbvf7fvcgzzxsr1cvxzrxg5dzh89sx3h7qlrd6grqhdy"; - }) - # Add --run-dir option - (fetchpatch { - url = "https://github.com/jimsalterjrs/sanoid/commit/59a07f92b4920952cc9137b03c1533656f48b121.patch"; - sha256 = "11v4jhc36v839gppzvhvzp5jd22904k8xqdhhpx6ghl75yyh4f4s"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ perl ConfigIniFiles CaptureTiny ]; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/etc/sanoid" cp sanoid.defaults.conf "$out/etc/sanoid/sanoid.defaults.conf" @@ -63,12 +42,14 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/findoid" \ --prefix PERL5LIB : "$PERL5LIB" \ --prefix PATH : "${makeBinPath [ "/run/booted-system/sw" zfs ]}" + + runHook postInstall ''; meta = { description = "A policy-driven snapshot management tool for ZFS filesystems"; homepage = "https://github.com/jimsalterjrs/sanoid"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; }; From 9a0a33f6b1ca2ae2c70e0c01722e3c359d667578 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:35 +0200 Subject: [PATCH 02/58] linux: 5.10.37 -> 5.10.38 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f150ab1cb0ac..cce8d1d92646 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.37"; + version = "5.10.38"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8"; + sha256 = "0bzipgnfvd5w70rv1x6g81iwknn2qskw92p2bpyiks7r52qmmwij"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 701282a87a96bc14d1996b43c057394b4dc70510 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:40 +0200 Subject: [PATCH 03/58] linux: 5.11.21 -> 5.11.22 --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 2988984e34c8..e6a8aef650b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.21"; + version = "5.11.22"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn"; + sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; From a76a720665423d32db1edaf44915287c5860d536 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:45 +0200 Subject: [PATCH 04/58] linux: 5.12.4 -> 5.12.5 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 39366147ae50..8efecb53ea1c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.4"; + version = "5.12.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s"; + sha256 = "1x39sdswww4j8zr54wpjzy9dia52kihs11xwljxcnz8pck0vwja0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From ce48d2c5932b307c22b418a7cced203ffc438b15 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 19 May 2021 11:55:50 +0200 Subject: [PATCH 05/58] linux: 5.4.119 -> 5.4.120 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8d6a063e643a..fd3cd525c203 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.119"; + version = "5.4.120"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi"; + sha256 = "0q08q6q2l9k04p8a0vvbnhwfp4yiags8s6wc9dnac0fhd4y3gl1q"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 0793950a1bd6235049d63a09cb1ac0cfd9a45885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 May 2021 20:36:46 +0200 Subject: [PATCH 06/58] rspamd: enable pie --- pkgs/servers/mail/rspamd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 7a2eb9fd2cdf..8e95e622b830 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs="; }; + hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ cmake pkg-config perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan From c5545b7e423869aaabc1232e9f339a5cb18398db Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:35 +0200 Subject: [PATCH 07/58] linux: 4.14.232 -> 4.14.233 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 431180c34bba..5108eaaf6965 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.232"; + version = "4.14.233"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x"; + sha256 = "0sqikz8cvrjfs46mcqx9gbdfkpdims0m5xxxzwr5vcfph5rdvj26"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From be7fc1bdee8bc3907f1089f37570ece1938532ba Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:40 +0200 Subject: [PATCH 08/58] linux: 4.19.190 -> 4.19.191 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5357251720be..d5e998ac194e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.190"; + version = "4.19.191"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g"; + sha256 = "1jd97rzv900mnyzps4xmf6k166zrg391vcrbmr5zvcway5qbn9mm"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 7d15d507177349feee82e225a2ddbb09a9830d47 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:44 +0200 Subject: [PATCH 09/58] linux: 4.4.268 -> 4.4.269 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 36b54e8191df..05fb7a88d4a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.268"; + version = "4.4.269"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8"; + sha256 = "0qx5zwi2ijwv9jwhs4cz91z7yxy6nd0g8ryzrlg1ar2xyk8w4yh4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From e51c114dfeab0f7f7655edb3bb045c775982c5c6 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:48 +0200 Subject: [PATCH 10/58] linux: 4.9.268 -> 4.9.269 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d1cd267dd22c..5e1318675bd4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.268"; + version = "4.9.269"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv"; + sha256 = "1pnggwc9i6hka21vvl4yd9pd38hpnym9z56m4mhl970ijl4zywbr"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 43730b18ea08d7bf93aee23f47c2683f7a93e945 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:53:53 +0200 Subject: [PATCH 11/58] linux: 5.10.38 -> 5.10.39 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index cce8d1d92646..afd8f21382bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.38"; + version = "5.10.39"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bzipgnfvd5w70rv1x6g81iwknn2qskw92p2bpyiks7r52qmmwij"; + sha256 = "057nnfkbm69ji80rx9lqgmvqsv74x9lcaq3kfs0k91cpr8asaf2p"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 6485d14e6de1ce89d39367d3d8b7eac5fdae684c Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:06 +0200 Subject: [PATCH 12/58] linux: 5.12.5 -> 5.12.6 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 8efecb53ea1c..4e7142b4a31c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.5"; + version = "5.12.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1x39sdswww4j8zr54wpjzy9dia52kihs11xwljxcnz8pck0vwja0"; + sha256 = "1cdxda5mgdi5dky6hvrq2727rrlw9lnzf30kf3lbiikjybvlqw2b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 44ed8b845d762581ca84ab4dd6baab89a0674d79 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:12 +0200 Subject: [PATCH 13/58] linux: 5.4.120 -> 5.4.121 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index fd3cd525c203..a5eb04751f99 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.120"; + version = "5.4.121"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0q08q6q2l9k04p8a0vvbnhwfp4yiags8s6wc9dnac0fhd4y3gl1q"; + sha256 = "0prparsdyi8n3cfq3vbhn5var2xcw5dglscxqny19qcplgy2g4wx"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From be8af32578742a2940eb0aa0f3437bfdb43a515d Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:29 +0200 Subject: [PATCH 14/58] linux_latest-libre: 18063 -> 18096 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index ea04414804c7..6d1c73397200 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18063"; - sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is"; + rev = "18096"; + sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg"; } , ... }: From 96806043e7e73bb98d2362b5c14f3eb6dee2b514 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:44 +0200 Subject: [PATCH 15/58] linux/hardened/patches/4.14: 4.14.232-hardened1 -> 4.14.233-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a7505c95f104..acd24be11efd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.232-hardened1.patch", - "sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch" + "name": "linux-hardened-4.14.233-hardened1.patch", + "sha256": "10rc16a6adqsmn94f9zp68f4l2y1pd6v9a4vkr5bbpymi9fhmdcd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.233-hardened1/linux-hardened-4.14.233-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 38a17bf83560749fab96d595c3ac10b2d4b922ad Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:46 +0200 Subject: [PATCH 16/58] linux/hardened/patches/4.19: 4.19.190-hardened1 -> 4.19.191-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index acd24be11efd..0ef029650689 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.190-hardened1.patch", - "sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch" + "name": "linux-hardened-4.19.191-hardened1.patch", + "sha256": "1w6gwfaahpnz6r8by276k7w5jynka8crcgq1dxrz0c9mgwrapa1b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.191-hardened1/linux-hardened-4.19.191-hardened1.patch" }, "5.10": { "extra": "-hardened1", From f8df946b8b6b37a6d05d9cac7728709593c774ae Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:48 +0200 Subject: [PATCH 17/58] linux/hardened/patches/5.10: 5.10.37-hardened1 -> 5.10.39-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0ef029650689..4da8c0ba1e63 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.37-hardened1.patch", - "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch" + "name": "linux-hardened-5.10.39-hardened1.patch", + "sha256": "1i58jdmahb43zxhag0m8fb51i4j0s3c6vicnypyxlcky5mawv8bl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.39-hardened1/linux-hardened-5.10.39-hardened1.patch" }, "5.11": { "extra": "-hardened1", From ac7c67ea0c13e60d1a39d658b2418ce616e4ccc6 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:49 +0200 Subject: [PATCH 18/58] linux/hardened/patches/5.11: 5.11.21-hardened1 -> 5.11.22-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4da8c0ba1e63..abfdc43f18c3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.21-hardened1.patch", - "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch" + "name": "linux-hardened-5.11.22-hardened1.patch", + "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 63f5c51430ba45904bd3ffa915c045cb746a4d20 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 24 May 2021 18:54:50 +0200 Subject: [PATCH 19/58] linux/hardened/patches/5.4: 5.4.119-hardened1 -> 5.4.121-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index abfdc43f18c3..5822b154364e 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.119-hardened1.patch", - "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch" + "name": "linux-hardened-5.4.121-hardened1.patch", + "sha256": "0f7zx7vm8vfhpkjgrz3jqqns8pibjz1lk7nf0hayl23jy0qqymrs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.121-hardened1/linux-hardened-5.4.121-hardened1.patch" } } From 6c6f9a5abfdc601d1d5ade71e8b667ed9cdc5fcd Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 26 May 2021 08:07:00 +0200 Subject: [PATCH 20/58] linux/hardened/patches/5.12: init at 5.12.6-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5822b154364e..ed9dc68e885a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -23,6 +23,12 @@ "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" }, + "5.12": { + "extra": "-hardened1", + "name": "linux-hardened-5.12.6-hardened1.patch", + "sha256": "0wy1r1awxw92rxfr8il1rri23lsizp4cilzvzw84d5w50jfix9dn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.6-hardened1/linux-hardened-5.12.6-hardened1.patch" + }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.121-hardened1.patch", From 5fa469b6f2f599a7869de69e6a994059d750ac92 Mon Sep 17 00:00:00 2001 From: "Hedtke, Moritz" Date: Wed, 26 May 2021 18:26:16 +0200 Subject: [PATCH 21/58] wordpress: 5.7.1 -> 5.7.2 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 8ad888e759b6..7dbf4054ef27 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4"; + sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk="; }; installPhase = '' From a404eb2a02ef9a02ea42e16431bbedd6bca53ccb Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 26 May 2021 22:09:18 -0400 Subject: [PATCH 22/58] handbrake: fix audio when linking with ffmpeg-4.4 Handbrake rips do not include working audio without this upstream patch. --- pkgs/applications/video/handbrake/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index faa3113690ad..5007f7419aeb 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,7 +7,7 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchFromGitHub, +{ stdenv, lib, fetchFromGitHub, fetchpatch, # Main build tools pkg-config, autoconf, automake, libtool, m4, xz, python3, numactl, @@ -58,6 +58,15 @@ stdenv.mkDerivation rec { ''; }; + # Remove with a release after 1.3.3 + patches = [ + (fetchpatch { + name = "audio-fix-ffmpeg-4_4"; + url = "https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch"; + sha256 = "sha256:1zcwa4h97d8wjspb8kbd8b1jg0a9vvmv9zaphzry4m9q0bj3h3kz"; + }) + ]; + # we put as little as possible in src.extraPostFetch as it's much easier to # add to it here without having to fiddle with src.sha256 # only DATE and HASH are absolutely necessary From 91233c46e36ef775e0ef92b4be0b810598d9b800 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:27:45 +0200 Subject: [PATCH 23/58] linux: 4.14.233 -> 4.14.234 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5108eaaf6965..588041587619 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.233"; + version = "4.14.234"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sqikz8cvrjfs46mcqx9gbdfkpdims0m5xxxzwr5vcfph5rdvj26"; + sha256 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From bd12ba96439e67cf75ec94773b7b2b5fc5f6079b Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:27:51 +0200 Subject: [PATCH 24/58] linux: 4.19.191 -> 4.19.192 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d5e998ac194e..23d651e21da4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.191"; + version = "4.19.192"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jd97rzv900mnyzps4xmf6k166zrg391vcrbmr5zvcway5qbn9mm"; + sha256 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 819f6a5d8cf82857e9cc4f17879a68c944747bdf Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:06 +0200 Subject: [PATCH 25/58] linux: 4.4.269 -> 4.4.270 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 05fb7a88d4a8..8320c2fb9ce6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.269"; + version = "4.4.270"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qx5zwi2ijwv9jwhs4cz91z7yxy6nd0g8ryzrlg1ar2xyk8w4yh4"; + sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 7d57471efa5d1b36f44084709e77c087ee8629f7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:11 +0200 Subject: [PATCH 26/58] linux: 4.9.269 -> 4.9.270 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5e1318675bd4..7dda6f5356dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.269"; + version = "4.9.270"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pnggwc9i6hka21vvl4yd9pd38hpnym9z56m4mhl970ijl4zywbr"; + sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From bed18f50193d35c43408682837c7f96f30717c22 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:17 +0200 Subject: [PATCH 27/58] linux: 5.10.39 -> 5.10.40 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index afd8f21382bc..ae8f50953070 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.39"; + version = "5.10.40"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "057nnfkbm69ji80rx9lqgmvqsv74x9lcaq3kfs0k91cpr8asaf2p"; + sha256 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 01cc705d4a07ef89a8aa7806fdf2366360237c3e Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:22 +0200 Subject: [PATCH 28/58] linux: 5.12.6 -> 5.12.7 --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 4e7142b4a31c..80a25ad23965 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.6"; + version = "5.12.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cdxda5mgdi5dky6hvrq2727rrlw9lnzf30kf3lbiikjybvlqw2b"; + sha256 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From c16011b1d9f92d6bf68064fc0e12b66b4c6ad48f Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:27 +0200 Subject: [PATCH 29/58] linux: 5.4.121 -> 5.4.122 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a5eb04751f99..a245ee7c44ec 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.121"; + version = "5.4.122"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0prparsdyi8n3cfq3vbhn5var2xcw5dglscxqny19qcplgy2g4wx"; + sha256 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 52e8c2d1650de8760c2cd93f67f45f559e00cdfe Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:54 +0200 Subject: [PATCH 30/58] linux/hardened/patches/4.14: 4.14.233-hardened1 -> 4.14.234-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ed9dc68e885a..2538bb22d51d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.233-hardened1.patch", - "sha256": "10rc16a6adqsmn94f9zp68f4l2y1pd6v9a4vkr5bbpymi9fhmdcd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.233-hardened1/linux-hardened-4.14.233-hardened1.patch" + "name": "linux-hardened-4.14.234-hardened1.patch", + "sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 938ea32339ada0492d545542123e68e8833986c7 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:56 +0200 Subject: [PATCH 31/58] linux/hardened/patches/4.19: 4.19.191-hardened1 -> 4.19.192-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 2538bb22d51d..3ba8e4e71c60 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.191-hardened1.patch", - "sha256": "1w6gwfaahpnz6r8by276k7w5jynka8crcgq1dxrz0c9mgwrapa1b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.191-hardened1/linux-hardened-4.19.191-hardened1.patch" + "name": "linux-hardened-4.19.192-hardened1.patch", + "sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 46ca914a5e4b8aa4cd184cd5a514200f224a5d06 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:57 +0200 Subject: [PATCH 32/58] linux/hardened/patches/5.10: 5.10.39-hardened1 -> 5.10.40-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3ba8e4e71c60..44be0d6a460b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.39-hardened1.patch", - "sha256": "1i58jdmahb43zxhag0m8fb51i4j0s3c6vicnypyxlcky5mawv8bl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.39-hardened1/linux-hardened-5.10.39-hardened1.patch" + "name": "linux-hardened-5.10.40-hardened1.patch", + "sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch" }, "5.11": { "extra": "-hardened1", From cdc6a4cc1e858d299e20e4cb90df427ac15411cc Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:28:59 +0200 Subject: [PATCH 33/58] linux/hardened/patches/5.12: 5.12.6-hardened1 -> 5.12.7-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 44be0d6a460b..fed73c80f918 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.6-hardened1.patch", - "sha256": "0wy1r1awxw92rxfr8il1rri23lsizp4cilzvzw84d5w50jfix9dn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.6-hardened1/linux-hardened-5.12.6-hardened1.patch" + "name": "linux-hardened-5.12.7-hardened1.patch", + "sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 1ce119e9bb3ada25ad7f9fcfb7565194a4faffdb Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Thu, 27 May 2021 06:29:00 +0200 Subject: [PATCH 34/58] linux/hardened/patches/5.4: 5.4.121-hardened1 -> 5.4.122-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fed73c80f918..6cf635da18b3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.121-hardened1.patch", - "sha256": "0f7zx7vm8vfhpkjgrz3jqqns8pibjz1lk7nf0hayl23jy0qqymrs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.121-hardened1/linux-hardened-5.4.121-hardened1.patch" + "name": "linux-hardened-5.4.122-hardened1.patch", + "sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch" } } From 6377bc3662d4b7e1ad0bc2811933c73219d70b27 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 27 May 2021 23:46:23 +0200 Subject: [PATCH 35/58] Revert "element-desktop: set dbus default for firefox" This reverts commit becc715b8978f9fdf973da30637bbc5fc871fcf4. --- .../networking/instant-messengers/element/element-desktop.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 8c51750ad430..ea152fc22e65 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -45,8 +45,7 @@ in mkYarnPackage rec { # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --add-flags "$out/share/element/electron" \ - --set-default MOZ_DBUS_REMOTE 1 + --add-flags "$out/share/element/electron" ''; # Do not attempt generating a tarball for element-web again. From 172537724e7c7d4a4c12d4d15917398077dc5c9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 04:33:33 +0000 Subject: [PATCH 36/58] exoscale-cli: 1.29.0 -> 1.30.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index d717c249fee1..f9377c607219 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M="; + sha256 = "sha256-7KuQC9L9Tp4s0E2iOlhgmezzjys1UhpHEe0gaYcy8oM="; }; goPackagePath = "github.com/exoscale/cli"; From df7eecceb5d81857284b1b6793ac4cd34c7f503e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 13:39:19 +0200 Subject: [PATCH 37/58] whipper: fix --- pkgs/applications/audio/whipper/default.nix | 53 ++++++++++++--------- pkgs/applications/audio/whipper/paths.patch | 32 ------------- 2 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/audio/whipper/paths.patch diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index b63680a8f488..a295788c117b 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -1,7 +1,17 @@ -{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac -, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }: +{ lib +, python3 +, fetchFromGitHub +, libcdio-paranoia +, cdrdao +, libsndfile +, flac +, sox +, util-linux +}: -python3.pkgs.buildPythonApplication rec { +let + bins = [ libcdio-paranoia cdrdao flac sox util-linux ]; +in python3.pkgs.buildPythonApplication rec { pname = "whipper"; version = "0.10.0"; @@ -12,44 +22,43 @@ python3.pkgs.buildPythonApplication rec { sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5"; }; - pythonPath = with python3.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ + setuptools_scm + docutils + ]; + + propagatedBuildInputs = with python3.pkgs; [ musicbrainzngs mutagen pycdio pygobject3 - requests ruamel_yaml - setuptools - setuptools_scm + discid + pillow ]; buildInputs = [ libsndfile ]; checkInputs = with python3.pkgs; [ twisted - ]; - - patches = [ - (substituteAll { - src = ./paths.patch; - inherit cdparanoia; - }) - ]; + ] ++ bins; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ]) + "--prefix" "PATH" ":" (lib.makeBinPath bins) ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; - # some tests require internet access - # https://github.com/JoeLametta/whipper/issues/291 - doCheck = false; - - preCheck = '' - HOME=$TMPDIR + checkPhase = '' + runHook preCheck + # disable tests that require internet access + # https://github.com/JoeLametta/whipper/issues/291 + substituteInPlace whipper/test/test_common_accurip.py \ + --replace "test_AccurateRipResponse" "dont_test_AccurateRipResponse" + HOME=$TMPDIR ${python3.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/applications/audio/whipper/paths.patch b/pkgs/applications/audio/whipper/paths.patch deleted file mode 100644 index 14b5384330da..000000000000 --- a/pkgs/applications/audio/whipper/paths.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/whipper/program/cdparanoia.py -+++ b/whipper/program/cdparanoia.py -@@ -280,10 +280,10 @@ - - bufsize = 1024 - if self._overread: -- argv = ["cd-paranoia", "--stderr-progress", -+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", - "--sample-offset=%d" % self._offset, "--force-overread", ] - else: -- argv = ["cd-paranoia", "--stderr-progress", -+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", - "--sample-offset=%d" % self._offset, ] - if self._device: - argv.extend(["--force-cdrom-device", self._device, ]) -@@ -560,7 +560,7 @@ - - def getCdParanoiaVersion(): - getter = common.VersionGetter('cd-paranoia', -- ["cd-paranoia", "-V"], -+ ["@cdparanoia@/bin/cdparanoia", "-V"], - _VERSION_RE, - "%(version)s %(release)s") - -@@ -585,7 +585,7 @@ - def __init__(self, device=None): - # cdparanoia -A *always* writes cdparanoia.log - self.cwd = tempfile.mkdtemp(suffix='.whipper.cache') -- self.command = ['cd-paranoia', '-A'] -+ self.command = ['@cdparanoia@/bin/cdparanoia', '-A'] - if device: - self.command += ['-d', device] From b2f86e66629d1d05a7da7dfff5bf18353bf7968e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 May 2021 14:56:38 +0200 Subject: [PATCH 38/58] nixos/gnome: Do not enable metacity by default Did not realize this is not conditional on gnome-flashback being enabled. Partially reverts https://github.com/NixOS/nixpkgs/pull/113957 --- nixos/modules/services/x11/desktop-managers/gnome.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c5e6caeea902..37e61f32823d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -222,12 +222,7 @@ in debug = mkEnableOption "gnome-session debug messages"; flashback = { - enableMetacity = mkOption { - type = types.bool; - default = true; - example = "false"; - description = "Whether to enable the standard Metacity GNOME flashback session."; - }; + enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; customSessions = mkOption { type = types.listOf (types.submodule { From 81abd8d0acc938f147ce98176b6cf679d398d2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 28 May 2021 16:08:20 +0200 Subject: [PATCH 39/58] mediatomb: use ffmpeg instead of ffmpeg_3 (#123487) --- pkgs/servers/mediatomb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index d84aa954a00f..6294f9df2bd3 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file +, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file , pkg-config, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac pkg-config autoreconfHook ]; meta = with lib; { From 95fa2dda186b637fd4e798fa5bac5f24bf4fda61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 16:35:13 +0200 Subject: [PATCH 40/58] backport: set correct permissions --- .github/workflows/backport.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 69da652ba598..39c8a34bf9d6 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,10 +1,10 @@ name: Backport on: - pull_request: + pull_request_target: types: [closed] jobs: backport: - name: Create backport PRs + name: Backport Pull Request if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true runs-on: ubuntu-latest steps: @@ -12,6 +12,7 @@ jobs: with: # required to find all branches fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs # should be kept in sync with `version` uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd From 9a80dbab1fdd6715662a9097f2cafa8fa1c6b4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 16:36:02 +0200 Subject: [PATCH 41/58] backport: trigger also if label is set after the merge --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 39c8a34bf9d6..766b5aa831a3 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,7 +1,7 @@ name: Backport on: pull_request_target: - types: [closed] + types: [closed, labeled] jobs: backport: name: Backport Pull Request From ab2e8afb29a81c40b89e9771301be3423ebcc6f6 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 28 May 2021 17:01:58 +0200 Subject: [PATCH 42/58] zellij: 0.12.0 -> 0.12.1 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 72b2a2742318..93d5bfc9dee3 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c79n/gNMAg+Eb+ZJcG+H+GSB0hI9FyyqkZGDcfz0ahA="; + sha256 = "sha256-OgpSVyXvJeRpxHWfIoJjQbbkt2RSze0IL5za3igGE6s="; }; - cargoSha256 = "sha256-m7hYDnZBBcrSHL2s+NwD/Z9+gpFvfZmnoLwgOXqc3mw="; + cargoSha256 = "sha256-LgJPhwOuzlKIw5smy4WJvC0CFoylnMlx6Re7gVPtiq8="; nativeBuildInputs = [ installShellFiles ]; From 1e4c81cc693ad0b0a602c2dcd43962df8541a8f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 15:57:52 +0000 Subject: [PATCH 43/58] gnomeExtensions.freon: 40 -> 44 --- pkgs/desktops/gnome/extensions/freon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index 7734558eb20b..9a884ac78ac7 100644 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-freon"; - version = "40"; + version = "44"; uuid = "freon@UshakovVasilii_Github.yahoo.com"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "UshakovVasilii"; repo = "gnome-shell-extension-freon"; rev = "EGO-${version}"; - sha256 = "0ak6f5dds9kk3kqww681gs3l1mj3vf22icrvb5m257s299rq8yzl"; + sha256 = "sha256-4DYAIC9N5id3vQe0WaOFP+MymsrPK18hbYqO4DjG+2U="; }; nativeBuildInputs = [ glib ]; From 38cfb84ff0cef3e680be150eda5d06ac1b4a1c05 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Fri, 24 Jul 2020 07:53:40 +0200 Subject: [PATCH 44/58] mediatomb/gerbera: Add release note information for 21.03 Note that it made into 2 entries, one about new options in the first section. Another in the breaking compatibility section due to the openFirewall option which changes the behavior. Co-authored-by: schmittlauch --- nixos/doc/manual/release-notes/rl-2105.xml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 7364151ef666..fa100290460e 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -305,6 +305,24 @@ /var/lib/powerdns to /run/pdns. + + + The mediatomb service is + now using by default the new and maintained fork + gerbera package instead of the unmaintained + mediatomb package. If you want to keep the old + behavior, you must declare it with: + + services.mediatomb.package = pkgs.mediatomb; + + One new option openFirewall has been introduced which + defaults to false. If you relied on the service declaration to add the + firewall rules itself before, you should now declare it with: + + services.mediatomb.openFirewall = true; + + + xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation. @@ -844,6 +862,29 @@ environment.systemPackages = [ All services should use or StartLimitIntervalSec in instead. + + + The mediatomb service + declares new options. It also adapts existing options so the + configuration generation is now lazy. The existing option + customCfg (defaults to false), when enabled, stops + the service configuration generation completely. It then expects the + users to provide their own correct configuration at the right location + (whereas the configuration was generated and not used at all before). + The new option transcodingOption (defaults to no) + allows a generated configuration. It makes the mediatomb service pulls + the necessary runtime dependencies in the nix store (whereas it was + generated with hardcoded values before). The new option + mediaDirectories allows the users to declare autoscan + media directories from their nixos configuration: + + services.mediatomb.mediaDirectories = [ + { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } + { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; } + ]; + + + The Unbound DNS resolver service (services.unbound) has been refactored to allow reloading, control sockets and to fix startup ordering issues. From d1fe6418cc9b0a4cea3484671a60249d27abacf1 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Wed, 26 May 2021 15:14:07 -0400 Subject: [PATCH 45/58] piston-cli: 1.3.0 -> 1.4.1 --- pkgs/tools/misc/piston-cli/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 97506c709df1..df244063b1b8 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "piston-cli"; - version = "1.3.0"; + version = "1.4.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "XzKXHZHYZRT3t4ZonM+Ngx1jIT1nmz4k34VSw29GFoM="; + sha256 = "o8GPtSQ119AKB64hAH8VY6iJmhXcSFqjOanmXQl0tHo="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470034df6d21..f072e2b6ee51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25899,7 +25899,7 @@ in pistol = callPackage ../tools/misc/pistol { }; - piston-cli = callPackage ../tools/misc/piston-cli { }; + piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; }; plater = libsForQt5.callPackage ../applications/misc/plater { }; From cc855b133100a956d4587079e27c5704cbc8342b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 27 May 2021 12:38:28 -0500 Subject: [PATCH 46/58] =?UTF-8?q?pgsync:=200.6.6=20=E2=86=92=200.6.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/database/pgsync/Gemfile.lock | 4 ++-- pkgs/development/tools/database/pgsync/gemset.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock index 5ee736430af5..d147a5a74546 100644 --- a/pkgs/development/tools/database/pgsync/Gemfile.lock +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -3,12 +3,12 @@ GEM specs: parallel (1.20.1) pg (1.2.3) - pgsync (0.6.6) + pgsync (0.6.7) parallel pg (>= 0.18.2) slop (>= 4.8.2) tty-spinner - slop (4.8.2) + slop (4.9.0) tty-cursor (0.7.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix index 18a833970722..0240300ff052 100644 --- a/pkgs/development/tools/database/pgsync/gemset.nix +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -25,20 +25,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr"; + sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6"; type = "gem"; }; - version = "0.6.6"; + version = "0.6.7"; }; slop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3"; + sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj"; type = "gem"; }; - version = "4.8.2"; + version = "4.9.0"; }; tty-cursor = { groups = ["default"]; From f830b000fc8aafd14bf3151178919378584e87c9 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 24 May 2021 14:03:37 +0300 Subject: [PATCH 47/58] maintainers: add mikroskeem --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6a7fbc13e621..aac8166ef389 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6615,6 +6615,16 @@ githubId = 1387206; name = "Mike Sperber"; }; + mikroskeem = { + email = "mikroskeem@mikroskeem.eu"; + github = "mikroskeem"; + githubId = 3490861; + name = "Mark Vainomaa"; + keys = [{ + longkeyid = "rsa4096/0xDA015B05B5A11B22"; + fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; + }]; + }; milesbreslin = { email = "milesbreslin@gmail.com"; github = "milesbreslin"; From 2980b1c4f4bbf0e15e709abd769613bcbe83839b Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 24 May 2021 14:05:07 +0300 Subject: [PATCH 48/58] imgcrypt: init at 1.1.1 --- .../virtualization/imgcrypt/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/virtualization/imgcrypt/default.nix diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix new file mode 100644 index 000000000000..c985632b9ebc --- /dev/null +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "imgcrypt"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "containerd"; + repo = pname; + rev = "v${version}"; + sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k"; + }; + + buildFlagsArray = [ + "-ldflags=-X github.com/containerd/containerd/version.Version=${version}" + ]; + + vendorSha256 = null; + subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ]; + + postFixup = '' + mv $out/bin/ctr $out/bin/ctr-enc + ''; + + meta = with lib; { + description = "Image encryption library and command line tool"; + homepage = "https://github.com/containerd/imgcrypt"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mikroskeem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f072e2b6ee51..78186f6dd1d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1571,6 +1571,8 @@ in imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; + imgcrypt = callPackage ../applications/virtualization/imgcrypt { }; + ipgrep = callPackage ../tools/networking/ipgrep { }; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; From 24507d7346f825d4f513113a52e2921624a8b304 Mon Sep 17 00:00:00 2001 From: Reed Date: Thu, 27 May 2021 06:41:37 -0400 Subject: [PATCH 49/58] nq: fix tq --- pkgs/tools/system/nq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index e92016f85a6f..239ac1368ad6 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' sed -i tq \ - -e 's|\bfq\b|'$out'/bin/fq|g' \ - -e 's|\bnq\b|'$out'/bin/nq|g' + -e 's|\bnq\b|'$out'/bin/nq|g' \ + -e 's|\bfq\b|'$out'/bin/fq|g' ''; meta = with lib; { description = "Unix command line queue utility"; From 5826e9020636c8ba3bc311294ce78b6466fd2b24 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 24 May 2021 14:29:16 +0300 Subject: [PATCH 50/58] dnsname-cni: init at 1.1.1 --- .../cluster/dnsname-cni/default.nix | 32 +++++++++++++++++++ .../dnsname-cni/hardcode-dnsmasq-path.patch | 19 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/cluster/dnsname-cni/default.nix create mode 100644 pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix new file mode 100644 index 000000000000..91ef8b68fb63 --- /dev/null +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule, fetchFromGitHub, lib, dnsmasq }: + +buildGoModule rec { + pname = "cni-plugin-dnsname"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "dnsname"; + rev = "v${version}"; + sha256 = "090kpq2ppan9ayajdk5vwbvww30nphylgajn2p3441d4jg2nvsm3"; + }; + + patches = [ ./hardcode-dnsmasq-path.patch ]; + + postPatch = '' + substituteInPlace plugins/meta/dnsname/service.go --replace '@DNSMASQ@' '${dnsmasq}/bin/dnsmasq' + ''; + + vendorSha256 = null; + subPackages = [ "plugins/meta/dnsname" ]; + + doCheck = false; # NOTE: requires root privileges + + meta = with lib; { + description = "DNS name resolution for containers"; + homepage = "https://github.com/containers/dnsname"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mikroskeem ]; + }; +} diff --git a/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch b/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch new file mode 100644 index 000000000000..24ef5eb85d13 --- /dev/null +++ b/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch @@ -0,0 +1,19 @@ +diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go +index fc05f75..f6b4caf 100644 +--- a/plugins/meta/dnsname/service.go ++++ b/plugins/meta/dnsname/service.go +@@ -16,10 +16,14 @@ import ( + + // newDNSMasqFile creates a new instance of a dnsNameFile + func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) { ++ /* + dnsMasqBinary, err := exec.LookPath("dnsmasq") + if err != nil { + return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH") + } ++ */ ++ _ = errors.Errorf // XXX(mikroskeem): reduce diff ++ dnsMasqBinary := "@DNSMASQ@" + masqConf := dnsNameFile{ + ConfigFile: makePath(networkName, confFileName), + Domain: domainName, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78186f6dd1d1..c16369993438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22897,6 +22897,8 @@ in cni = callPackage ../applications/networking/cluster/cni {}; cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {}; + dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {}; + multus-cni = callPackage ../applications/networking/cluster/multus-cni {}; cntr = callPackage ../applications/virtualization/cntr { }; From 9868aa60504d90d76ac86492ce1c7691fd234951 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 16 May 2021 23:45:37 +0300 Subject: [PATCH 51/58] docker: 20.10.2 -> 20.10.6 --- .../virtualization/docker/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6b72653c3472..54db586187a8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -163,8 +163,6 @@ rec { postPatch = '' patchShebangs . substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man" - substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man '' + optionalString buildxSupport '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} @@ -222,20 +220,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.2"; + version = "20.10.6"; rev = "v${version}"; - sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; + sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl"; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; }; - runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 - runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; - containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 - containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; - tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 + runcRev = "v1.0.0-rc94"; + runcSha256 = "0f11zr2d3bnycd6rmb1cynhy9zh169yj6kcn5s22wz2j6grghwz7"; + containerdRev = "v1.5.1"; + containerdSha256 = "1jwz53cpi9sxjsd1qr3sji1jai9wh3kfwspsgxnijhjs0bz8gvyn"; + tiniRev = "v0.19.0"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } From 8baf7189b0be37c8e19f0d79af869d2ea2479223 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Tue, 18 May 2021 14:43:05 +0300 Subject: [PATCH 52/58] docker: drop unused argument, use pname instead of name --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 54db586187a8..de57e5f51ee7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,7 +10,7 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? false # package dependencies - , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx @@ -124,7 +124,7 @@ rec { }) // rec { inherit version rev; - name = "docker-${version}"; + pname = "docker"; src = fetchFromGitHub { owner = "docker"; From beab9f03224507375434d6223dca824eb0149820 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 19 May 2021 01:55:31 +0300 Subject: [PATCH 53/58] docker: use commit hashes instead of tags, fix containerd sha256 --- pkgs/applications/virtualization/docker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index de57e5f51ee7..863ca59ed22a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -229,11 +229,11 @@ rec { rev = "v${version}"; sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; }; - runcRev = "v1.0.0-rc94"; + runcRev = "2c7861bc5e1b3e756392236553ec14a78a09f8bf"; # v1.0.0-rc94 runcSha256 = "0f11zr2d3bnycd6rmb1cynhy9zh169yj6kcn5s22wz2j6grghwz7"; - containerdRev = "v1.5.1"; - containerdSha256 = "1jwz53cpi9sxjsd1qr3sji1jai9wh3kfwspsgxnijhjs0bz8gvyn"; - tiniRev = "v0.19.0"; + containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1 + containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d"; + tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; } From ad256a077b352cde225844002c087d4a3862e748 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Thu, 20 May 2021 00:37:33 +0300 Subject: [PATCH 54/58] docker: bump runc to 1.0-rc95, fixing CVE-2021-30465 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 863ca59ed22a..bec51af81aca 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -229,8 +229,8 @@ rec { rev = "v${version}"; sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; }; - runcRev = "2c7861bc5e1b3e756392236553ec14a78a09f8bf"; # v1.0.0-rc94 - runcSha256 = "0f11zr2d3bnycd6rmb1cynhy9zh169yj6kcn5s22wz2j6grghwz7"; + runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 + runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1 containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d"; tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 From c79e3ded4b34c848b93db307ffaa8c8dcedf0c2b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 28 May 2021 13:09:30 +0300 Subject: [PATCH 55/58] gmnisrv: fix security vulnerability --- pkgs/servers/gemini/gmnisrv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index 4a8e187561c4..e3b4179fcf59 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "gmnisrv"; - version = "unstable-2021-03-26"; + version = "unstable-2021-05-16"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "gmnisrv"; - rev = "f23ec10a6d66c574bbf718c4b10f2cf91ea8daef"; - sha256 = "1d9rjx0s092yfzjxd2yvzixhqgg883nlnmsysgp21w75n2as354n"; + rev = "b9a92193e96bbe621ebc8430d8308d45a5b86cef"; + sha256 = "sha256-eMKsoq3Y+eS20nxI7EoDLbdwdoB6shbGt6p8wS+uoPc="; }; MIMEDB = "${mime-types}/etc/mime.types"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl mime-types scdoc ]; + nativeBuildInputs = [ pkg-config scdoc ]; + buildInputs = [ openssl mime-types ]; meta = with lib; { description = "A simple Gemini protocol server"; homepage = "https://git.sr.ht/~sircmpwn/gmnisrv"; license = licenses.gpl3Only; maintainers = with maintainers; [ bsima jb55 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 184b453090ea663f98d29cb8a18479e0e9570891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 14:54:47 +0200 Subject: [PATCH 56/58] pythonPackages.google-api-python-client: 2.0.2 -> 2.6.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 39ed8d68345f..f5c8bcc6c31c 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.0.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28"; + sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va"; }; # No tests included in archive From 4758dd48140070052212e57941dc7dd3ded1c603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 May 2021 14:55:44 +0200 Subject: [PATCH 57/58] patray: Yet another tray pulseaudio frontend --- .../python-modules/cock/default.nix | 19 ++++++++ pkgs/tools/audio/patray/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 4 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/cock/default.nix create mode 100644 pkgs/tools/audio/patray/default.nix diff --git a/pkgs/development/python-modules/cock/default.nix b/pkgs/development/python-modules/cock/default.nix new file mode 100644 index 000000000000..c11646decd74 --- /dev/null +++ b/pkgs/development/python-modules/cock/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook, click, sortedcontainers, pyyaml }: + +buildPythonPackage rec { + pname = "cock"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gwaklvwlyvhz2c07hdmhbnqqmpybssxzzr0399dpjk7dgdqgam3"; + }; + + propagatedBuildInputs = [ click sortedcontainers pyyaml ]; + + meta = with lib; { + homepage = "https://github.com/pohmelie/cock"; + description = "Configuration file with click"; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix new file mode 100644 index 000000000000..5f86f1b88557 --- /dev/null +++ b/pkgs/tools/audio/patray/default.nix @@ -0,0 +1,43 @@ +{ lib +, python3 +, qt5 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "patray"; + version = "0.1.1"; + + src = python3.pkgs.fetchPypi { + inherit version pname; + sha256 = "0vaapn2p4257m1d5nbnwnh252b7lhl00560gr9pqh2b7xqm1bh6g"; + }; + + patchPhase = '' + sed -i '30i entry_points = { "console_scripts": [ "patray = patray.__main__:main" ] },' setup.py + sed -i 's/production.txt/production.in/' setup.py + sed -i '/pyside2/d' requirements/production.in + ''; + + propagatedBuildInputs = with python3.pkgs; [ + pulsectl + loguru + cock + pyside2 + ]; + + doCheck = false; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + postFixup = '' + wrapQtApp $out/bin/patray + ''; + + + + meta = with lib; { + description = "Yet another tray pulseaudio frontend"; + homepage = "https://github.com/pohmelie/patray"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c16369993438..d5f9018676de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7159,6 +7159,8 @@ in pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + patray = callPackage ../tools/audio/patray { }; + pasystray = callPackage ../tools/audio/pasystray { }; pcmsolver = callPackage ../development/libraries/pcmsolver { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91ef14b2f782..2fed68c691b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1397,6 +1397,8 @@ in { clf = callPackage ../development/python-modules/clf { }; + cock = callPackage ../development/python-modules/cock { }; + click = callPackage ../development/python-modules/click { }; clickclick = callPackage ../development/python-modules/clickclick { }; From f451461e9dee2d19e04512ee91b622f1dcb40391 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 28 May 2021 20:00:48 +0800 Subject: [PATCH 58/58] fetchutils: remove DESTDIR, use PREFIX, change owner --- pkgs/tools/misc/fetchutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/tools/misc/fetchutils/default.nix index bda9175724f1..e9ee3fba516d 100644 --- a/pkgs/tools/misc/fetchutils/default.nix +++ b/pkgs/tools/misc/fetchutils/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec { version = "unstable-2021-03-16"; src = fetchFromGitHub { - owner = "lptstr"; + owner = "kiedtl"; repo = pname; rev = "882781a297e86f4ad4eaf143e0777fb3e7c69526"; sha256 = "sha256-ONrVZC6GBV5v3TeBekW9ybZjDHF3FNyXw1rYknqKRbk="; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ bash scdoc ]; - installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + installFlags = [ "PREFIX=$(out)/" ]; postPatch = '' patchShebangs --host src/*