From 24702d103a8f768b7cfc0ff5c3600a6efd269069 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 6 Dec 2021 11:00:15 -0700 Subject: [PATCH 01/11] element-{web,desktop}: 1.9.5 -> 1.9.6 (cherry picked from commit 6f0fb4fe8ec8c361bc3265b383029a483623f432) --- .../element/element-desktop-package.json | 4 ++-- .../networking/instant-messengers/element/pin.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index d00efd5ac872..c958137ab9f8 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.5", + "version": "1.9.6", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -54,7 +54,7 @@ "@types/minimist": "^1.2.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", - "allchange": "^1.0.5", + "allchange": "^1.0.6", "asar": "^2.0.1", "chokidar": "^3.5.2", "electron": "13.5", diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 7697c0d5b9a4..599f0a1754cf 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.5", - "desktopSrcHash": "8x3TBu0zSNEVWp+ULydule8bPSd01pMkCZHdJbQf82U=", - "desktopYarnHash": "0axz0d5qryd0k89lrziah1r6j1154c1cibf1qsjk1azlri3k4298", - "webHash": "04pabvvb3l88gp866fkbjngl9r20s300pvw7qykynl0ps8fjms0l" + "version": "1.9.6", + "desktopSrcHash": "AJLKp9VbNF0XvcQe6t0/pw1hiVCgRiRb27KJooQ2NlQ=", + "desktopYarnHash": "1xa8vrqj3g3hfhzrk8m7yr57my9ipyyhw8vsx4m86v8i1iqrpmnm", + "webHash": "161w6i122i81jyb23mpxlf7k5wx2v4c6ai2liywn89q74hj3axr5" } From 211c29e0907b9b481e29b72ea5242f9352f7ed31 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Fri, 10 Dec 2021 23:27:03 +0100 Subject: [PATCH 02/11] virt-manager: fix wmclass Use `dontWrapGApps` to prevent double wrapping from breaking wmclass Fixes #150120 (cherry picked from commit 056f498ccf83ae359bb87e8984903969237464e2) --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 73972deb2c8f..fb62a0d2e11a 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -47,10 +47,14 @@ python3Packages.buildPythonApplication rec { setupPyGlobalFlags = [ "--no-update-icon-cache" ]; + dontWrapGApps = true; + preFixup = '' gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}") + + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ]; From 6dcf45f6755550d5fa27378e198635128a49149a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 22:59:21 +0000 Subject: [PATCH 03/11] fswebcam: fix src url (cherry picked from commit 19a86aab13610629440322982db9f1df1b3f5538) --- pkgs/os-specific/linux/fswebcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index 08c35d79f3dc..678e0d428419 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "fswebcam"; - version = "2020-07-25"; + version = "20200725"; src = fetchurl { - url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${lib.replaceStrings ["."] [""] version}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${version}.tar.gz"; sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; From c892823afa2d5d4ac3abe62bf2d5ac4994dbc281 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Fri, 26 Nov 2021 13:25:12 +0100 Subject: [PATCH 04/11] ghidra: 10.0 -> 10.0.4 (cherry picked from commit e0db47bd82980bd66276541111ac0a50e4609efb) --- pkgs/tools/security/ghidra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 3b3f5ed44e70..1d3346044d40 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.0"; - versiondate = "20210621"; + version = "10.0.4"; + versiondate = "20210928"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "0m1ksng2fkmcg7m22lqil10qn95s06gxnxdz7ih9qpbx67pmmq9x"; + hash = "sha256-nc+5Aqid3hGzbcKMCCaQ9E9AGOB3JyNkJn+3Yz8ewhM="; }; nativeBuildInputs = [ From 7cbdb8642ed3504d484199181a274cf9a0ac774e Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Sat, 11 Dec 2021 00:02:21 +0100 Subject: [PATCH 05/11] ghidra: 10.0.4 -> 10.1 Fixes CVE-2021-44228 (Apache Log4j JNDI RCE). Closes #150153. (cherry picked from commit 89206c507e12b0256c2e012e421f1dca49d40e24) --- pkgs/tools/security/ghidra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 1d3346044d40..0f4eb9d3a3fc 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.0.4"; - versiondate = "20210928"; + version = "10.1"; + versiondate = "20211210"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-nc+5Aqid3hGzbcKMCCaQ9E9AGOB3JyNkJn+3Yz8ewhM="; + sha256 = "0b4wn2nwxp96dpg3xpabqh74xxv0fhwmqq04wgfjgdh6bavqk86b"; }; nativeBuildInputs = [ From bd57376e3b1b7218ec74284db6369eab029a875a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Dec 2021 22:34:09 +0100 Subject: [PATCH 06/11] signal-desktop: 5.25.0 -> 5.25.1 (cherry picked from commit 87a51f78e4b8edb3c8a420dac9deaf392327603e) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fef5c11ae8f6..5cd3520149a8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.25.0"; # Please backport all updates to the stable channel. + version = "5.25.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0ql9rzxrisqms3plcrmf3fjinpxba10asmpsxvhn0zlfajy47d0a"; + sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l"; }; nativeBuildInputs = [ From bd6c2298c1f2f5bf7d9e012aab12f9bd0f929b8b Mon Sep 17 00:00:00 2001 From: elsirion Date: Wed, 8 Dec 2021 12:17:50 +0100 Subject: [PATCH 07/11] tor-browser-bundle-bin: 11.0 -> 11.0.2 (cherry picked from commit 6b2221bdf23ebfd223a692ec154e227d34424f1c) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c36d37ccfdf7..5019fe5722f9 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0"; + version = "11.0.2"; lang = "en-US"; @@ -97,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0938a9yjfg9qa9rv5acrmbgqq11mc8j0pvl1n64jrdz29crk6sj2"; + sha256 = "1bqlb8dlh92dpl9gmfh3yclq5ii09vv333yisa0i5gpwwzajnh5s"; }; i686-linux = fetchurl { @@ -105,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "07v1ca66a69jl238qdq81mw654yffrcyq685y4rvv8xvx11fnzzp"; + sha256 = "1blp4z9rmnnsvl3bk0ajdccvpzfshnpyijjfiqb9ma02qw2z0gff"; }; }; in From 7796065f51dd8a60fb58a524b8fa68699a6f57d3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 10 Dec 2021 11:15:48 -0800 Subject: [PATCH 08/11] libbass: disable until upstream provides stable urls (cherry picked from commit 7e8f4423a804d1ae1a9c57ca41c9fe94c9081c5d) --- pkgs/development/libraries/audio/libbass/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index ab97090e8899..a8648a1a1c7b 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -60,6 +60,8 @@ let homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; platforms = builtins.attrNames bass.so; + # until upstream has stable URLs, this package is prone to always being broken + broken = true; }; }; From 8c77a32d11cde64d39a9244aaab285ddc4bf814f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 11 Dec 2021 20:01:07 +0100 Subject: [PATCH 09/11] qt515.qtwebkit: fix build on darwin This fixes the build on darwin by correcting the patch which no longer applies. (cherry picked from commit 1bc0716555ef9184117a61c4d0d133f0b6c85464) --- .../qt-5/5.15/qtwebkit-darwin-no-readline.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch index 26d189d86019..4871032f6f2c 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch @@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h #define HAVE_SYS_TIMEB_H 1 #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - From bb9c1df41a498cd160007fcf10088222b59a0cec Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Sun, 5 Dec 2021 13:02:30 +0200 Subject: [PATCH 10/11] Fix the syntax error on tt-rss config file (cherry picked from commit de16da59f269861f40e35035d917954c31901263) --- nixos/modules/services/web-apps/tt-rss.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 08356cee1dfe..97a6a8d3f6c4 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -18,9 +18,9 @@ let tt-rss-config = let password = if (cfg.database.password != null) then - "${(escape ["'" "\\"] cfg.database.password)}" + "'${(escape ["'" "\\"] cfg.database.password)}'" else if (cfg.database.passwordFile != null) then - "file_get_contents('${cfg.database.passwordFile}'" + "file_get_contents('${cfg.database.passwordFile}')" else "" ; @@ -40,7 +40,7 @@ let putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}'); putenv('TTRSS_DB_USER=${cfg.database.user}'); putenv('TTRSS_DB_NAME=${cfg.database.name}'); - putenv('TTRSS_DB_PASS=${password}'); + putenv('TTRSS_DB_PASS=' . ${password}); putenv('TTRSS_DB_PORT=${toString dbPort}'); putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}'); From 0f97e2110fcf132c42ce243cff6540779a10c853 Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Sat, 11 Dec 2021 15:01:15 +0200 Subject: [PATCH 11/11] tt-rss-module handle situations without any password (cherry picked from commit 0eaecd60cb90f6c7247751cee304476869a72fd1) --- nixos/modules/services/web-apps/tt-rss.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 97a6a8d3f6c4..9aa38ab25c9a 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,7 +22,7 @@ let else if (cfg.database.passwordFile != null) then "file_get_contents('${cfg.database.passwordFile}')" else - "" + null ; in pkgs.writeText "config.php" ''