Merge master into staging-next

NixOS · Oct 26, 2024 · cdab0d3 · cdab0d3
2 parents 50adc1b + a48eed9
commit cdab0d3
Show file tree

Hide file tree

Showing 69 changed files with 398 additions and 465 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -8625,6 +8625,12 @@
     githubId = 6430643;
     name = "Henry Till";
   };
+  hensoko = {
+    email = "[email protected]";
+    github = "hensoko";
+    githubId = 13552930;
+    name = "hensoko";
+  };
   heph2 = {
     email = "[email protected]";
     github = "heph2";

diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
diff --git a/pkgs/applications/editors/qxw/default.nix b/pkgs/applications/editors/qxw/default.nix
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
@@ -10,43 +10,43 @@
 
 let
   pname = "1password";
-  version = if channel == "stable" then "8.10.46" else "8.10.48-17.BETA";
+  version = if channel == "stable" then "8.10.48" else "8.10.50-8.BETA";
 
   sources = {
     stable = {
       x86_64-linux = {
         url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-oewS90rSBqxA0V+ttcmUXznUZ3+mb5FKtmYD4kUDmTk=";
+        hash = "sha256-6yC7wDYd6FJluiVXyc6O03GiZkG48ttRl1N1A9djI9A=";
       };
       aarch64-linux = {
         url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk=";
+        hash = "sha256-RN3FC7JIAJvd1hWdVH1CAOUsYr5rpq9o3JVbyfwWWKk=";
       };
       x86_64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc=";
+        hash = "sha256-iJkIzVeI/mqFbBAGqQPABq1sAeS9k0j+EuUND1VYWJQ=";
       };
       aarch64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY=";
+        hash = "sha256-LZ56dIJ5vXJ1SbCI8hdeldKJwzkfM0Tp8d9eZ4tQ9/k=";
       };
     };
     beta = {
       x86_64-linux = {
         url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-4SPZJP/ebnyAMEWrIGonb+5nYXuM8KCPK9modC/Cr/Y=";
+        hash = "sha256-Wm8TZjPVkqn+Y0PvSxTBAGduQNBAWUvy0AEGveVvMS0=";
       };
       aarch64-linux = {
         url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-V5Nt81Trw6l7DAUtCX2Yv/fL2wBJpJER0iaOBmMfQ5o=";
+        hash = "sha256-pF1DmzfcfyT/JVJx97dykbFwEjgOMpTvofTaZvwIIvE=";
       };
       x86_64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI=";
+        hash = "sha256-MOilWgFZazVrMc6cCHqZO03KmBP8HCPevrxcKAMKEoE=";
       };
       aarch64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A=";
+        hash = "sha256-TBA2OJXSjKzAR+gvVPCetSc7MVCNoyw4xo6w+9EIayc=";
       };
     };
   };

diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.2.67";
+  version = "0.2.68";
 in
 buildGoModule {
   pname = "act";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "nektos";
     repo = "act";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yNa6o35YUP8D8K3kQLHQOG3V9mWGoxNvYgw5UQOqAtc=";
+    hash = "sha256-BON29uUruBoeBLoBdOgnonrVIyLZlvBW5UyWfxFgjPs=";
   };
 
-  vendorHash = "sha256-bkOLortxztmzAO/KCbQC4YsZ5iAero1yxblCkDZg8Ds=";
+  vendorHash = "sha256-yxuOORShJL9nFIS5srZFI31Nyz7xFxnJCmcN8UFhyr0=";
 
   doCheck = false;
 

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
@@ -13,13 +13,13 @@
 }:
 
 let
-  version = "1.18.2";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     rev = "refs/tags/v${version}";
-    hash = "sha256-nYbxgrNFhQ576rN8W+Hf/Keohy1N8tihOeTQHItKPRc=";
+    hash = "sha256-R8QEINTlO84YrnfRsZU5vNEwYcy5uZEKmmTPJ4qxYk8=";
   };
 
   # To regenerate the patched package-lock.json, copy the patched package.json
@@ -51,7 +51,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-Md17EF3a1GBfnHD2fnLGS76r0xiWYJmBBTzZWRc0j5c=";
+    npmDepsHash = "sha256-Xswt1kH9Iet6DSAlZctEV3qCpn+IWwceQgldyFzsaRk=";
     dontNpmBuild = true;
     # Uncomment this flag when using unreleased peer dependencies
     # npmFlags = [ "--legacy-peer-deps" ];
@@ -81,7 +81,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-6/OhBbIuFjXTN8N/PitaQ57aYZmpwcUOJ/vlLbhiXAU=";
+  npmDepsHash = "sha256-YhXVoh5sAnUkuc4iDMd/N15y92vMhUwT7PlLn2pzb20=";
 
   postPatch = ''
     chmod +w ../../

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
@@ -3,25 +3,25 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.10.tar.xz"
+          "factorio_linux_2.0.11.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.10.tar.xz",
+        "name": "factorio_alpha_x64-2.0.11.tar.xz",
         "needsAuth": true,
-        "sha256": "07508fc5112f95ef5d5afedea66863ea326e039bd872b772b934ed08545c399b",
+        "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.10/alpha/linux64",
-        "version": "2.0.10"
+        "url": "https://factorio.com/get-download/2.0.11/alpha/linux64",
+        "version": "2.0.11"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.10.tar.xz"
+          "factorio_linux_2.0.11.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.10.tar.xz",
+        "name": "factorio_alpha_x64-2.0.11.tar.xz",
         "needsAuth": true,
-        "sha256": "07508fc5112f95ef5d5afedea66863ea326e039bd872b772b934ed08545c399b",
+        "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.10/alpha/linux64",
-        "version": "2.0.10"
+        "url": "https://factorio.com/get-download/2.0.11/alpha/linux64",
+        "version": "2.0.11"
       }
     },
     "demo": {
@@ -51,51 +51,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.10.tar.xz"
+          "factorio-space-age_linux_2.0.11.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.10.tar.xz",
+        "name": "factorio_expansion_x64-2.0.11.tar.xz",
         "needsAuth": true,
-        "sha256": "f7d346578c812314be8b72fbf6fd291c53d23ecc2dc6556a8948d26b3b95d71e",
+        "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.10/expansion/linux64",
-        "version": "2.0.10"
+        "url": "https://factorio.com/get-download/2.0.11/expansion/linux64",
+        "version": "2.0.11"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.10.tar.xz"
+          "factorio-space-age_linux_2.0.11.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.10.tar.xz",
+        "name": "factorio_expansion_x64-2.0.11.tar.xz",
         "needsAuth": true,
-        "sha256": "f7d346578c812314be8b72fbf6fd291c53d23ecc2dc6556a8948d26b3b95d71e",
+        "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.10/expansion/linux64",
-        "version": "2.0.10"
+        "url": "https://factorio.com/get-download/2.0.11/expansion/linux64",
+        "version": "2.0.11"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.10.tar.xz",
-          "factorio_headless_x64_2.0.10.tar.xz"
+          "factorio-headless_linux_2.0.11.tar.xz",
+          "factorio_headless_x64_2.0.11.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.10.tar.xz",
+        "name": "factorio_headless_x64-2.0.11.tar.xz",
         "needsAuth": false,
-        "sha256": "2d7dd212fa6f715218a5e33bad7d593af8998fa7bf7ce727343159ee1f8c23f4",
+        "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.10/headless/linux64",
-        "version": "2.0.10"
+        "url": "https://factorio.com/get-download/2.0.11/headless/linux64",
+        "version": "2.0.11"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.10.tar.xz",
-          "factorio_headless_x64_2.0.10.tar.xz"
+          "factorio-headless_linux_2.0.11.tar.xz",
+          "factorio_headless_x64_2.0.11.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.10.tar.xz",
+        "name": "factorio_headless_x64-2.0.11.tar.xz",
         "needsAuth": false,
-        "sha256": "2d7dd212fa6f715218a5e33bad7d593af8998fa7bf7ce727343159ee1f8c23f4",
+        "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.10/headless/linux64",
-        "version": "2.0.10"
+        "url": "https://factorio.com/get-download/2.0.11/headless/linux64",
+        "version": "2.0.11"
       }
     }
   }

diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "minijinja";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
     rev = version;
-    hash = "sha256-fASPxNSkSQtg05hmSK48AAEd9MpcoFqCt5hkk2vIR2A=";
+    hash = "sha256-8ZAc5ALhpPyFCCsC0f22fSZKRmevFLLFFC0drUuXxg4=";
   };
 
-  cargoHash = "sha256-dPNWeuBAWV7ynh9t+DEaR0xb0cAa27Pp44Hm68mWTwI=";
+  cargoHash = "sha256-2aeRb5jNZbpzAgpne494BMr7rkDqZUJEpITtHbdmhxY=";
 
   # The tests relies on the presence of network connection
   doCheck = false;