From 534f3e2cb78df74d382a2dc5906b2bc73e023f86 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 27 Jul 2023 16:56:22 +0200 Subject: [PATCH 01/12] nss_latest: 3.91 -> 3.92 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/oNYCNPU21k0/m/rM3q7pM3BAAJ (cherry picked from commit dd005d7fadcc721002619fc715ca7002885650d4) --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 4be20ad1ff77..dfe3b066c878 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.91"; - hash = "sha256-hL1GN23xcRjFX21z0w/ZOgryEpbGbnaQRxVH5YmPxLM="; + version = "3.92"; + hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; } From 3b68024ae1a675a49486a6dd26de7d3ed979d679 Mon Sep 17 00:00:00 2001 From: Babeuh Date: Fri, 28 Jul 2023 13:59:13 +0200 Subject: [PATCH 02/12] multiviewer-for-f1: 1.24.1 -> 1.24.2 (cherry picked from commit adf434ca17631e8edcdb3e24d453bce75eaa03dc) --- pkgs/applications/video/multiviewer-for-f1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index d373a850e65a..0c6dbe8e7a95 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -24,15 +24,15 @@ }: let - id = "117980724"; + id = "118976581"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-uEcxDIWolouIUJ8Xuva3rtW51gfCddAwTGqOBnucmmY="; + sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0="; }; nativeBuildInputs = [ From 5fdaaf1daec84b0716799ef9052177723e8e9d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Jul 2023 20:49:25 -0600 Subject: [PATCH 03/12] =?UTF-8?q?linux/hardened/patches/4.19:=204.19.288-h?= =?UTF-8?q?ardened1=20=E2=86=92=204.19.289-hardened1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 13c18a57f7146a9e129d258e848ff91b4e871c89) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c1cb0cfe72e3..a744cd4c9b36 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.288-hardened1.patch", - "sha256": "0iw70vp9m7ldq85jfycfaihq2974giwi1d9fdd1yrhljlwzf9y6p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.288-hardened1/linux-hardened-4.19.288-hardened1.patch" + "name": "linux-hardened-4.19.289-hardened1.patch", + "sha256": "1bi0cf15nqbk5hkhy76cd1xbb3fsnrgz705lry19v467hn3c0fx3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.289-hardened1/linux-hardened-4.19.289-hardened1.patch" }, - "sha256": "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk", - "version": "4.19.288" + "sha256": "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi", + "version": "4.19.289" }, "5.10": { "patch": { From 18c68098736f76f62491e4e7a4c619c4d618112b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Jul 2023 20:50:09 -0600 Subject: [PATCH 04/12] =?UTF-8?q?linux/hardened/patches/5.10:=205.10.186-h?= =?UTF-8?q?ardened1=20=E2=86=92=205.10.187-hardened1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 8f50487784876426e2e2e732851a6edd1b9a5218) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a744cd4c9b36..c7fc1d71f238 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.186-hardened1.patch", - "sha256": "0k6f2sxk2gy601w0132i5glznhi35wbdpxkqsfgxlr2gi2w021wr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.186-hardened1/linux-hardened-5.10.186-hardened1.patch" + "name": "linux-hardened-5.10.187-hardened1.patch", + "sha256": "17m8v9xs300cd4jblvqxgmpsi0i15r57sl8xfc0vnl3b0ikip1rk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.187-hardened1/linux-hardened-5.10.187-hardened1.patch" }, - "sha256": "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y", - "version": "5.10.186" + "sha256": "1fwbz5xg3jxfzji9jlxqwf5rz9acgn4sm2inp3l017iy1chm957n", + "version": "5.10.187" }, "5.15": { "patch": { From 7b33619c40addb972508c8c1e57db2cc8571ba7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Jul 2023 20:50:32 -0600 Subject: [PATCH 05/12] =?UTF-8?q?linux/hardened/patches/5.15:=205.15.120-h?= =?UTF-8?q?ardened1=20=E2=86=92=205.15.122-hardened1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 12dd64a4356f090c9673f6813fdf495055aac7a6) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c7fc1d71f238..761791da86c1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.120-hardened1.patch", - "sha256": "0wqnwjww062ykh1y2yrbsy75b0fz8xlkazijgvj3rl14wvccf39x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.120-hardened1/linux-hardened-5.15.120-hardened1.patch" + "name": "linux-hardened-5.15.122-hardened1.patch", + "sha256": "0845jjvs2wf81vp43f62gsbkdi1l96ajpv6n7pnc1bi02hqgb6az", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.122-hardened1/linux-hardened-5.15.122-hardened1.patch" }, - "sha256": "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4", - "version": "5.15.120" + "sha256": "0b9ljdi9vgwzw4wa8gx1ia5fmb1pm8lnslx0q2l2kqhwrl0mhx9q", + "version": "5.15.122" }, "5.4": { "patch": { From 3c1ed38cda6360e2d754df2d01f9f9deb4be10d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Jul 2023 20:51:04 -0600 Subject: [PATCH 06/12] =?UTF-8?q?linux/hardened/patches/5.4:=205.4.249-har?= =?UTF-8?q?dened1=20=E2=86=92=205.4.250-hardened1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 26f125926868af04ad96ff7f69acb3e8338914e8) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 761791da86c1..4df15730cfda 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.249-hardened1.patch", - "sha256": "11rwyr68wrhjl0cdkvbgcpxwz4bwx3hii9k6xmai7hpds6rb3nsx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.249-hardened1/linux-hardened-5.4.249-hardened1.patch" + "name": "linux-hardened-5.4.250-hardened1.patch", + "sha256": "0l4a0wwv2ipwic24igvy48b114p55bx6zjbsj8j1jja6xpn8psk5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.250-hardened1/linux-hardened-5.4.250-hardened1.patch" }, - "sha256": "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w", - "version": "5.4.249" + "sha256": "1ywil04x3mw62n53pkrkxrhkg1xyi3g9ssvg6igbyqk0a9v8hnqg", + "version": "5.4.250" }, "6.1": { "patch": { From aa60f5df8b70749ac5121ccf7bcbe4bae934e429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Jul 2023 20:51:32 -0600 Subject: [PATCH 07/12] =?UTF-8?q?linux/hardened/patches/6.1:=206.1.39-hard?= =?UTF-8?q?ened1=20=E2=86=92=206.1.41-hardened1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c3fb402a657ef810c53a0959b0a73cd778e9754f) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4df15730cfda..5a69b57a3183 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.39-hardened1.patch", - "sha256": "0j4sgcs6m2mq9dn1v525bymhdhha3x8ivrpfrhqm553q4vdnmbg7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.39-hardened1/linux-hardened-6.1.39-hardened1.patch" + "name": "linux-hardened-6.1.41-hardened1.patch", + "sha256": "084lwlynwsm76vnmp02q80vbv4bi993swz3vvwsj3na8160c1w2y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.41-hardened1/linux-hardened-6.1.41-hardened1.patch" }, - "sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac", - "version": "6.1.39" + "sha256": "1dqbawgcpwxszqqnf7a66db8xlldxnr4f3sqlq42l1gaiskhja1i", + "version": "6.1.41" }, "6.3": { "patch": { From 70bb858e1bdfae196bd25092a2dbebefc791e094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Jul 2023 20:51:49 -0600 Subject: [PATCH 08/12] =?UTF-8?q?linux/hardened/patches/6.4:=206.4.4-harde?= =?UTF-8?q?ned1=20=E2=86=92=206.4.6-hardened1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 2c02110768c25fb179121e76ce0c8e4202eadcee) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5a69b57a3183..4248b4815e98 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -72,11 +72,11 @@ "6.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.4-hardened1.patch", - "sha256": "0yy02hn190wvl24z1j9kjmnyxrlp6s9fhkyvqgcm8i56d7d69zhb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.4-hardened1/linux-hardened-6.4.4-hardened1.patch" + "name": "linux-hardened-6.4.6-hardened1.patch", + "sha256": "1364ilh3vfvajx2ahd1mkwv13lnbfzmg0cwa9apghqfzqdn1c77x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.6-hardened1/linux-hardened-6.4.6-hardened1.patch" }, - "sha256": "0apzfnn04w6jda9yw5cbgj8784frvqrryb1iw5ad390lwwmlmg4w", - "version": "6.4.4" + "sha256": "192ya79h3lw781ka22ibgbvdcx6maa74nyk0lqjsz2n4xybc9v71", + "version": "6.4.6" } } From d39c13eee3c2c7b543f4722caf348c462a481a63 Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Sat, 29 Jul 2023 16:10:34 -0700 Subject: [PATCH 09/12] solo2-cli: fix zsh completion (cherry picked from commit 135b79b95463e62b1e1db9132b9dbaf79af2f13b) --- pkgs/tools/security/solo2-cli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index ea4b05b79a03..1580b946e71e 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules - installShellCompletion target/*/release/solo2.{bash,fish,zsh} + installShellCompletion target/*/release/solo2.{bash,fish} + installShellCompletion --zsh target/*/release/_solo2 ''; doCheck = true; From f114f71b879b8541020f804842fa2292812baf6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Jul 2023 17:52:49 +0200 Subject: [PATCH 10/12] frigate: fix serving of clips Frigate uses string concat to create some paths, which relies on the cache path ending with a trailing slash. I've meanwhile proposed a fix upstream, that will likely be part of the next release. (cherry picked from commit 5b3f58125e653253d59630639741ebebdc37c8e5) --- pkgs/applications/video/frigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 663d7e769cfe..062398835ab1 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -92,11 +92,11 @@ python.pkgs.buildPythonApplication rec { substituteInPlace frigate/const.py \ --replace "/media/frigate" "/var/lib/frigate" \ - --replace "/tmp/cache" "/var/cache/frigate" + --replace "/tmp/cache" "/var/cache/frigate/" substituteInPlace frigate/http.py \ --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \ - --replace "/tmp/cache/" "/var/cache/frigate" + --replace "/tmp/cache/" "/var/cache/frigate/" substituteInPlace frigate/output.py \ --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" From 5a9cfe6bd0124a9d22a3f85d08a8e88d76bf41b4 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Sun, 16 Jul 2023 22:57:16 +0100 Subject: [PATCH 11/12] wncast: 0.0.13 -> 0.1.1 (cherry picked from commit 413d0afd094a6ad82fa9a45eada60d42f15b338a) --- pkgs/servers/owncast/default.nix | 44 ++++++++++++-------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index 428b0253e8ca..62929aaaca1b 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -1,43 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +, ffmpeg +, makeBinaryWrapper +}: -buildGoModule rec { +let + version = "0.1.1"; +in buildGoModule { pname = "owncast"; - version = "0.0.13"; - + inherit version; src = fetchFromGitHub { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - sha256 = "sha256-hbZtdJbCB+67KXtApSRAO7Srye+UO0FbilKftQH6ESE="; + hash = "sha256-nBTuvVVnFlC75p8bRCN+lNl9fExBZrsLEesvXWwNlAQ="; }; - - vendorSha256 = "sha256-sQRNf+eT9JUbYne/3E9LoY0K+c7MlxtIbGmTa3VkHvI="; + vendorHash = "sha256-yjy5bDJjWk7UotBVqvVFiGx8mpfhpqMTxoQm/eWHcw4="; propagatedBuildInputs = [ ffmpeg ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - preInstall = '' - mkdir -p $out - cp -r $src/{static,webroot} $out - ''; - - postInstall = let - - setupScript = '' - [ ! -d "$PWD/webroot" ] && ( - ${coreutils}/bin/cp --no-preserve=mode -r "${placeholder "out"}/webroot" "$PWD" - ) - - [ ! -d "$PWD/static" ] && ( - [ -L "$PWD/static" ] && ${coreutils}/bin/rm "$PWD/static" - ${coreutils}/bin/ln -s "${placeholder "out"}/static" "$PWD" - ) - ''; - in '' + postInstall = '' wrapProgram $out/bin/owncast \ - --run '${setupScript}' \ - --prefix PATH : ${lib.makeBinPath [ bash which ffmpeg ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; installCheckPhase = '' From 38702adba5b6306d6b5385600184efe607171888 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jul 2023 13:29:14 +0200 Subject: [PATCH 12/12] firefox-esr-115-unwrapped: 115.0.2eser -> 115.0.3esr https://www.mozilla.org/en-US/firefox/115.0.3esr/releasenotes/ (cherry picked from commit 0e86572b927ad8d118433ddb4018280e83f5d20f) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 27f3ec022ce3..7b52de8fd7ab 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -115,11 +115,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.0.2esr"; + version = "115.0.3esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458"; + sha512 = "416ee56bd4a602c543391faaa8de31808f267ef2167f7d913195de45d3628de08d0582dbaa8905c847e1431bccd9d1d5d73ad9e7e5ea75be39e4d908a8b40376"; }; meta = {