Merge master into staging-next

NixOS · Jun 12, 2024 · 477d2d3 · 477d2d3
2 parents 2d3f5e7 + e913ae3
commit 477d2d3
Show file tree

Hide file tree

Showing 84 changed files with 14,083 additions and 258 deletions.
diff --git a/doc/packages/linux.section.md b/doc/packages/linux.section.md
@@ -40,48 +40,42 @@ pkgs.linux_latest.override {
 ## Manual kernel configuration {#sec-manual-kernel-configuration}
 
 Sometimes it may not be desirable to use kernels built with `pkgs.buildLinux`, especially if most of the common configuration has to be altered or disabled to achieve a kernel as expected by the target use case.
-An example of this is building a kernel for use in a VM or micro VM. You can use `pkgs.linuxManualConfig` in these cases. It requires the `src`, `version`, and `configfile` attributes to be specified.
+An example of this is building a kernel for use in a VM or micro VM. You can use `pkgs.linuxPackages_custom` in these cases. It requires the `src`, `version`, and `configfile` attributes to be specified.
 
 :::{.example #ex-using-linux-manual-config}
 
-# Using `pkgs.linuxManualConfig` with a specific source, version, and config file
+# Using `pkgs.linuxPackages_custom` with a specific source, version, and config file
 
 ```nix
-{ pkgs, ... }: {
+{ pkgs, ... }:
+pkgs.linuxPackages_custom {
  version = "6.1.55";
  src = pkgs.fetchurl {
  url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${version}.tar.xz";
  hash = "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8";
  };
  configfile = ./path_to_config_file;
- linux = pkgs.linuxManualConfig {
- inherit version src configfile;
- allowImportFromDerivation = true;
- };
 }
 ```
 
 If necessary, the version string can be slightly modified to explicitly mark it as a custom version. If you do so, ensure the `modDirVersion` attribute matches the source's version, otherwise the build will fail.
 
 ```nix
-{ pkgs, ... }: {
+{ pkgs, ... }:
+pkgs.linuxPackages_custom {
  version = "6.1.55-custom";
  modDirVersion = "6.1.55";
  src = pkgs.fetchurl {
  url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${modDirVersion}.tar.xz";
  hash = "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8";
  };
  configfile = ./path_to_config_file;
- linux = pkgs.linuxManualConfig {
- inherit version modDirVersion src configfile;
- allowImportFromDerivation = true;
- };
 }
 ```
 
 :::
 
-Additional attributes can be used with `linuxManualConfig` for further customisation. You're encouraged to read [the `pkgs.linuxManualConfig` source code](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/manual-config.nix) to understand how to use them.
+Additional attributes can be used with `linuxManualConfig` for further customisation instead of `linuxPackages_custom`. You're encouraged to read [the `pkgs.linuxManualConfig` source code](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/manual-config.nix) to understand how to use them.
 
 To edit the `.config` file for Linux X.Y from within Nix, proceed as follows:
 

diff --git a/igvm.log b/igvm.log
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -3308,6 +3308,16 @@
  github = "CaptainJawZ";
  githubId = 43111068;
  };
+ caralice = {
+ name = "Alice Carroll";
+ email = "[email protected]";
+ github = "thecaralice";
+ githubId = 43097806;
+ keys = [
+ { fingerprint = "C7EA B182 2AB1 246C 0FB8 DD72 0514 0B67 902C D3AF"; }
+ { fingerprint = "DA77 EDDB 4AF5 244C 665E 9176 A05E A86A 5834 1AA8"; }
+ ];
+ };
  CardboardTurkey = {
  name = "Kiran Ostrolenk";
  email = "[email protected]";
@@ -7074,6 +7084,12 @@
  githubId = 46672819;
  name = "Frido Friedemann";
  };
+ friedow = {
+ email = "[email protected]";
+ github = "friedow";
+ githubId = 17351844;
+ name = "Christian Friedow";
+ };
  friedrichaltheide = {
  github = "friedrichaltheide";
  githubId = 11352905;

diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
  pname = "waylyrics";
- version = "0.3.10";
+ version = "0.3.11";
 
  src = fetchFromGitHub {
  owner = "waylyrics";
  repo = "waylyrics";
  rev = "v${version}";
- hash = "sha256-JqCnVkqua/qOZjE+XKj3PyrGwqk7IToYOhLN78fKdq0=";
+ hash = "sha256-8jmB6kJUNHTT0w/1ADgjoMAP1zNpohsPl9FIGoh8UG4=";
  };
 
- cargoHash = "sha256-fVwY+lkfg/O1sPM0C7NOdb8/pln96vBcmCAWh0pEPHI=";
+ cargoHash = "sha256-hH9EQAH1uSD6uRUxKv7O3ewZsijrbCSWWY7EmC0Z7tI=";
 
  nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
  buildInputs = [ openssl dbus ];

diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , pkg-config
 , wrapQtAppsHook
@@ -59,45 +58,30 @@
 
 stdenv.mkDerivation rec {
  pname = "dolphin-emu";
- version = "5.0-21088";
+ version = "5.0-21460";
 
  src = fetchFromGitHub {
  owner = "dolphin-emu";
  repo = "dolphin";
- rev = "9240f579eab18a2f67eef23846a6b508393d0e6c";
- hash = "sha256-lOiDbEQZoi9Bsiyta/w+B1VXNNW4qST2cBZekqo5dDA=";
+ rev = "a9544510468740b77cf06ef28daaa65fe247fd32";
+ hash = "sha256-mhD7Uaqi8GzHdR7Y81TspvCnrZH2evWuWFgXMQ2c8g0=";
  fetchSubmodules = true;
  };
 
  patches = [
- # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070
+ # TODO: Remove when merged https://github.com/dolphin-emu/dolphin/pull/12736
  ./find-minizip-ng.patch
-
- # fix buidl w/ glibc-2.39
- (fetchpatch {
- url = "https://github.com/dolphin-emu/dolphin/commit/3da2e15e6b95f02f66df461e87c8b896e450fdab.patch";
- hash = "sha256-+8yGF412wQUYbyEuYWd41pgOgEbhCaezexxcI5CNehc=";
- })
  ];
 
  strictDeps = true;
 
  nativeBuildInputs = [
- stdenv.cc
  cmake
  pkg-config
  wrapQtAppsHook
  ];
 
- buildInputs = lib.optionals stdenv.isDarwin [
- CoreBluetooth
- ForceFeedback
- IOBluetooth
- IOKit
- moltenvk
- OpenGL
- VideoToolbox
- ] ++ [
+ buildInputs = [
  bzip2
  cubeb
  curl
@@ -123,7 +107,9 @@ stdenv.mkDerivation rec {
  SDL2
  sfml
  xxHash
- xz # LibLZMA
+ xz
+ # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838
+ #zlib-ng
  ] ++ lib.optionals stdenv.isLinux [
  alsa-lib
  bluez
@@ -135,6 +121,14 @@ stdenv.mkDerivation rec {
  #mgba # Derivation doesn't support Darwin
  udev
  vulkan-loader
+ ] ++ lib.optionals stdenv.isDarwin [
+ CoreBluetooth
+ ForceFeedback
+ IOBluetooth
+ IOKit
+ moltenvk
+ OpenGL
+ VideoToolbox
  ];
 
  cmakeFlags = [
@@ -160,13 +154,6 @@ stdenv.mkDerivation rec {
  "--set QT_QPA_PLATFORM xcb"
  ];
 
- # Use nix-provided libraries instead of submodules
- postPatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace CMakeLists.txt \
- --replace "if(NOT APPLE)" "if(true)" \
- --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)"
- '';
-
  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
  install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''

diff --git a/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch b/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch
@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ee44d04458..2fa6bd8a10 100644
+index fb37788513..289a25fa57 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -678,7 +678,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
-
- dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng)
+@@ -676,7 +676,7 @@ dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals
 
+ # https://github.com/zlib-ng/minizip-ng/commit/6c5f265a55f1a12a7a016cd2962feff91cff5d2e
+ add_definitions(-DMZ_COMPAT_VERSION=110) # This macro is for forwards compatibility with 4.0.4+
 -dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::minizip Externals/minizip)
 +dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip)
 

diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix
@@ -6,7 +6,7 @@
 }:
 let
  pname = "kratos";
- version = "1.1.0";
+ version = "1.2.0";
 in
 buildGoModule {
  inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
  owner = "ory";
  repo = "kratos";
  rev = "v${version}";
- hash = "sha256-zrII2lpffZkwFauPAilh1QaqRKvpj1mlHZA7in1ljYg=";
+ hash = "sha256-KqF6DYrEsmPj2PtI2+5ztE0m9uBO1gpNlvdo+Aw6REA=";
  };
 
- vendorHash = "sha256-TSB7jCPOVwub+ZQaaUSmsz/R4HAfmnWb0wTf2w4aeuk=";
+ vendorHash = "sha256-6gJf+8AKjV83MTF0rC8OxDwkwGx4CJg7SdfNgcja8QY=";
 
  subPackages = [ "." ];
 

diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix
@@ -2,7 +2,7 @@
 
 let
  pname = "notesnook";
- version = "3.0.6";
+ version = "3.0.8";
 
  inherit (stdenv.hostPlatform) system;
  throwSystem = throw "Unsupported system: ${system}";
@@ -16,9 +16,9 @@ let
  src = fetchurl {
  url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
  hash = {
- x86_64-linux = "sha256-606+8euLnZdIPUwi+wilJgvnNQNwBCj6AGZFmp9HOWs=";
- x86_64-darwin = "sha256-A0Rbm6boYI2B3Ne+FczAM3qmtM2KwNWD+C2N0sgWRtg=";
- aarch64-darwin = "sha256-Jm7rZWEsMspjKrMODGPBGJP0I5fF3aj+WXdBNsmv4jw=";
+ x86_64-linux = "sha256-H25PGhCD5uqh2BHMMjb7GyftinBsRs2O5+9xNNV+5m4=";
+ x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q=";
+ aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0=";
  }.${system} or throwSystem;
  };
 

diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
  pname = "avalanchego";
- version = "1.11.6";
+ version = "1.11.7";
 
  src = fetchFromGitHub {
  owner = "ava-labs";
  repo = pname;
  rev = "v${version}";
- hash = "sha256-XEFmcdkuCA8a6rCwh9G01gs1uAkNbv0CxHbXWTzrrKg=";
+ hash = "sha256-pdfZMKsNKmQVUfYobaOdUqGgP99fatEpgn0AHt0bIBQ=";
  };
 
- vendorHash = "sha256-odqP5FtQ5F7EMrDN9tL0M8sJR6WdzAJZZcOky8IRuOE=";
+ vendorHash = "sha256-CN+2+aOOPF7gouvp7lCfRIKA1quNCcrvzHg8lF6J4f8=";
  # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
  proxyVendor = true;
 

diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
@@ -1,20 +1,20 @@
 {
  beta = import ./browser.nix {
  channel = "beta";
- version = "126.0.2592.24";
+ version = "126.0.2592.36";
  revision = "1";
- hash = "sha256-OK38ss0M+GNP/wKLVheyKBgji3Df/qyrxaKvJayNZMM=";
+ hash = "sha256-u9gcTjener35uKt99T27+LK0A4SYNdWCW5FSHWEnaNA=";
  };
  dev = import ./browser.nix {
  channel = "dev";
- version = "126.0.2592.11";
+ version = "127.0.2620.3";
  revision = "1";
- hash = "sha256-hUeVnGN5lxZmNsYojt7Fl0n7XF76Arw8Z3C16+fHRVA=";
+ hash = "sha256-x5reGA7XZTN3FsCHf7oXstltCDSVANR8VegIuO201qs=";
  };
  stable = import ./browser.nix {
  channel = "stable";
- version = "125.0.2535.67";
+ version = "125.0.2535.85";
  revision = "1";
- hash = "sha256-82bkiyKWJqVLB4jBaGu4EdJ0ukl44yKopDecAkrzuU0=";
+ hash = "sha256-4GD/1jAw+nIwI5AOwrkuPNF5zAnnzje9oEQnaHOapPg=";
  };
 }
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -24,7 +24,7 @@ let
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
  pname = "vivaldi";
- version = "6.7.3329.35";
+ version = "6.7.3329.41";
 
  suffix = {
  aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
  src = fetchurl {
  url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
  hash = {
- aarch64-linux = "sha256-myKcYbLJgbjs0o/VWHbupO0JT38qrmayQ5EiQWCzNHc=";
- x86_64-linux = "sha256-NFvHSmMGrhvFWMR1onwkcSYUCWe11+CO1jmOlMv9p18=";
+ aarch64-linux = "sha256-jDAairYILLLiMssBvct+hZ1D2sqTsvV43IxF1UdlwpQ=";
+ x86_64-linux = "sha256-nipvNDc+iHIupUdl2kQIDJhUyVP/dFAUJiAN5jBY38M=";
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };
 

diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
  pname = "fn";
- version = "0.6.33";
+ version = "0.6.34";
 
  src = fetchFromGitHub {
  owner = "fnproject";
  repo = "cli";
  rev = version;
- hash = "sha256-f8EYiTXS9ByELWWV2EF4jrDamoKRGejKhYVyNscHZvo=";
+ hash = "sha256-rbZySF7DrBN37YIetFXZE/aPSRex5cQnV8FZ0KDQ71k=";
  };
 
  vendorHash = null;

diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
  pname = "k3sup";
- version = "0.13.5";
+ version = "0.13.6";
 
  src = fetchFromGitHub {
  owner = "alexellis";
  repo = "k3sup";
  rev = version;
- sha256 = "sha256-Psuv6QUzRMyZTAFX+oWdgztA+F1sm0J5MAITc3uNM1A=";
+ sha256 = "sha256-ngC1yT0pV/ygGzNTYz71qf8V19hqvz3XP7CP8saGwCI=";
  };
 
  nativeBuildInputs = [ makeWrapper installShellFiles ];

diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix
@@ -21,5 +21,6 @@ buildGoModule rec {
  homepage = "https://github.com/sunny0826/kubecm/";
  license = licenses.asl20;
  maintainers = with maintainers; [ qjoly ];
+ mainProgram = "kubecm";
  };
 }
diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
  pname = "kubedb-cli";
- version = "0.45.0";
+ version = "0.46.0";
 
  src = fetchFromGitHub {
  owner = "kubedb";
  repo = "cli";
  rev = "v${version}";
- sha256 = "sha256-4kmXz8dTxCaGbuAo3zK27BhUrecInwJCu9XOuiQY48A=";
+ sha256 = "sha256-U5BRkH0jqTEBYtiT93YP/UpQYekPjAHEGl59HPk7TfQ=";
  };
 
  vendorHash = null;