Merge master into staging-nixos

pkgs/applications/networking/browsers/chromium/info.json

@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "146.0.7680.71",
+    "version": "146.0.7680.75",
     "chromedriver": {
-      "version": "146.0.7680.72",
-      "hash_darwin": "sha256-pm7HJA+yr7gQFYHpYC1ELD8zDFzrzcRDpkjbqmjWcbs=",
-      "hash_darwin_aarch64": "sha256-ffgeYa2Rvrg9LUTpKJ4tkBysVkMMUkrBkju6ULHU/dI="
+      "version": "146.0.7680.76",
+      "hash_darwin": "sha256-zCICFkv0dXZYIIp8xnqEbxBR4Q9+GlCEY6yoJHsqcVg=",
+      "hash_darwin_aarch64": "sha256-UzawlFfX/lIATPL8j6XMkurE1SzhNwyB/jn4v6tWY/g="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "e00a64ead1abef9447943efede7bc26362ac3797",
-        "hash": "sha256-hZPRH4Q2PQqXDhMXHHcav+37US+7vuN176rhpcoOeq8=",
+        "rev": "d865c3fe495882da3a7c6575337a02867c4536b1",
+        "hash": "sha256-/hjpcI4GTw0bGqZ5/9gzM4Pc6/5fhk5dmdtw5EfidiY=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -817,8 +817,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "bc343986bd4cb17e49ef15b70c4bdac710e27167",
-        "hash": "sha256-dsjddO/LCNAYLJ1XyDkJLJ9TToiy7pENlBryF1VcmtY="
+        "rev": "70253f966a7c3936f5a5ff57c6a4a4face1f16ad",
+        "hash": "sha256-8tA9nWXsiQ2Qt7pbALrhsnNFHOFLw/wlcz5OrFjYEI8="
       }
     }
   },

pkgs/by-name/au/autoraise/package.nix

@@ -3,6 +3,10 @@
   stdenv,
   fetchFromGitHub,
   apple-sdk,
+
+  enableExperimentalFocusFirst ? false,
+  enableOldActivationMethod ? false,
+  enableAlternativeTaskSwitcher ? false,
 }:
 stdenv.mkDerivation rec {
   pname = "autoraise";
@@ -21,7 +25,11 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     runHook preBuild
-    $CXX -std=c++03 -fobjc-arc -D"NS_FORMAT_ARGUMENT(A)=" -D"SKYLIGHT_AVAILABLE=1" -o AutoRaise AutoRaise.mm -framework AppKit -framework SkyLight
+    $CXX -std=c++03 -fobjc-arc -D"NS_FORMAT_ARGUMENT(A)=" -D"SKYLIGHT_AVAILABLE=1" \
+      ${lib.optionalString enableExperimentalFocusFirst "-DEXPERIMENTAL_FOCUS_FIRST"} \
+      ${lib.optionalString enableOldActivationMethod "-DOLD_ACTIVATION_METHOD"} \
+      ${lib.optionalString enableAlternativeTaskSwitcher "-DALTERNATIVE_TASK_SWITCHER"} \
+      -o AutoRaise AutoRaise.mm -framework AppKit -framework SkyLight
     bash create-app-bundle.sh
     runHook postBuild
   '';

pkgs/by-name/di/discord-rich-presence-plex/package.nix

@@ -1,62 +1,56 @@
 {
   lib,
-  python3Packages,
-  python3,
   fetchFromGitHub,
-  makeWrapper,
+  buildGo126Module,
+  buildNpmPackage,
 }:
 
-python3Packages.buildPythonApplication (finalAttrs: {
+let
+  version = "3.0.0";
+
   pname = "discord-rich-presence-plex";
-  version = "2.16.0";
-  pyproject = false;
+
   src = fetchFromGitHub {
     owner = "phin05";
     repo = "discord-rich-presence-plex";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-e1r0w72IOEY5XsjANkAHbfPYEf1B8n6KYVLMWFSLs0g=";
+    rev = "v${version}";
+    hash = "sha256-RvsS47059YdxKSo6sy+zglY1YxzyJmZTmo/DIKX1xqU=";
   };
 
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-  dontBuild = true;
-  dontUseSetuptoolsBuild = true;
-  dontUseSetuptoolsCheck = true;
-
-  dependencies = with python3Packages; [
-    requests
-    pillow
-    plexapi
-    pyyaml
-    websocket-client
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib/discord-rich-presence-plex
-    cp -r * $out/lib/discord-rich-presence-plex/
-
-    mkdir -p $out/bin
-    makeWrapper ${lib.getExe python3} \
-      $out/bin/discord-rich-presence-plex \
-      --add-flags "$out/lib/discord-rich-presence-plex/main.py" \
-      --prefix PYTHONPATH : "$out/lib/discord-rich-presence-plex:$PYTHONPATH" \
-      --set DRPP_NO_PIP_INSTALL "true"
-
-    runHook postInstall
+  webAssets = buildNpmPackage {
+    pname = "${pname}-web";
+    inherit version src;
+    sourceRoot = "${src.name}/web";
+    npmDepsHash = "sha256-7cp4LeXUAiIHGvLfwsIWpdqjUzemlCKVCsBZxTnPlDk=";
+    installPhase = ''
+      cp -r dist $out
+    '';
+  };
+in
+buildGo126Module {
+  inherit version src pname;
+  subPackages = [ "server/main" ];
+  env.GOEXPERIMENT = "jsonv2";
+  vendorHash = "sha256-B1XHMqyih3eBlRsU6s5HcGv9WY8OcXj2yGwB2jpP9HI=";
+  preBuild = ''
+    mkdir -p web/dist
+    cp -r ${webAssets}/* web/dist/
   '';
 
-  # No tests
-  doCheck = false;
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+  ];
 
+  postInstall = ''
+    mv $out/bin/main $out/bin/drpp
+  '';
   meta = {
     homepage = "https://github.com/phin05/discord-rich-presence-plex";
-    changelog = "https://github.com/phin05/discord-rich-presence-plex/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.gpl3Only;
     description = "Displays your Plex status on Discord using Rich Presence";
-    maintainers = with lib.maintainers; [ hogcycle ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "discord-rich-presence-plex";
+    maintainers = with lib.maintainers; [ hogcycle ];
   };
-})
+}

pkgs/by-name/du/ducker/package.nix

@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ducker";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "robertpsoane";
     repo = "ducker";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-HQh6yXDovEf+bG+VcT6I5Q/NN3laSgPRm/2NdLpoAGE=";
+    sha256 = "sha256-3o6uA3g1v4PiRYl6J4sOAllgwkEou7kS9E8us4DIZb0=";
   };
 
-  cargoHash = "sha256-QnEhySY34b/PRsFr77AXhWMoirShSpcoIRQxnIVVM94=";
+  cargoHash = "sha256-GUbRNXphkbm0oSjC8wKJgIhigtB4dbUwNuMSvCJUyaA=";
 
   meta = {
     description = "Terminal app for managing docker containers, inspired by K9s";

pkgs/by-name/gi/git-pages-cli/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-pages-cli";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchFromCodeberg {
     owner = "git-pages";
     repo = "git-pages-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-58fEurUoRw1hJ2eYHrXrsVDElVVo5BH0bZFw7h1yM0w=";
+    hash = "sha256-VImFTyV1REHIWWEY5Kqd3WJ+YF5OupQhEa4/VWnrHi4=";
   };
 
-  vendorHash = "sha256-Mico/PFTb8YoRZCP42QETS0DkzMABUGTzBvy692XDJc=";
+  vendorHash = "sha256-Vp6cqGM4Lhsfhjgv0Tz6Bmdz20EAGyPGR2Y91dnGejA=";
 
   ldflags = [
     "-X"

pkgs/by-name/uc/uchmviewer/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uchmviewer";
-  version = "8.5";
+  version = "8.6";
 
   src = fetchFromGitHub {
     owner = "eBookProjects";
     repo = "uChmViewer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SHPX6fndfeOTyYsIaqXgmDqKkoNowDbqiCHuRsvUZyk=";
+    hash = "sha256-y2ya2HjwC/TEdWrJ/o9lMgbWNenXQ2qK0TNkpSgDgls=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/quantulum3/default.nix

@@ -15,7 +15,7 @@
 }:
 let
   pname = "quantulum3";
-  version = "0.9.2";
+  version = "0.10.0";
 in
 buildPythonPackage {
   inherit version pname;

pkgs/os-specific/linux/conky/default.nix

@@ -95,13 +95,13 @@ assert extrasSupport -> python3 != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "conky";
-  version = "1.22.2";
+  version = "1.22.3";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tMnfdW1sbZkt8v6DITM2R0ZwyN+xs7VLGZDityYt38Q=";
+    hash = "sha256-WZjYs68/u7XUUriLPW3VMJIFP/HsnraHT6w84usQMYM=";
   };
 
   # pkg-config doesn't detect wayland-scanner in cross-compilation for some reason

pkgs/tools/package-management/nix/default.nix

@@ -222,14 +222,14 @@ lib.makeExtensible (
 
       nixComponents_2_34 =
         (nixDependencies.callPackage ./modular/packages.nix rec {
-          version = "2.34.0";
+          version = "2.34.1";
           inherit (self.nix_2_33.meta) teams;
           otherSplices = generateSplicesForNixComponents "nixComponents_2_34";
           src = fetchFromGitHub {
             owner = "NixOS";
             repo = "nix";
             tag = version;
-            hash = "sha256-lLI7QGlSVqSjJwFrU2Ok5bnZhmmDgHzbMUawwwqaDu0=";
+            hash = "sha256-qzVtneydMSjNZXzNbxQG9VvJc490keS9RNlbUCfiQas=";
           };
         }).appendPatches
           patches_common;