From 7b5608e5bd7d5197e76f568e54dc3596cfbead3d Mon Sep 17 00:00:00 2001 From: Schweber <64630479+Schweber@users.noreply.github.com> Date: Sat, 2 Dec 2023 18:49:45 +0100 Subject: [PATCH 01/20] maintainers: add Schweber --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4678aeb8811a..2ea8003a0340 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16213,6 +16213,11 @@ githubId = 5104601; name = "schnusch"; }; + Schweber = { + github = "Schweber"; + githubId = 64630479; + name = "Schweber"; + }; sciencentistguy = { email = "jamie@quigley.xyz"; name = "Jamie Quigley"; From 2a4c0e2f12cfbf70ecd3bc95d64b939d9e22437d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 5 Dec 2023 21:56:08 +0100 Subject: [PATCH 02/20] couchdb3: 3.3.2 -> 3.3.3 --- pkgs/servers/http/couchdb/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 8913dae50be4..6e625dbdb720 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-PWgj1C0Qzw1PhsnE/lnJkyyJ1oV4/LbEtCeNx2kwjao="; + hash = "sha256-eiAHtfZz1L4iolyaER2QZpGdhy3bkTWn3OwBIimb054="; }; postPatch = '' From fb95efda8e00dd4307b3caeffce969d956eabee4 Mon Sep 17 00:00:00 2001 From: Schweber <64630479+Schweber@users.noreply.github.com> Date: Sat, 2 Dec 2023 18:49:55 +0100 Subject: [PATCH 03/20] hdrop: init at 0.2.4 hdrop: format package.nix with nixpkgs-fmt hdrop: fix formatting again hdrop: improve formatting --- pkgs/by-name/hd/hdrop/package.nix | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100755 pkgs/by-name/hd/hdrop/package.nix diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix new file mode 100755 index 000000000000..940cdf8f66b3 --- /dev/null +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, scdoc +, coreutils +, util-linux +, jq +, libnotify +, withHyprland ? true +, hyprland +}: + +stdenvNoCC.mkDerivation rec { + pname = "hdrop"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "Schweber"; + repo = "hdrop"; + rev = "v${version}"; + hash = "sha256-VsM1wPl8edAnZUvYw3IeOHw/XQ2pvbLt0v3G0B8+iSA="; + }; + + nativeBuildInputs = [ + makeWrapper + scdoc + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/hdrop --prefix PATH ':' \ + "${lib.makeBinPath ([ + coreutils + util-linux + jq + libnotify + ] + ++ lib.optional withHyprland hyprland)}" + ''; + + meta = with lib; { + description = "Emulate 'tdrop' in Hyprland (run, show and hide specific programs per keybind)"; + homepage = "https://github.com/Schweber/hdrop"; + changelog = "https://github.com/Schweber/hdrop/releases/tag/v${version}"; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ Schweber ]; + mainProgram = "hdrop"; + }; +} From 2c982e89c51d523b5dde40479bde36c03fd66319 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:38:10 +0100 Subject: [PATCH 04/20] xorriso: update hash Co-authored-by: Anderson Torres --- pkgs/by-name/xo/xorriso/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xo/xorriso/package.nix b/pkgs/by-name/xo/xorriso/package.nix index 057f61c9fe27..9fba38fb9044 100644 --- a/pkgs/by-name/xo/xorriso/package.nix +++ b/pkgs/by-name/xo/xorriso/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xorriso"; - version = "1.5.7"; + version = "1.5.7-unstable-2023-12-06"; src = fetchurl { - url = "https://www.gnu.org/software/xorriso/xorriso-${finalAttrs.version}.tar.gz"; - hash = "sha256-hnV3w4f2tKmjIk60Qd7Y+xY432y8Bg+NGh5dAPMY9QI="; + url = "https://web.archive.org/web/20231206123448/https://www.gnu.org/software/xorriso/xorriso-1.5.7.tar.gz"; + hash = "sha256-B7lV3n3e1aF7yJsLxwi8C8m3sBmUUePpCV9KfWRuTm0="; }; buildInputs = [ From d1a558301caa6b6ac21f5c3f04528b2943d3a2ae Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 6 Dec 2023 23:48:06 +0800 Subject: [PATCH 05/20] hypnotix: 4.0 -> 4.2 https://github.com/linuxmint/hypnotix/compare/4.0...4.2 --- pkgs/applications/video/hypnotix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index bcf09b962483..49769961c08f 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "4.0"; + version = "4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-0iJzlj5FRDXJdh+vWVvZaBJVNru7CfkvJtZUZYKoqPw="; + hash = "sha256-YmVMcNbvbkODAmEgv8Ofgo07Mew/F4xv5cBaWKsH1S4="; }; patches = [ From 9116e87e69066a3cef0a0bb5ac975e9c4006b526 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 7 Dec 2023 13:27:26 +0000 Subject: [PATCH 06/20] xdg-desktop-portal: disable known flaky tests (set `TEST_IN_CI`) There are a few tests that are fkay in hydra. Most fauly one seems to be `monitor` test from `test-portals-inhibit` suite. Upstream already skips it for `TEST_IN_CI` case. Let's set the variable as well to skip these tests. --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index e760151f216a..905675c40659 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -117,6 +117,12 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' # For test_trash_file export HOME=$(mktemp -d) + + # Upstream disables a few tests in CI upstream as they are known to + # be flaky. Let's disable those downstream as hydra exhibits similar + # flakes: + # https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951 + export TEST_IN_CI=1 ''; passthru = { From 589ff59c5861212076836d05212f49d4cc6e47ba Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 7 Dec 2023 12:56:25 -0500 Subject: [PATCH 07/20] brave: 1.60.125 -> 1.61.101 https://community.brave.com/t/release-channel-1-61-101/520106 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 9f192ec4f16d..b8dd53383c98 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.60.125"; + version = "1.61.101"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-ZctJBLEpaOzRK8BppMK7aT0kx00e7zXO+y8U38CCxKo="; + hash = "sha256-s+YjTZs+dT/T/MSzOAvXMHzd3pWMbLa8v9amnd2sqns="; }; dontConfigure = true; From deea2755406664cadeaf880c630852954b26cb78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Dec 2023 10:36:10 +0100 Subject: [PATCH 08/20] python311Packages.meteofrance-api: 1.2.0 -> 1.3.0 Diff: https://github.com/hacf-fr/meteofrance-api/compare/refs/tags/v1.2.0...v1.3.0 Changelog: https://github.com/hacf-fr/meteofrance-api/releases/tag/v1.3.0 --- .../python-modules/meteofrance-api/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index b6fb1d51446d..4aee704e605a 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "meteofrance-api"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hacf-fr"; - repo = pname; + repo = "meteofrance-api"; rev = "refs/tags/v${version}"; - hash = "sha256-W26R+L2ZJpycEQ9KwkHqVARKsd/5YkJCxMeciKnKAX8="; + hash = "sha256-uSrVK6LwCDyvsjzGl4xQd8585Hl6sp2Ua9ly0wqnC1Y="; }; nativeBuildInputs = [ @@ -48,8 +48,9 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_currentphenomenons" + "test_dictionary" "test_forecast" - "test_full_with_coastal_bulletint" + "test_full_with_coastal_bulletin" "test_fulls" "test_no_rain_expected" "test_picture_of_the_day" From 5edccff74836964feac3f102eb69d92110810285 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Dec 2023 13:10:15 +0100 Subject: [PATCH 09/20] checkSSLCert: 2.77.0 -> 2.78.0 Diff: https://github.com/matteocorti/check_ssl_cert/compare/refs/tags/v2.77.0...v2.78.0 Changelog: https://github.com/matteocorti/check_ssl_cert/releases/tag/v2.78.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 16c8992ee039..8f1d6579158f 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.77.0"; + version = "2.78.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-xU/1Bs3uIFomy6w2Vf50O3VbwoGfJMng88J1NXfg1pQ="; + hash = "sha256-5a9mrRd3YqKuz/VG7/CheMWpy99PpnyPaA5/VFEvj3Y="; }; nativeBuildInputs = [ From 54466394caedd52bee91ac34f13ede65df9be6e0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 27 Nov 2023 23:05:48 -0500 Subject: [PATCH 10/20] bibutils: fix cross compilation --- pkgs/tools/misc/bibutils/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 66a518407025..c454e8cfa1d8 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -18,13 +18,22 @@ stdenv.mkDerivation rec { --replace '-Wl,-soname,$(SONAME)' "" ''; + # the configure script is not generated by autoconf + # and do not recognize --build/--host cross compilation flags + configurePlatforms = [ ]; + configureFlags = [ (if static then "--static" else "--dynamic") "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; + dontAddPrefix = true; + makeFlags = [ + "CC:=$(CC)" + ]; + doCheck = true; checkTarget = "test"; preCheck = lib.optionalString stdenv.isDarwin '' From 99fa28912a521a1c6c0b699cf0c2ce03426328db Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:14:54 +0100 Subject: [PATCH 11/20] llvmPackages_17: 17.0.2 -> 17.0.6 --- pkgs/development/compilers/llvm/17/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index 950affae3029..8109f27586cb 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "17.0.2"; sha256 = "08w6mksm7mkws3hhhsy5gg881b4whr6abrshmh6q4c32qlni94nn"; } +, officialRelease ? { version = "17.0.6"; sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; } # i.e.: # { # version = /* i.e. "15.0.0" */; From 458d70557d7ba3f476764641748a8ef8f7d0aff6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 30 Nov 2023 12:03:33 +0800 Subject: [PATCH 12/20] emacs: set 29 as default version --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8a3fc6a79c9..1758116337ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31370,10 +31370,10 @@ with pkgs; emacs29-macport ; - emacs-macport = emacs28-macport; - emacs = emacs28; - emacs-gtk = emacs28-gtk3; - emacs-nox = emacs28-nox; + emacs-macport = emacs29-macport; + emacs = emacs29; + emacs-gtk = emacs29-gtk3; + emacs-nox = emacs29-nox; emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; From 319a6568c5c69cf0230187c3f70b5d0848de043b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 9 Dec 2023 00:12:31 +0100 Subject: [PATCH 13/20] forgejo: 1.21.1-0 -> 1.21.2-0 https://codeberg.org/forgejo/forgejo/releases/tag/v1.21.2-0 changelog: https://codeberg.org/forgejo/forgejo/src/commit/d26aea842e8a6cf54cdac7279b62ec27f2b61995/RELEASE-NOTES.md#1-21-2-0 --- pkgs/applications/version-management/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 689167e3fbf8..6f724f183c2d 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.1-0"; + version = "1.21.2-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-e7Y1YBJq3PwYl7hf5KUa/CSI4ihbpN/TjWwltjNwXRM="; + hash = "sha256-kH4m958gmIYpIwYmT2kIj9FcfXdyh8no06E0WQII/6E="; }; vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8="; From ca726d0a8a74bd04568357eee27e6d4ccbdd5733 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 9 Dec 2023 00:24:55 +0100 Subject: [PATCH 14/20] chromium: 119.0.6045.199 -> 120.0.6099.71 https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop_6.html This update includes 10 security fixes. CVEs: CVE-2023-6508 CVE-2023-6509 CVE-2023-6510 CVE-2023-6511 CVE-2023-6512 Co-authored-by: emilylange --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 33831a5f9b1f..cdcd34bf98e6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -9,15 +9,15 @@ }; deps = { gn = { - hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; - rev = "991530ce394efb58fcd848195469022fa17ae126"; + hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k="; + rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b"; url = "https://gn.googlesource.com/gn"; - version = "2023-09-12"; + version = "2023-10-23"; }; }; - hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg="; - hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU="; - version = "119.0.6045.199"; + hash = "sha256-2IYdIhe299Fn5gtmLKxqIPqTYYEpCJqbXh3Vx8zN9Uo="; + hash_deb_amd64 = "sha256-xHwBLIU1QoDM0swG2DzRJ7BY9ESiqOrm4SwvK0mfIZc="; + version = "120.0.6099.71"; }; ungoogled-chromium = { deps = { From db8b5f058ef1e7809f5838e86ade81483d304d42 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 9 Dec 2023 00:23:24 +0100 Subject: [PATCH 15/20] ungoogled-chromium: 119.0.6045.199-1 -> 120.0.6099.71-1 https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2023/12/stable-channel-update-for-desktop_6.html This update includes 10 security fixes. CVEs: CVE-2023-6508 CVE-2023-6509 CVE-2023-6510 CVE-2023-6511 CVE-2023-6512 --- .../browsers/chromium/upstream-info.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index cdcd34bf98e6..351a1a919c13 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -22,18 +22,18 @@ ungoogled-chromium = { deps = { gn = { - hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; - rev = "991530ce394efb58fcd848195469022fa17ae126"; + hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k="; + rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b"; url = "https://gn.googlesource.com/gn"; - version = "2023-09-12"; + version = "2023-10-23"; }; ungoogled-patches = { - hash = "sha256-ZcE5rmreXt4X+PuMalNRE7FakMIMOCyZQfhIhKDSxMg="; - rev = "119.0.6045.199-1"; + hash = "sha256-S0Kt9M21zyjIozJuyy4kBDt07kJxXBR7SoNzdvf0iPI="; + rev = "120.0.6099.71-1"; }; }; - hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg="; - hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU="; - version = "119.0.6045.199"; + hash = "sha256-2IYdIhe299Fn5gtmLKxqIPqTYYEpCJqbXh3Vx8zN9Uo="; + hash_deb_amd64 = "sha256-xHwBLIU1QoDM0swG2DzRJ7BY9ESiqOrm4SwvK0mfIZc="; + version = "120.0.6099.71"; }; } From 4a34a5f2d4587892bdc1df6cde4cd1b6c285bdbe Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 9 Dec 2023 00:26:12 +0100 Subject: [PATCH 16/20] chromedriver: 119.0.6045.105 -> 120.0.6099.71 --- .../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 351a1a919c13..f600049011a0 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-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI="; + hash_darwin = "sha256-ThsKOOLNcmFTUnLirSHea9wzw+FyC3v7I/5ghbz8GAg="; hash_darwin_aarch64 = - "sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow="; - hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y="; - version = "119.0.6045.105"; + "sha256-UVBLCo8Lkbnt882PeTMnO8lxam42mIDkEN28Ps8E0a8="; + hash_linux = "sha256-X8bia1BaLQm5WKn5vdShpQ4A7sPNZ8lgmeXoYj2earc="; + version = "120.0.6099.71"; }; deps = { gn = { From 197b168f990680ed941900b3673c841b3f729a26 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Fri, 8 Dec 2023 20:38:41 -0500 Subject: [PATCH 17/20] sparkleshare: Remove fallback to Flatpak image The upstream .desktop file has a fallback to flatpack. It is only intended to run if `sparkleshare` isn't in the user's path. But to make matters even worse it will also run if `sparkleshare` exists with a failure code. Remove this fallback to ensure that users don't download and run unpinned and untrusted code from the internet. --- pkgs/applications/version-management/sparkleshare/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index a13f25e68195..ef7da9d880bf 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { ]; patchPhase = '' + # SparkleShare's default desktop file falls back to flatpak. + sed -ie "s_^Exec=.*_Exec=$out/bin/sparkleshare_" SparkleShare/Linux/SparkleShare.Autostart.desktop + # Nix will manage the icon cache. echo '#!/bin/sh' >scripts/post-install.sh ''; From 29558c0722ffd40ff625256e16259168b7c03ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix?= <1219785+picnoir@users.noreply.github.com> Date: Sat, 9 Dec 2023 07:39:50 +0100 Subject: [PATCH 18/20] spotdl: 4.2.2 -> 4.2.4 (#272641) Some tests have been renamed. We also disable some new tests requiring network connectivity. --- pkgs/tools/audio/spotdl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 9bbceae0b688..a825fd2e1e39 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -9,14 +9,14 @@ let python = python3; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.2"; + version = "4.2.4"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-pJr0OGUI3OcFsmvn9eqkvpFeF1EkHDdNoWc91s8h9O8="; + hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc="; }; nativeBuildInputs = with python.pkgs; [ @@ -79,8 +79,10 @@ in python.pkgs.buildPythonApplication rec { "test_download_ffmpeg" "test_download_song" "test_preload_song" - "test_ytm_get_results" + "test_yt_get_results" + "test_yt_search" "test_ytm_search" + "test_ytm_get_results" ]; makeWrapperArgs = [ From d353adfc069075ddbf253db65cbd61275da851cf Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 9 Dec 2023 17:54:03 +0800 Subject: [PATCH 19/20] datadog-agent: Remove self from meta.maintainers I no longer use this package and am unable to help maintain it. --- pkgs/tools/networking/dd-agent/datadog-agent.nix | 2 +- pkgs/tools/networking/dd-agent/datadog-process-agent.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index aac49a7b83b2..59891528b55a 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -118,7 +118,7 @@ in buildGoModule rec { ''; homepage = "https://www.datadoghq.com"; license = licenses.bsd3; - maintainers = with maintainers; [ thoughtpolice domenkozar rvl viraptor ]; + maintainers = with maintainers; [ thoughtpolice domenkozar viraptor ]; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; }; diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 1dbedea50232..4d1334505f32 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -4,7 +4,7 @@ datadog-agent.overrideAttrs (attrs: { meta = with lib; attrs.meta // { description = "Live process collector for the DataDog Agent v7"; - maintainers = with maintainers; [ domenkozar rvl ]; + maintainers = with maintainers; [ domenkozar ]; }; subPackages = [ "cmd/process-agent" ]; postInstall = null; From 580a9d5740cdd145c930fd20bf069d250f062dad Mon Sep 17 00:00:00 2001 From: Maxim Karasev Date: Sat, 9 Dec 2023 01:40:01 +0300 Subject: [PATCH 20/20] cutter: add qtwayland to build inputs See #174946. --- pkgs/development/tools/analysis/rizin/cutter.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index f20f77eca7a2..480f20f04f49 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,6 +11,7 @@ # Qt , qt5compat , qtbase +, qtwayland , qtsvg , qttools , qtwebengine @@ -61,6 +62,8 @@ let cutter = stdenv.mkDerivation rec { qttools qtwebengine rizin + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; cmakeFlags = [