From d5056156e645a9dafa9af6ca4f862ec31d93446b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 19 Jun 2023 08:32:48 +0100 Subject: [PATCH 01/33] bear: fix The previous build system patch was incomplete and left the `wrapper.d` directory empty, leaving Bear unable to pick up any build commands at all and breaking the functional test suite, which we also weren't running. Switch to overriding CMake flags instead and add the patches and dependencies necessary to get the functional tests running to prevent a future regression. I've checked that the instructions in Nix's `doc/manual/src/contributing/hacking.md` work after this change, which is what started this yak shave in the first place. (cherry picked from commit ec4de10162ba6d3d649c5b83440f4c535fd060b9) --- .../tools/build-managers/bear/default.nix | 36 ++++++++++++++++--- .../bear/fix-functional-tests.patch | 32 +++++++++++++++++ .../bear/no-double-relative.patch | 27 -------------- 3 files changed, 64 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bear/fix-functional-tests.patch delete mode 100644 pkgs/development/tools/build-managers/bear/no-double-relative.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 880184880db1..949225aeb226 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -13,6 +13,9 @@ , zlib , sqlite , re2 +, lit +, python3 +, coreutils }: stdenv.mkDerivation rec { @@ -26,7 +29,14 @@ stdenv.mkDerivation rec { hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + + # Used for functional tests, which run during buildPhase. + lit + python3 + ]; buildInputs = [ grpc @@ -41,11 +51,29 @@ stdenv.mkDerivation rec { re2 ]; - patches = [ - # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/... - ./no-double-relative.patch + cmakeFlags = [ + # Build system and generated files concatenate install prefix and + # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; + patches = [ + # Fix toolchain environment variable handling and the Darwin SIP check. + ./fix-functional-tests.patch + ]; + + postPatch = '' + patchShebangs test/bin + + # /usr/bin/env is used in test commands and embedded scripts. + find test -name '*.sh' \ + -exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} + + ''; + + # Functional tests use loopback networking. + __darwinAllowLocalNetworking = true; + meta = with lib; { broken = stdenv.isDarwin; description = "Tool that generates a compilation database for clang tooling"; diff --git a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch new file mode 100644 index 000000000000..99d64f26d077 --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch @@ -0,0 +1,32 @@ +diff --git a/test/lit.cfg b/test/lit.cfg +index 118c979..b69fecc 100644 +--- a/test/lit.cfg ++++ b/test/lit.cfg +@@ -207,13 +207,8 @@ def is_preload_disabled(): + if is_windows: + return True + elif sys.platform == 'darwin': +- command = ['csrutil', 'status'] +- pattern = re.compile(r'System Integrity Protection status:\s+enabled') +- try: +- output = subprocess.check_output(command, stderr=subprocess.STDOUT) +- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) +- except (OSError, subprocess.CalledProcessError): +- return False ++ # csrutil(8) isn't available in the Nix build sandbox. ++ return True + else: + return False + +@@ -221,6 +216,11 @@ def is_preload_disabled(): + if not is_preload_disabled(): + config.available_features.add('preload') + ++# Preserve the variables required for the Nix toolchain wrappers. ++for var, value in os.environ.items(): ++ if var.startswith('NIX_'): ++ config.environment[var] = value ++ + print(config.substitutions) + print(config.environment) + print(config.available_features) diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch deleted file mode 100644 index e8087feb1afb..000000000000 --- a/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/source/config.h.in b/source/config.h.in -index 6b659c2..f7bdf22 100644 ---- a/source/config.h.in -+++ b/source/config.h.in -@@ -108,8 +108,8 @@ namespace cmd { - } - - namespace wrapper { -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; -- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; -+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; -+ constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; - - constexpr char FLAG_VERBOSE[] = "--verbose"; - constexpr char FLAG_DESTINATION[] = "--destination"; -@@ -134,9 +134,9 @@ namespace cmd { - // And use the `libexec.so` path default value with a single path, - // that matches both. (The match can be achieved by the $LIB token - // expansion from the dynamic loader. See `man ld.so` for more.) -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+ constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; - #else -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; - #endif - constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; - constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; From d185b17483804c421ff25a9674ae65db4d06427f Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 19 Jun 2023 09:27:54 +0100 Subject: [PATCH 02/33] bear: use ninja (cherry picked from commit 3637fa5b79a6b55d0bdcdda101d00411aa16f804) --- pkgs/development/tools/build-managers/bear/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 949225aeb226..a79520e8fd56 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , cmake +, ninja , pkg-config , grpc , protobuf @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + ninja pkg-config # Used for functional tests, which run during buildPhase. From b7fbcb1091cb3e103174ea68bae13292c0f8ef22 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Fri, 5 Jan 2024 18:33:55 -0500 Subject: [PATCH 03/33] bear: remove broken on darwin (cherry picked from commit 75a177b813627615b4fb98296bacbc5ebdaaac33) --- pkgs/development/tools/build-managers/bear/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index a79520e8fd56..6c22a0c5dd2a 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { __darwinAllowLocalNetworking = true; meta = with lib; { - broken = stdenv.isDarwin; description = "Tool that generates a compilation database for clang tooling"; longDescription = '' Note: the bear command is very useful to generate compilation commands From a351df16c79d761f238ba7ebcd21d582c3a2267c Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Thu, 11 Jan 2024 11:24:35 -0500 Subject: [PATCH 04/33] bear: disable tests (cherry picked from commit 459e2889615da6fc03b9869b611bfd4777cae28e) --- pkgs/development/tools/build-managers/bear/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6c22a0c5dd2a..2789d3cefaff 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeBool "ENABLE_UNIT_TESTS" false) + (lib.cmakeBool "ENABLE_FUNC_TESTS" false) ]; patches = [ From 8017d803b75a36adee53ecc2f7da503d06cb172a Mon Sep 17 00:00:00 2001 From: Andrey Voronkov Date: Fri, 26 Jan 2024 06:56:48 +0300 Subject: [PATCH 05/33] mattermost-desktop 5.5.0 -> 5.6.0 Signed-off-by: Andrey Voronkov (cherry picked from commit d1c8a07d3ff80376ba2055d77734d9a39abd90d2) --- .../instant-messengers/mattermost-desktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 56bc542d4206..046c3344b97b 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,24 +1,24 @@ { lib , stdenv , fetchurl -, electron_26 +, electron_28 , makeWrapper }: let pname = "mattermost-desktop"; - version = "5.5.1"; + version = "5.6.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-bRiO5gYM7nrnkbHBP3B9zAK2YV5POkc3stEsbZJ48VA="; + hash = "sha256-KUF/zH18X+RS8AICBv53JTBpcaokzo92psyoQNmLF/Q="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-Z4U6Jbwasra69QPHJ9/7WwMSxh0O9r4QIe/xC3WRf4w="; + hash = "sha256-Zl5PalAles39qSMtt1cytfu4Mheud4+8TTkt7Ohdf/o="; }; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_28}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/app.asar runHook postInstall From 605943cd07445f2919a7a0217099a67d5481ab60 Mon Sep 17 00:00:00 2001 From: Andrey Voronkov Date: Sat, 3 Feb 2024 15:31:21 +0300 Subject: [PATCH 06/33] Use same major version of electron which mattermost-desktop uses itself; find electron binary via lib.getExe (cherry picked from commit 6cb1c2d5ac78d9af80606cadf351681d17f6979f) --- .../instant-messengers/mattermost-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 046c3344b97b..7b9246300c06 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, electron_28 +, electron_27 , makeWrapper }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper ${electron_28}/bin/electron $out/bin/${pname} \ + makeWrapper '${lib.getExe electron_27}' $out/bin/${pname} \ --add-flags $out/share/${pname}/app.asar runHook postInstall From 1ebc497ff4eb8d011b0f0759c57302cda38415a9 Mon Sep 17 00:00:00 2001 From: Andrey Voronkov Date: Fri, 15 Mar 2024 21:20:43 +0300 Subject: [PATCH 07/33] mattermost-desktop 5.6.0 -> 5.7.0 (cherry picked from commit 977aef081d06807c09e62c2a5d6d32849187e4e5) --- .../instant-messengers/mattermost-desktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 7b9246300c06..f7b31021a80e 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,24 +1,24 @@ { lib , stdenv , fetchurl -, electron_27 +, electron_28 , makeWrapper }: let pname = "mattermost-desktop"; - version = "5.6.0"; + version = "5.7.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-KUF/zH18X+RS8AICBv53JTBpcaokzo92psyoQNmLF/Q="; + hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-Zl5PalAles39qSMtt1cytfu4Mheud4+8TTkt7Ohdf/o="; + hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; }; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper '${lib.getExe electron_27}' $out/bin/${pname} \ + makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \ --add-flags $out/share/${pname}/app.asar runHook postInstall From 4ff88c15593bc2ea5d4058627ce216fd435d66a5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 26 Feb 2024 12:27:51 +0100 Subject: [PATCH 08/33] searxng: unstable-2023-10-31 -> 0-unstable-2024-02-24 (#290962) --- pkgs/by-name/se/searxng/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 24fd8be88478..c0d6cd63036d 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -5,13 +5,13 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-10-31"; + version = "0-unstable-2024-02-24"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844"; - hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU="; + owner = "searxng"; + repo = "searxng"; + rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; + hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; }; postPatch = '' @@ -20,7 +20,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { preBuild = let - versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version)); + versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version))); commitAbbrev = builtins.substring 0 8 src.rev; in '' @@ -66,7 +66,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { ln -s ../${python3.sitePackages}/searx/static $out/share/ # copy config schema for the limiter - cp searx/botdetection/limiter.toml $out/${python3.sitePackages}/searx/botdetection/limiter.toml + cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml ''; meta = with lib; { From 2e8242a6dc345cebb453948270b4d7f91c5b0010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Feb 2024 15:33:07 -0800 Subject: [PATCH 09/33] searxng: set meta.mainProgram --- pkgs/by-name/se/searxng/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index c0d6cd63036d..6f541d8a3b38 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -73,6 +73,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; + mainProgram = "searxng-run"; maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; }; }) From 7ecbb06b006ca50c2ee43556e111283ad0ffb1f7 Mon Sep 17 00:00:00 2001 From: amalgame21 Date: Thu, 7 Mar 2024 23:10:59 +0800 Subject: [PATCH 10/33] searxng: 0-unstable-2024-02-24 -> 0-unstable-2024-03-08 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 6f541d8a3b38..2fdf2e8b9284 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -5,13 +5,13 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2024-02-24"; + version = "0-unstable-2024-03-08"; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; - hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; + rev = "9c08a0cdddae7ceafbe5e00ce94cf7f1d36c97e0"; + hash = "sha256-0qlOpJqpOmseIeIafd0NLd2lF5whu18QxmwOua8dKzg="; }; postPatch = '' From d240a296145050684f1d53d513e7d7523d84866c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Feb 2024 04:55:47 +0000 Subject: [PATCH 11/33] uwsgi: 2.0.23 -> 2.0.24 --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index beeca756d867..b75b1633df1c 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.23"; + version = "2.0.24"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-gyYsgPF6eGa3D7bjmhhVER+uM0yPLfZiwSUzZ2mGcHg="; + hash = "sha256-KVzIp2rKCpF6aXhhu+6nw7q8Pnx/0+HD23mmYmVFPSA="; }; patches = [ From fe4caa51eea7ce08ac8f878e438bc6e2356554b9 Mon Sep 17 00:00:00 2001 From: ashuramaruzxc Date: Tue, 9 Apr 2024 12:35:56 +0200 Subject: [PATCH 12/33] maintainers: add ashuramaruzxc (cherry picked from commit 79fdb02ada90f68dc7c16537e19825418ac62a49) --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 210955c03173..0043a7dc658f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1640,6 +1640,16 @@ githubId = 11037075; name = "Ashley Hooper"; }; + ashuramaruzxc = { + email = "ashuramaru@tenjin-dk.com"; + matrix = "@tenjin:mozilla.org"; + github = "ashuramaruzxc"; + githubId = 72100551; + name = "Mariia Holovata"; + keys = [{ + fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF"; + }]; + }; ashvith-shetty = { github = "Ashvith10"; githubId = 113123021; From 595f2a3589c3f356083f95f23308270d2075fb74 Mon Sep 17 00:00:00 2001 From: ashuramaruzxc Date: Tue, 9 Apr 2024 12:37:40 +0200 Subject: [PATCH 13/33] thcrap-steam-proton-wrapper: init at 0-unstable-2024-04-03 (cherry picked from commit b0fbe664b2c965374f335d8a5a578ca20b28cd06) --- .../thcrap-steam-proton-wrapper/package.nix | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix diff --git a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix new file mode 100644 index 000000000000..56a6029847d4 --- /dev/null +++ b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix @@ -0,0 +1,56 @@ +{ + lib + , stdenv + , fetchFromGitHub + , makeWrapper + , bash + , subversion + , gnome +}: +stdenv.mkDerivation { + pname = "thcrap-proton"; + version = "0-unstable-2024-04-03"; + + src = fetchFromGitHub { + owner = "tactikauan"; + repo = "thcrap-steam-proton-wrapper"; + rev = "2b636c3f5f1ce1b9b41f731aa9397aa68d2ce66b"; + sha256 = "sha256-J2O8F75NMdsxSaNVr8zLf+vLEJE6CHqWQIIscuuJZ3o="; + }; + + buildInputs = [ subversion ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp thcrap_proton $out/bin/thcrap_proton + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/thcrap_proton \ + --prefix PATH : ${ + lib.makeBinPath [ + bash + subversion + gnome.zenity + ] + } + ''; + + meta = { + description = "A wrapper script for launching the official Touhou games on Steam with patches through Proton on GNU/Linux"; + homepage = "https://github.com/tactikauan/thcrap-steam-proton-wrapper"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ ashuramaruzxc ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + mainProgram = "thcrap_proton"; + }; +} From a4955cdc4ccc17cbdf4914e2ae42241ea301715c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francis=20Gagn=C3=A9?= Date: Sun, 18 Feb 2024 03:31:29 -0500 Subject: [PATCH 14/33] vscode-utils: Set the sourceRoot attribute on vscode extensions Some extensions contain directories other than `extension` (e.g., `package`, if the extension has a digital signature). The unpacker phase fails if a .vsix file contains more than one directory at the archive's root and the `sourceRoot` attribute is unset. (cherry picked from commit 8f384467cce40d5298337bce5d8be24da1a4eb0d) --- pkgs/applications/editors/vscode/extensions/vscode-utils.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 0eba230ad8e0..053d11b71eff 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -32,6 +32,10 @@ let inherit configurePhase buildPhase dontPatchELF dontStrip; + # Some .vsix files contain other directories (e.g., `package`) that we don't use. + # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. + sourceRoot = "extension"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; From f963265da831f37e9032939dc3b9542eb3d0e121 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:32:43 +0000 Subject: [PATCH 15/33] discord: 0.0.47 -> 0.0.49 (cherry picked from commit 0d1cfb5efcd4de9eb01770b66e3507ba1faf9dbe) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 58bab558db74..4c027427022d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.47"; + stable = "0.0.49"; ptb = "0.0.76"; canary = "0.0.326"; development = "0.0.16"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-4cELs7K7DAfzbA0/BwAkKraTD7z58jzOf1J3Our3CwM="; + hash = "sha256-rVSYAkTZTlurnbUeYJFCgsPcsCqjJ1bJneQQiyhmvwQ="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From ca651d843fdf51e9abf0a6b07eb8e5dbd02f493b Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:33:17 +0000 Subject: [PATCH 16/33] discord-ptb: 0.0.76 -> 0.0.78 (cherry picked from commit 8d4d2b7f7a1d4f82ee5f0168109b2043bc6760d3) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 4c027427022d..e85a065b184f 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.49"; - ptb = "0.0.76"; + ptb = "0.0.78"; canary = "0.0.326"; development = "0.0.16"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-Gj6OLzkHrEQ2CeEQpICaAh1m13DpM2cpNVsebBJ0MVc="; + hash = "sha256-Fp94BsR6Fzy4tV+c5ToP9GKg6GC/TryGvHWLupew4Z8="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 72faae6c6c49c5385b170eebbfa9ad40c6203d7c Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:33:39 +0000 Subject: [PATCH 17/33] discord-canary: 0.0.326 -> 0.0.346 (cherry picked from commit 1fdc06c13b0be1968c9fdbee0e3160f4f1382190) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e85a065b184f..b95c092cf6a6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.49"; ptb = "0.0.78"; - canary = "0.0.326"; + canary = "0.0.346"; development = "0.0.16"; } else { stable = "0.0.298"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-MxiFhd7tLvL1tBRc451qjCFZlmGM8IolckExp0sR3y8="; + hash = "sha256-/FBVo3ptZk2YQPoq+VpyxMlSWYlVb8ChpKW5YH/BM7U="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 3b2a1886cb5838c3ebe3b6b48caad31ccd571974 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:34:09 +0000 Subject: [PATCH 18/33] discord-development: 0.0.16 -> 0.0.17 (cherry picked from commit 524d680ac76d75908d8c76a3cf3a9b457d57d20d) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b95c092cf6a6..b747fc186b91 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,7 +5,7 @@ let stable = "0.0.49"; ptb = "0.0.78"; canary = "0.0.346"; - development = "0.0.16"; + development = "0.0.17"; } else { stable = "0.0.298"; ptb = "0.0.105"; @@ -29,7 +29,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-6QImWsNmL2JveB2QJ1MyBxkVEQfdPvKEdenRPjURptI="; + hash = "sha256-AmbaMVi/or+9QLuQO5u5btgKeKdrfo7bzZgGLILwgqo="; }; }; x86_64-darwin = { From 31456fc63cfccb7c98d98d9b516078e5f54b51c7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:34:48 +0000 Subject: [PATCH 19/33] pkgsCross.aarch64-darwin.discord: 0.0.298 -> 0.0.300 (cherry picked from commit 3941e911f452e0bf8d38dff7c232b3376180dc97) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b747fc186b91..442f3114be85 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let canary = "0.0.346"; development = "0.0.17"; } else { - stable = "0.0.298"; + stable = "0.0.300"; ptb = "0.0.105"; canary = "0.0.451"; development = "0.0.39"; @@ -35,7 +35,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-GlTebQ16sRgHdpB9+Jw7dn+KVZ6qIrAmWBSypTcoFmE="; + hash = "sha256-f9YIlzRESzzxtD9/us1DY5acu2HYo+UrwS7GWk9RwCk="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From e5fc724fd5d9dc254f9acadba19d945f882aed8c Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:35:21 +0000 Subject: [PATCH 20/33] pkgsCross.aarch64-darwin.discord-ptb: 0.0.105 -> 0.0.107 (cherry picked from commit 340b351855d05ac87b0ebe7a2608e471d171d234) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 442f3114be85..72dbc4008ae6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let development = "0.0.17"; } else { stable = "0.0.300"; - ptb = "0.0.105"; + ptb = "0.0.107"; canary = "0.0.451"; development = "0.0.39"; }; @@ -39,7 +39,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-X5bYO1D5eWTYh22v4R274OhjTsVv70XCyrMqeRlt0Bo="; + hash = "sha256-etxXrO9Ksacbdes3DT1Tm4kKD/t40jGUeSAegdexRqc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From 9e7c932c27f08130ce37f53f5f649d7486fd7e29 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 10 Apr 2024 17:36:08 +0000 Subject: [PATCH 21/33] pkgsCross.aarch64-darwin.discord-canary: 0.0.451 -> 0.0.468 (cherry picked from commit 4bde407c23943c488dd9ced58e0bc13b18fbbcfe) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 72dbc4008ae6..05850a557f5d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let } else { stable = "0.0.300"; ptb = "0.0.107"; - canary = "0.0.451"; + canary = "0.0.468"; development = "0.0.39"; }; version = versions.${branch}; @@ -43,7 +43,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-psVm0eXDHVBGNb/R0kHbvz/4ilyIg4xlOj/CwkwlvgM="; + hash = "sha256-UOoXDwAa5pFukqTCmUfM89QVK5jB13id8ek/gwWajMM="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 41f40aac872e38dc74a3aa2a9343868b26e383c4 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 11 Apr 2024 16:47:07 +0200 Subject: [PATCH 22/33] chromedriver: 123.0.6312.86 -> 123.0.6312.122 (cherry picked from commit 3c4f4f2afd4b51957cb506dc502f564efe2b5fff) --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d6f71c277692..e6719f1c9a49 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-sB6gH5k5zK1IIctBTXQpxlgmLEoIatcLDYO+WIFaYxA="; + hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk="; hash_darwin_aarch64 = - "sha256-sikyGQG0Y14eNjT3f/Z50cPmm38T58X7zQIGopXOHOs="; - hash_linux = "sha256-2WZmRXyvxN3hXeOoPQXL6lU6Xki9iUmTdETRxOkIYD0="; - version = "123.0.6312.86"; + "sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4="; + hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y="; + version = "123.0.6312.122"; }; deps = { gn = { From 34450e887a5ef81d2bb399556853f78692d4857f Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 11 Apr 2024 16:47:51 +0200 Subject: [PATCH 23/33] chromium: 123.0.6312.105 -> 123.0.6312.122 https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_10.html This update includes 3 security fixes. CVEs: CVE-2024-3157 CVE-2024-3516 CVE-2024-3515 (cherry picked from commit b24e22d061a801afc7ef466bb202927cc6b080c6) --- .../networking/browsers/chromium/upstream-info.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e6719f1c9a49..f649608dae48 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2024-02-19"; }; }; - hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68="; - hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU="; - version = "123.0.6312.105"; + hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14="; + hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c="; + version = "123.0.6312.122"; }; ungoogled-chromium = { deps = { From ecc1fbcc0c2bce9042f50448e6c80ea79643fce2 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 11 Apr 2024 16:48:08 +0200 Subject: [PATCH 24/33] ungoogled-chromium: 123.0.6312.105-1 -> 123.0.6312.122-1 https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_10.html This update includes 3 security fixes. CVEs: CVE-2024-3157 CVE-2024-3516 CVE-2024-3515 (cherry picked from commit 9072edec01ee65b67bf0cdc4a52f055ef1acf1e4) --- .../networking/browsers/chromium/upstream-info.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index f649608dae48..2597d293ac63 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -28,12 +28,12 @@ version = "2024-02-19"; }; ungoogled-patches = { - hash = "sha256-81SoZBOAAV0cAVzz3yOzBstRW3vWjmkFoFNjYdPnme4="; - rev = "123.0.6312.105-1"; + hash = "sha256-ojKIAkJB/gfg6scCxUYNAGx4lsquAaCySBDcUCFLqSU="; + rev = "d5773b0fb696ef107cc6df6a94cbe732c9e905f9"; }; }; - hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68="; - hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU="; - version = "123.0.6312.105"; + hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14="; + hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c="; + version = "123.0.6312.122"; }; } From cb094250b9b0233487b9763ef108bb5281fa70b2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 20 Dec 2023 08:58:06 +0100 Subject: [PATCH 25/33] electron: add missing `meta.mainProgram` (cherry picked from commit 7501d682b8ea82d061fc87b9aebf97246725d351) --- pkgs/development/tools/electron/binary/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index bf845eed8d86..ed12f98bafe9 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -36,6 +36,7 @@ let homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; + mainProgram = "electron"; platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; From 8ab17c100f995631983c98fc8f3fbf63191d21a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Apr 2024 19:26:30 +0000 Subject: [PATCH 26/33] mountpoint-s3: 1.5.0 -> 1.6.0 (cherry picked from commit 229a97457054f259ddf2c48a80f297bf403cd2cc) --- pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index bd3f2c23c8b7..77903f8f0489 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-DsxcQ/FEVcrzPyv9LgssNut4XnbU3mPKbuBwQKLiRLA="; + hash = "sha256-1d2PPbTheUcHw2xS5LEcdchnfwu7szBApv+FnPaxt+I="; fetchSubmodules = true; }; - cargoHash = "sha256-UOQRdSQ/whlOTZL2vaNiIcKB+Zgpk8tbinWBRWPyllc="; + cargoHash = "sha256-tBi41kdaa4mVHh0MkXJ8kaG1e3CQURIKVk9Lboy1N8Y="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 From 02add7fdc81cdfa4312aa3e4e42fa42747d221fd Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 12 Apr 2024 01:30:09 +0200 Subject: [PATCH 27/33] electron_26-bin: 26.3.0 -> 26.6.10 --- pkgs/development/tools/electron/binary/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 7036e7934918..6dbd6088901b 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -158,13 +158,13 @@ rec { headers = "0wcqz4vgkyz1zcd0ybx1ywzv9kz96hdxwk9an98v87nb1gfhk05c"; }; - electron_26-bin = mkElectron "26.3.0" { - armv7l-linux = "c444d805381a8125eb16f24369bbc370751c1f6bfaa0d4613a7a94ad797f5059"; - aarch64-linux = "740b779bf3a2032fedb6c1902e537f61e88c5e245a4e8815ec8cf471ff38aceb"; - x86_64-linux = "38e2a68361566faa2e7f2a4639cfedee3a5889d5f64018b2ad055c8f40516312"; - x86_64-darwin = "ea9434ad717f12771f8c508b664ed8d18179b397910ce81f4b6e21efce90b754"; - aarch64-darwin = "97cb2d00d06f331b4c028fa96373abdd7b5a71c2aa31b56cdf67d391f889f384"; - headers = "00r11n0i0j7brkjbb8b0b4df6kgkwdplic4l50y9l4a7sbg6i43m"; + electron_26-bin = mkElectron "26.6.10" { + armv7l-linux = "f6fb96c37fa0b4061998441ebf3d8edee1076b6ef33d2f6fe16e07dcdb4c638a"; + aarch64-linux = "1f235d36a9f3729b8e8da83b5819f42c7083aa7725bd4cf2cb9460e0b70c4f17"; + x86_64-linux = "9a2ac0fcca0e0007859328b1df8e53f7ab1bc3d2946afee48c157a8a9ba36757"; + x86_64-darwin = "faca327a094a9bce54184d4fe6b74b4580e53c8a1fafa94f9a8651f41be3aca7"; + aarch64-darwin = "744eee95754579fae7b7f7dac181092d59f31de2516370fcd671ba8ec1d86af3"; + headers = "0jg60lgcv2r10qa6hjayzh4qr2z2kcnbgnrlcmlp2dm94izz5nic"; }; electron_27-bin = mkElectron "27.3.9" { From a3ed5759e4626817d4b1769e426bed38058b1f96 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 12 Apr 2024 01:33:22 +0200 Subject: [PATCH 28/33] electron_26: always use electron_26-bin The build from source is broken since commit d90fd6cd4aceefb520ba4efed105fea9b748c313 https://hydra.nixos.org/build/255783237/nixlog/1 The error is jq: error (at :1): Cannot index string with string "patch_dir" --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 746b32d8c886..880329a0b9d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18523,7 +18523,7 @@ with pkgs; electron_23 = electron_23-bin; electron_24 = electron_24-bin; electron_25 = electron_25-bin; - electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin; + electron_26 = electron_26-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; From 4ade5594746d3c034b6b33d24d4b5fd9d3815514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Feb 2024 15:39:23 -0800 Subject: [PATCH 29/33] nixos/tests/searx: use configured package for static content Also use the simple theme because upstream dropped the oscar one: https://github.com/searxng/searxng/discussions/1167 --- nixos/tests/searx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 2f808cb65266..02a88f690db7 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} : }; # fancy setup: run in uWSGI and use nginx as proxy - nodes.fancy = { ... }: { + nodes.fancy = { config, ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.searx = { @@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} : include ${pkgs.nginx}/conf/uwsgi_params; uwsgi_pass unix:/run/searx/uwsgi.sock; ''; - locations."/searx/static/".alias = "${pkgs.searx}/share/static/"; + locations."/searx/static/".alias = "${config.services.searx.package}/share/static/"; }; # allow nginx access to the searx socket @@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} : "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" ) fancy.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2" + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2" ) ''; }) From 1c9851168ea5ffaeb5202979bbf4707806ff399e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Feb 2024 15:34:16 -0800 Subject: [PATCH 30/33] nixos/searx: use lib.getExe --- nixos/modules/services/networking/searx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 8054f01d705f..a9eef61213f4 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -218,7 +218,7 @@ in serviceConfig = { User = "searx"; Group = "searx"; - ExecStart = "${cfg.package}/bin/searx-run"; + ExecStart = lib.getExe cfg.package; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = builtins.toPath cfg.environmentFile; }; environment = { From c6e960a2997721b3cc5311c60052cd57e43bfe08 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 10 Apr 2024 22:20:05 +0200 Subject: [PATCH 31/33] electron-source.electron_27: 27.3.9 -> 27.3.10 https://github.com/electron/electron/releases/tag/v27.3.10 Fixes CVE-2024-3159 (cherry picked from commit c41f01c8113e09d678c94a399064ac81ca7a46f1) --- pkgs/development/tools/electron/info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 5b2907903a3e..5ec83fb61438 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -895,10 +895,10 @@ "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-/Bd91mSKGqsEThDZKnQCBSy/eWW+MnPDsPML2WafhtI=", + "hash": "sha256-vCM74wty0JN4PL9snwa4oFbNebA3cMZ8lorXz5DIVcE=", "owner": "electron", "repo": "electron", - "rev": "v27.3.9" + "rev": "v27.3.10" }, "src": { "fetcher": "fetchFromGitiles", @@ -1765,7 +1765,7 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "27.3.9", + "version": "27.3.10", "modules": "118", "chrome": "118.0.5993.159", "node": "18.17.1", @@ -1780,8 +1780,8 @@ } } }, - "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964", - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "electron_yarn_hash": "1yq854829a4q0yqyjyn2lq4l3amsqdhfd7fjcnc3mz8l2ci3n964" }, "26": { "deps": { From 1deb63b4cea44b99dba8817404f9811f550c926d Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 10 Apr 2024 22:21:07 +0200 Subject: [PATCH 32/33] electron-source.electron_28: 28.2.10 -> 28.3.0 https://github.com/electron/electron/releases/tag/v28.3.0 Fixes CVE-2024-3159 (cherry picked from commit 14110eadc517f49df34791a20e79d7f872193c75) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 5ec83fb61438..fa59b3ce2a2f 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -3,10 +3,10 @@ "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-fu2/PUgZZR8OWtD04X31RaLHkhF5QeHvtdg1UX3SoBw=", + "hash": "sha256-AHiOejVRSeJ14Xn+A6yjfICbERDPr/eCbBq+2qPjGDc=", "owner": "electron", "repo": "electron", - "rev": "v28.2.10" + "rev": "v28.3.0" }, "src": { "fetcher": "fetchFromGitiles", @@ -873,7 +873,7 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "28.2.10", + "version": "28.3.0", "modules": "119", "chrome": "120.0.6099.291", "node": "18.18.2", From 1736b784715609f4ff791a1c2c5b3abada2e2142 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 10 Apr 2024 23:00:42 +0200 Subject: [PATCH 33/33] electron-source.electron_29: 29.2.0 -> 29.3.0 https://github.com/electron/electron/releases/tag/v29.3.0 Fixes CVE-2024-3156 (cherry picked from commit dcde7b9e03aee557d3c2c1a80aae39b241d6e36d) --- pkgs/development/tools/electron/info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index fa59b3ce2a2f..5d8ef0474a17 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2631,10 +2631,10 @@ "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-M/0dbmNELh9ZnH0FAtj0vItWhMwEd2vwrXx2JTqJGr0=", + "hash": "sha256-buW6hC7GIA59MTuyWg9/+EzQlFgJVN2IZrxlfisLemM=", "owner": "electron", "repo": "electron", - "rev": "v29.2.0" + "rev": "v29.3.0" }, "src": { "fetcher": "fetchFromGitiles", @@ -3514,7 +3514,7 @@ "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" } }, - "version": "29.2.0", + "version": "29.3.0", "modules": "121", "chrome": "122.0.6261.156", "node": "20.9.0", @@ -3529,7 +3529,7 @@ } } }, - "chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=", - "electron_yarn_hash": "0spwnax6g3050z2bjylzs67l7m551is86nizzy4hp0306v57xdpz" + "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "chromium_npm_hash": "sha256-9eFsK673j3pTDOcsU35RN4hagFygA/v/ahCqVVEV0Rs=" } }