Merge master into staging-next

NixOS · Jun 8, 2024 · 1d15f93 · 1d15f93
2 parents 44ae720 + 3d59539
commit 1d15f93
Show file tree

Hide file tree

Showing 47 changed files with 455 additions and 187 deletions.
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
@@ -285,7 +285,7 @@ in
  KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
  '';
  hardware.opengl = {
- extraPackages = [ nvidia_x11.out ] ++ (lib.optional (builtins.hasAttr "libXNVCtrl" nvidia_x11.settings) nvidia_x11.settings.libXNVCtrl);
+ extraPackages = [ nvidia_x11.out ];
  extraPackages32 = [ nvidia_x11.lib32 ];
  };
  environment.systemPackages = [ nvidia_x11.bin ];

diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix
@@ -77,6 +77,8 @@ in
  environment = {
  STATIC_DIR = ".";
  DATA_DIR = ".";
+ HF_HOME = ".";
+ SENTENCE_TRANSFORMERS_HOME = ".";
  } // cfg.environment;
 
  serviceConfig = {

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
@@ -7,17 +7,17 @@
 }:
 
 let
- rev = "13c9fa22155066acfb5a2e444fe76245738e7fb7";
+ rev = "53c40d2395e04761a510aa7007336939538678c0";
 in
 melpaBuild {
  pname = "edraw";
- version = "20240529.1009";
+ version = "20240606.457";
 
  src = fetchFromGitHub {
  owner = "misohena";
  repo = "el-easydraw";
  inherit rev;
- hash = "sha256-h2auwVIWjrOBPHPCuLdJv5y3FpoV4V+MEOPf4xprfYg=";
+ hash = "sha256-gJboLPEMTFC3rP0PiJ679Nj8SmfI+qXYkX7kBLU6ywQ=";
  };
 
  commit = rev;

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,11 +15,11 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
  sha256 = {
- x86_64-linux = "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl";
- x86_64-darwin = "0gkplg2c5g7964m58fmv7b70d69g4yqrax5zn1rm4rl2agxgwyff";
- aarch64-linux = "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh";
- aarch64-darwin = "1iv49m646vsbcgaxydxhpjbxspz7918brdk51gmbqf258shf8rii";
- armv7l-linux = "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay";
+ x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb";
+ x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2";
+ aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb";
+ aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq";
+ armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a";
  }.${system} or throwSystem;
 
  sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@@ -29,7 +29,7 @@ in
 
  # Please backport all compatible updates to the stable release.
  # This is important for the extension ecosystem.
- version = "1.88.1.24104";
+ version = "1.90.0.24158";
  pname = "vscodium";
 
  executableName = "codium";

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
  if stdenv.isAarch64 then
  {
  pname = "brave";
- version = "1.66.115";
- url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_arm64.deb";
- hash = "sha256-zOrulR0a/iRYtjdFiyN0V6q0KktD7G0ZrEYSXfIwaL8=";
+ version = "1.66.118";
+ url = "https://github.com/brave/brave-browser/releases/download/v1.66.118/brave-browser_1.66.118_arm64.deb";
+ hash = "sha256-H2f6i86lDToHEkJ9JZCBp3tlpnI+zoFHY3YzLdp5lE4=";
  platform = "aarch64-linux";
  }
  else if stdenv.isx86_64 then
  {
  pname = "brave";
- version = "1.66.115";
- url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_amd64.deb";
- hash = "sha256-TMQips7dyxKfYEin7QJCV0ru4NHi4j3DjLh2fmzuYeQ=";
+ version = "1.66.118";
+ url = "https://github.com/brave/brave-browser/releases/download/v1.66.118/brave-browser_1.66.118_amd64.deb";
+ hash = "sha256-r7lpEOxECOqJ23XxTHqSy6KhyNPRwOkuJvnZUuuBN4k=";
  platform = "x86_64-linux";
  }
  else

diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
  pname = "arkade";
- version = "0.11.12";
+ version = "0.11.13";
 
  src = fetchFromGitHub {
  owner = "alexellis";
  repo = "arkade";
  rev = version;
- hash = "sha256-tioWLZ1Bd+gC2FvbhrxFPIkOJb9ycx9sGVmh+a/4hwo=";
+ hash = "sha256-mXT0/cDfvzE9fBCy4rY1epeOolXmc50QNNXSn3bHi1I=";
  };
 
  CGO_ENABLED = 0;

diff --git a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix
diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -338,6 +338,7 @@ buildGoModule rec {
  util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
  conntrack-tools
  runc
+ bash
  ];
 
  k3sKillallDeps = [

diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -12,17 +12,6 @@ let
  extraArgs = builtins.removeAttrs args [ "callPackage" ];
 in
 {
- # 1_27 can be built with the same builder as 1_30
- k3s_1_27 = common (
- (import ./1_27/versions.nix)
- // {
- updateScript = [
- ./update-script.sh
- "27"
- ];
- }
- ) extraArgs;
-
  # 1_28 can be built with the same builder as 1_30
  k3s_1_28 = common (
  (import ./1_28/versions.nix)

diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix
@@ -1,9 +1,9 @@
 {
- "version" = "1.11.67";
+ "version" = "1.11.68";
  "hashes" = {
- "desktopSrcHash" = "sha256-oM4/PKydmIBp2zVbzJRbVYnklYO2IHH7ZBV4MfLxnQo=";
- "desktopYarnHash" = "04dbsacigq5jrh7gpyxj31grwzsg58cy6d4y7k3hmcwd4gj68iid";
- "webSrcHash" = "sha256-faJiuAmEIEkNrwjgU06XT9J2NxJrJNIsPb1K5WXR0Lc=";
- "webYarnHash" = "14sy3by840gbxqyvhwaj5k07hvhcsj300s39qjfsg1sx9fnfzck3";
+ "desktopSrcHash" = "sha256-L3rto0V0RIf5ILWYGFnuGpwciwc55rR2+Zqj/azuWlo=";
+ "desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1";
+ "webSrcHash" = "sha256-IRgEV4H0fYo0ijLWF8ICdewqencgTJlqstzsGzlJI0k=";
+ "webYarnHash" = "092m0bhc3pp9dpaz6kri3hi723kqq1pbja4vf2xbxyx4x4yf0vlz";
  };
 }
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
  hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE=";
  };
 
+ patches = [
+ ./fix-clang-build.diff
+ ];
+
  nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
  buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme];
 

diff --git a/pkgs/applications/office/homebank/fix-clang-build.diff b/pkgs/applications/office/homebank/fix-clang-build.diff
@@ -0,0 +1,23 @@
+C Standard says in 6.8.1:
+
+ labeled-statement:
+ identifier : statement
+ case constant-expression : statement
+ default : statement
+
+Notably, only expressions and no declarations are allowed. A common workaround for this
+is adding an empty statement.
+
+diff --git a/src/rep-budget.c b/src/rep-budget.c
+index eb5cce6..61e2e77 100644
+--- a/src/rep-budget.c
++++ b/src/rep-budget.c
+@@ -255,7 +255,7 @@ gint tmpmode;
+ }
+ else
+ {
+-libname:
++libname: ;
+ gchar *name;
+
+ gtk_tree_model_get(model, iter, 
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
@@ -5,18 +5,18 @@
 
 rustPlatform.buildRustPackage rec {
  pname = "crosvm";
- version = "124.0";
+ version = "125.0";
 
  src = fetchgit {
  url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
- rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af";
- hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ=";
+ rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5";
+ hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM=";
  fetchSubmodules = true;
  };
 
  separateDebugInfo = true;
 
- cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0=";
+ cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE=";
 
  nativeBuildInputs = [
  pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
@@ -65,13 +65,13 @@ let
 in
 buildGoModule rec {
  pname = "podman";
- version = "5.1.0";
+ version = "5.1.1";
 
  src = fetchFromGitHub {
  owner = "containers";
  repo = "podman";
  rev = "v${version}";
- hash = "sha256-jmg/Yq80MasbW93BTo6p5EcEfNQVadeDmkYtiX7Ov1E=";
+ hash = "sha256-3u4QOX7K0bMcbvwkXVoCpq7p5rKkvmOlOIRSUEbjFOY=";
  };
 
  patches = [

diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
  pname = "ad-miner";
- version = "1.3.0";
+ version = "1.4.0";
  pyproject = true;
 
  src = fetchFromGitHub {
  owner = "Mazars-Tech";
  repo = "AD_Miner";
  rev = "refs/tags/v${version}";
- hash = "sha256-MoU38UEhk9eUa+slXnYG1eOyDW79J0q5XiM+1UYIGaM=";
+ hash = "sha256-SBFPGlP5hDKNuE5sYGL6PE1nYMmOCmMZji0AtNEBkAQ=";
  };
 
  # All requirements are pinned

diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix
@@ -1,21 +1,25 @@
 { lib
 , fetchFromGitHub
-, buildGoPackage
+, buildGoModule
 }:
 
-buildGoPackage rec {
+buildGoModule rec {
  pname = "assetfinder";
  version = "0.1.1";
 
- goPackagePath = "github.com/tomnomnom/assetfinder";
-
  src = fetchFromGitHub {
  owner = "tomnomnom";
  repo = "assetfinder";
  rev = "v${version}";
  hash = "sha256-7+YF1VXBcFehKw9JzurmXNu8yeZPdqfQEuaqwtR4AuA=";
  };
 
+ postPatch = ''
+ go mod init github.com/tomnomnom/assetfinder
+ '';
+
+ vendorHash = null;
+
  meta = with lib; {
  homepage = "https://github.com/tomnomnom/assetfinder";
  description = "Find domains and subdomains related to a given domain";

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
  pname = "nuclei-templates";
- version = "9.8.7";
+ version = "9.8.8";
 
  src = fetchFromGitHub {
  owner = "projectdiscovery";
  repo = "nuclei-templates";
  rev = "refs/tags/v${version}";
- hash = "sha256-Masj0v9WGcLJKd/43T4klwyIM2uqhvuLSW5PBuKzsQg=";
+ hash = "sha256-6oY22IQKCV00MtxUw4YwY2U/xH+N06n371DSK7C0nj8=";
  };
 
  installPhase = ''

diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
  pname = "owncloud-client";
- version = "5.2.1";
+ version = "5.3.0";
 
  src = fetchFromGitHub {
  owner = "owncloud";
  repo = "client";
  rev = "refs/tags/v${version}";
- hash = "sha256-yErMHh0QbWVpJhNiXU1IIGpQ5CGARN/4cqELRMoxSac=";
+ hash = "sha256-2BM5XoblPwI2xr0e9VHiN4ePkyUx+NyMDY7HkWa9uZM=";
  };
 
  nativeBuildInputs = [

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
@@ -6,16 +6,16 @@
 
 php.buildComposerProject (finalAttrs: {
  pname = "phpunit";
- version = "11.1.3";
+ version = "11.2.0";
 
  src = fetchFromGitHub {
  owner = "sebastianbergmann";
  repo = "phpunit";
  rev = finalAttrs.version;
- hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA=";
+ hash = "sha256-5MWhHMKCy9rrVO1bqyGykWFGw9zI1t6QGVkenvFpGbY=";
  };
 
- vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q=";
+ vendorHash = "sha256-w2Yu0T8omr8F7r5nBZOmRJE0LEdGQ3XAdxNZoK1sx1M=";
 
  passthru.updateScript = nix-update-script { };
 

diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
@@ -1,13 +1,13 @@
 { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
 
 let
- version = "1.1.365";
+ version = "1.1.366";
 
  src = fetchFromGitHub {
  owner = "Microsoft";
  repo = "pyright";
  rev = "${version}";
- hash = "sha256-plXNjT36xLmGftkLREsjKGHQWBGA12hIUOBCtTf8710=";
+ hash = "sha256-xs93PnDTtDsdi9YeZk0nyinCs4+eJJNFg7NagHF15rI=";
  };
 
  patchedPackageJSON = runCommand "package.json" { } ''
@@ -37,7 +37,7 @@ let
  pname = "pyright-internal";
  inherit version src;
  sourceRoot = "${src.name}/packages/pyright-internal";
- npmDepsHash = "sha256-oBpW4nEyiDGZhv+Yt0+yKg2xrLULpFjIOFRxIBLZ3bk=";
+ npmDepsHash = "sha256-jGLzsrf5RuqfyI3BJpmVsqijxtNlFexsub0186cUR+8=";
  dontNpmBuild = true;
  installPhase = ''
  runHook preInstall
@@ -51,7 +51,7 @@ buildNpmPackage rec {
  inherit version src;
 
  sourceRoot = "${src.name}/packages/pyright";
- npmDepsHash = "sha256-/P2rx7BgaHZPHBC3DO89JjYtPD5ri2goGmgCkGWfby4=";
+ npmDepsHash = "sha256-8d3gRx93wfusvI3mov2B0jJuG+WpVaL8b+jdFzmqA3w=";
 
  postPatch = ''
  chmod +w ../../

diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
  name = "regal";
- version = "0.22.0";
+ version = "0.23.0";
 
  src = fetchFromGitHub {
  owner = "StyraInc";
  repo = "regal";
  rev = "v${version}";
- hash = "sha256-3Q37ukeqf3n8UhriQNCWyRCgWOcxwO4TsNcsEnJn5eg=";
+ hash = "sha256-isivyYBxYinHQKfuLNyfXB1MNqdqNwu5iqsUd+WRwq8=";
  };
 
- vendorHash = "sha256-ejTBfoDYMt5Jpuq+uNgpdHCafR7IUVr8OFB84+m/ZFg=";
+ vendorHash = "sha256-I0aJFvJmmnxlqgeETOyg2/mjGX8lUJz99t56Qe+9uZg=";
 
  meta = with lib; {
  description = "a linter and language server for Rego";