Merge master into staging-next

maintainers/maintainer-list.nix

@@ -22786,6 +22786,11 @@
     name = "Yusuf Bera Ertan";
     keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ];
   };
+  yusuf-duran = {
+    github = "yusuf-duran";
+    githubId = 37774475;
+    name = "Yusuf Duran";
+  };
   yuu = {
     email = "yuunix@grrlz.net";
     matrix = "@yuu:matrix.org";

nixos/modules/module-list.nix

@@ -214,6 +214,7 @@
   ./programs/iay.nix
   ./programs/iftop.nix
   ./programs/i3lock.nix
+  ./programs/iio-hyprland.nix
   ./programs/immersed-vr.nix
   ./programs/iotop.nix
   ./programs/java.nix

nixos/modules/programs/iio-hyprland.nix

@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.iio-hyprland;
+in
+{
+  options = {
+    programs.iio-hyprland = {
+      enable = lib.mkEnableOption "iio-hyprland and iio-sensor-proxy";
+      package = lib.mkPackageOption pkgs "iio-hyprland" { };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.sensor.iio.enable = lib.mkDefault true;
+
+    environment.systemPackages = [ cfg.package ];
+  };
+  meta.maintainers = with lib.maintainers; [ yusuf-duran ];
+}

nixos/modules/programs/wayland/cardboard.nix

@@ -19,6 +19,6 @@ in
       # To make a cardboard session available for certain DMs like SDDM
       services.displayManager.sessionPackages = [ cfg.package ];
     }
-    (import ./wayland-session.nix { inherit lib pkgs; })
+    (import ./wayland-session.nix { inherit lib; })
   ]);
 }

nixos/modules/programs/wayland/hyprland.nix

@@ -70,7 +70,7 @@ in
     }
 
     (import ./wayland-session.nix {
-      inherit lib pkgs;
+      inherit lib;
       enableXWayland = cfg.xwayland.enable;
       enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
     })

nixos/modules/programs/wayland/labwc.nix

@@ -20,6 +20,6 @@ in
       # To make a labwc session available for certain DMs like SDDM
       services.displayManager.sessionPackages = [ cfg.package ];
     }
-    (import ./wayland-session.nix { inherit lib pkgs; })
+    (import ./wayland-session.nix { inherit lib; })
   ]);
 }

nixos/modules/programs/wayland/miracle-wm.nix

@@ -30,7 +30,7 @@ in
       }
 
       (import ./wayland-session.nix {
-        inherit lib pkgs;
+        inherit lib;
         # Hardcoded path in Mir, not really possible to disable
         enableXWayland = true;
         # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164

nixos/modules/programs/wayland/river.nix

@@ -56,7 +56,7 @@ in
     }
 
     (import ./wayland-session.nix {
-      inherit lib pkgs;
+      inherit lib;
       enableXWayland = cfg.xwayland.enable;
     })
   ]);

nixos/modules/programs/wayland/sway.nix

@@ -129,8 +129,6 @@ in
         };
       };
 
-      programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3;
-
       # To make a Sway session available if a display manager like SDDM is enabled:
       services.displayManager.sessionPackages = lib.optional (cfg.package != null) cfg.package;
 
@@ -139,7 +137,7 @@ in
     }
 
     (import ./wayland-session.nix {
-      inherit lib pkgs;
+      inherit lib;
       enableXWayland = cfg.xwayland.enable;
     })
   ]);

nixos/modules/programs/wayland/wayfire.nix

@@ -52,8 +52,6 @@ in
 
           services.displayManager.sessionPackages = [ finalPackage ];
 
-          xdg.icons.enable = true;
-
           xdg.portal = {
             enable = lib.mkDefault true;
             wlr.enable = lib.mkDefault true;
@@ -65,7 +63,7 @@ in
           };
         }
         (import ./wayland-session.nix {
-          inherit lib pkgs;
+          inherit lib;
           enableXWayland = cfg.xwayland.enable;
         })
       ]

nixos/modules/programs/wayland/wayland-session.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   enableXWayland ? true,
   enableWlrPortal ? true,
 }:
@@ -11,15 +10,12 @@
     pam.services.swaylock = {};
   };
 
-  hardware.graphics.enable = lib.mkDefault true;
-  fonts.enableDefaultPackages = lib.mkDefault true;
-
   programs = {
     dconf.enable = lib.mkDefault true;
     xwayland.enable = lib.mkDefault enableXWayland;
   };
 
-  xdg.icons.enable = true;
+  services.graphical-desktop.enable = true;
 
   xdg.portal.wlr.enable = enableWlrPortal;
 

nixos/modules/services/display-managers/default.nix

@@ -125,6 +125,8 @@ in
           Graphical session to pre-select in the session chooser (only effective for GDM, LightDM and SDDM).
 
           On GDM, LightDM and SDDM, it will also be used as a session for auto-login.
+
+          Set this option to empty string to get an error with a list of currently available sessions.
         '';
       };
 

nixos/modules/services/misc/graphical-desktop.nix

@@ -5,11 +5,22 @@
   ...
 }:
 let
+  cfg = config.services.graphical-desktop;
   xcfg = config.services.xserver;
   dmcfg = config.services.displayManager;
 in
 {
-  config = lib.mkIf (xcfg.enable || dmcfg.enable) {
+  options = {
+    services.graphical-desktop.enable =
+      lib.mkEnableOption "bits and pieces required for a graphical desktop session"
+      // {
+        default = xcfg.enable || dmcfg.enable;
+        defaultText = lib.literalExpression "(config.services.xserver.enable || config.services.displayManager.enable)";
+        internal = true;
+      };
+  };
+
+  config = lib.mkIf cfg.enable {
     # The default max inotify watches is 8192.
     # Nowadays most apps require a good number of inotify watches,
     # the value below is used by default on several other distros.

pkgs/applications/editors/android-studio/default.nix

@@ -17,8 +17,8 @@ let
     sha256Hash = "sha256-Qn5NNW2Rt6f9QiEUamIumme45uUVeTiMJ/9niAC6ilM=";
   };
   latestVersion = {
-    version = "2024.2.1.1"; # "Android Studio Ladybug | 2024.2.1 Canary 5"
-    sha256Hash = "sha256-yfb23cYwRghUA04Ckf4I2yfqmdED9sf//0FSeWL+ze4=";
+    version = "2024.2.1.3"; # "Android Studio Ladybug | 2024.2.1 Canary 7"
+    sha256Hash = "sha256-HECowgJ7b6PjYHb+lRuFLzl9wWwWfFWNI0cSijwG7LA=";
   };
 in {
   # Attributes are named by their corresponding release channels

pkgs/applications/editors/vim/plugins/generated.nix

@@ -3923,6 +3923,18 @@ final: prev:
     meta.homepage = "https://github.com/megaannum/forms/";
   };
 
+  fortune-nvim = buildVimPlugin {
+    pname = "fortune.nvim";
+    version = "2024-07-18";
+    src = fetchFromGitHub {
+      owner = "rubiin";
+      repo = "fortune.nvim";
+      rev = "29a99fbf887a2d48693f1eaa1893f84cde60af54";
+      sha256 = "0kyi2pl5d1h7ycxsdvqdyg5zmjfxj7jpx7lk3bf2d14wvnvcwpb4";
+    };
+    meta.homepage = "https://github.com/rubiin/fortune.nvim/";
+  };
+
   friendly-snippets = buildVimPlugin {
     pname = "friendly-snippets";
     version = "2024-07-15";
@@ -4905,6 +4917,18 @@ final: prev:
     meta.homepage = "https://github.com/3rd/image.nvim/";
   };
 
+  img-clip-nvim = buildVimPlugin {
+    pname = "img-clip.nvim";
+    version = "2024-06-05";
+    src = fetchFromGitHub {
+      owner = "HakonHarnes";
+      repo = "img-clip.nvim";
+      rev = "1924e20ab19afec9779109d083b6e5f8bee8fb17";
+      sha256 = "0q4bv6bca8bhkc98gc4lmlp3b2nrh6bj7yyb99bk3lnccr0jmj6g";
+    };
+    meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/";
+  };
+
   impatient-nvim = buildVimPlugin {
     pname = "impatient.nvim";
     version = "2023-05-05";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -326,6 +326,7 @@ https://github.com/akinsho/flutter-tools.nvim/,HEAD,
 https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
 https://github.com/mhartington/formatter.nvim/,,
 https://github.com/megaannum/forms/,,
+https://github.com/rubiin/fortune.nvim/,HEAD,
 https://github.com/rafamadriz/friendly-snippets/,,
 https://github.com/raghur/fruzzy/,,
 https://github.com/shumphrey/fugitive-gitlab.vim/,,
@@ -411,6 +412,7 @@ https://github.com/ShinKage/idris2-nvim/,,
 https://github.com/edwinb/idris2-vim/,,
 https://github.com/3rd/image.nvim/,HEAD,
 https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
+https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
 https://github.com/lewis6991/impatient.nvim/,,
 https://github.com/backdround/improved-search.nvim/,HEAD,
 https://github.com/smjonas/inc-rename.nvim/,HEAD,

pkgs/applications/misc/ssh-tools/default.nix

@@ -1,24 +1,36 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitea, installShellFiles, perl }:
 
-stdenv.mkDerivation rec {
+buildGoModule rec {
   pname = "ssh-tools";
-  version = "1.7";
+  version = "1.8-unstable-2024-03-18";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitea {
+    domain = "codeberg.org";
     owner = "vaporup";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-PDoljR/e/qraPhG9RRjHx1gBIMtTJ815TZDJws8Qg6o=";
+    repo = "ssh-tools";
+    rev = "69c73844b2498c46f1293b129808bfdce8822c28";
+    hash = "sha256-cG75Jn331G0HZZyrE+JWC05f6DgYBz6sx8MTCxsG/vw=";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ssh-* $out/bin/
+  vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug=";
+
+  subPackages = [
+    "cmd/go/ssh-authorized-keys"
+    "cmd/go/ssh-sig"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = [ perl ];
+
+  postInstall = ''
+    install cmd/{bash,perl}/ssh-*/ssh-* -t $out/bin
+    installManPage man/*.1
   '';
 
   meta = with lib; {
-    description = "Collection of various tools using ssh";
-    homepage = "https://github.com/vaporup/ssh-tools/";
+    description = "Making SSH more convenient";
+    homepage = "https://codeberg.org/vaporup/ssh-tools";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ SuperSandro2000 ];
   };

pkgs/applications/terminal-emulators/rio/default.nix

@@ -55,16 +55,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rio";
-  version = "0.1.1";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Hll9QpCN0/NDJ3tgJFnmNjfIotppGg5/BrHMxGmxOTo=";
+    hash = "sha256-3isj4FvzJpheUi12oQRNBvOxR8daL/J4RUOGgYLeBXQ=";
   };
 
-  cargoHash = "sha256-yyxJi0kK2d2I+9GncYHcRKbdngYSltDjsTuChqaDG/U=";
+  cargoHash = "sha256-T+lXgNsMmq6cvsNe96R3F13SbboRAdd11UHumksqx4A=";
 
   nativeBuildInputs = [
     ncurses

pkgs/by-name/an/ananicy-rules-cachyos/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2024-07-23";
+  version = "0-unstable-2024-07-27";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "2453e457d44422164c616b548114ffc5c13bc11b";
-    hash = "sha256-aILzlb/sZy3UuYlnaqYEj93hzuzCx1ZwDjU5iC5Mjpc=";
+    rev = "c6153c9e909475bbb08b4e56af152179ff7f171f";
+    hash = "sha256-sAWHm3PK9mM+AtHdDhq3RIQBo58eEZtD1l7QfCTpl0s=";
   };
 
   dontConfigure = true;

pkgs/by-name/dy/dyalog/package.nix

@@ -51,14 +51,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dyalog";
-  version = "19.0.48958";
+  version = "19.0.49960";
   shortVersion = lib.versions.majorMinor finalAttrs.version;
 
   src =
     assert !acceptLicense -> throw licenseDisclaimer;
     fetchurl {
       url = "https://download.dyalog.com/download.php?file=${finalAttrs.shortVersion}/linux_64_${finalAttrs.version}_unicode.x86_64.deb";
-      hash = "sha256-+L9XI7Knt91sG/0E3GFSeqjD9Zs+1n72MDfvsXnr77M=";
+      hash = "sha256-WeIrwF6msiQGS6ltYWn6TN+v+aXK1cbJ1e11B6f0+2A=";
     };
 
   outputs = [ "out" ] ++ lib.optional enableDocs "doc";
@@ -143,8 +143,11 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # Register some undeclared runtime dependencies to be patched in by autoPatchelfHook
+  # Note: dyalog.rt is used internally to run child APL processes in
   preFixup = ''
-    patchelf ${dyalogHome}/dyalog --add-needed libncurses.so
+    for exec in "dyalog" "dyalog.rt"; do
+        patchelf ${dyalogHome}/$exec --add-needed libncurses.so
+    done
   ''
   + lib.optionalString htmlRendererSupport ''
     patchelf ${dyalogHome}/libcef.so --add-needed libudev.so --add-needed libGL.so

pkgs/by-name/ii/iio-hyprland/package.nix

@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  meson,
+  cmake,
+  pkg-config,
+  dbus,
+  ninja,
+}:
+
+stdenv.mkDerivation {
+  pname = "iio-hyprland";
+  version = "0-unstable-2024-07-24";
+
+  src = fetchFromGitHub {
+    owner = "JeanSchoeller";
+    repo = "iio-hyprland";
+    rev = "bbf59e10cbf293e64b765864a324e971fcc06125";
+    hash = "sha256-9tB29tP3ZQ2tU2c+FrWrGqSm70ZrJP8H9WZKzHx55zI=";
+  };
+
+  buildInputs = [ dbus ];
+  nativeBuildInputs = [
+    meson
+    cmake
+    pkg-config
+    ninja
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Listens to iio-sensor-proxy and automatically changes Hyprland output orientation";
+    homepage = "https://github.com/JeanSchoeller/iio-hyprland/tree/master";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ yusuf-duran ];
+    platforms = lib.platforms.linux;
+    mainProgram = "iio-hyprland";
+  };
+}

pkgs/by-name/ll/llama-cpp/package.nix

@@ -156,7 +156,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "Port of Facebook's LLaMA model in C/C++";
+    description = "Inference of Meta's LLaMA model (and others) in pure C/C++";
     homepage = "https://github.com/ggerganov/llama.cpp/";
     license = licenses.mit;
     mainProgram = "llama";

pkgs/by-name/my/mybbscan/package.nix

@@ -0,0 +1,46 @@
+{
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  python3,
+  python3Packages,
+}:
+
+python3Packages.buildPythonPackage rec {
+  pname = "my-b-bscan";
+  version = "3.2.0";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "0xB9";
+    repo = "MyBBscan";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cX1483JK+bejQWua9d7V3GDw6cPPvlnLX5w2XQjqMOQ=";
+  };
+
+  build-system = [ makeWrapper ];
+
+  dependencies = with python3Packages; [
+    huepy
+    requests
+  ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/mybbscan}
+    cp -R * $out/share/mybbscan
+    makeWrapper ${python3.interpreter} $out/bin/mybbscan \
+      --set PYTHONPATH "$PYTHONPATH:$out/share/mybbscan/scan.py" \
+      --add-flags "$out/share/mybbscan/scan.py"
+  '';
+
+  meta = {
+    description = "Scans plugins directory for possible vulnerable plugins";
+    homepage = "https://github.com/0xB9/MyBBscan";
+    # https://github.com/0xB9/MyBBscan/issues/12
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ tochiaha ];
+    mainProgram = "mybbscan";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/ne/neovim-gtk/collect-box.patch

@@ -0,0 +1,12 @@
+diff -ru a/src/ui.rs b/src/ui.rs
+--- a/src/ui.rs
++++ b/src/ui.rs
+@@ -385,7 +386,7 @@
+                     files_list
+                         .iter()
+                         .map(|f| misc::escape_filename(f))
+-                        .collect::<Box<_>>()
++                        .collect::<Box<[_]>>()
+                         .join(" ")
+                 ));
+             } else {

pkgs/by-name/ne/neovim-gtk/package.nix

@@ -26,6 +26,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ];
 
+  patches = [ ./collect-box.patch ];
+
   postInstall = ''
     make PREFIX=$out install-resources
   '';

pkgs/by-name/ni/nightfox-gtk-theme/package.nix

@@ -2,11 +2,15 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  gnome,
   sassc,
   gnome-themes-extra,
   gtk-engine-murrine,
-  colorVariants ? [] # default: install all icons
+  unstableGitUpdater,
+  colorVariants ? [ ],
+  sizeVariants ? [ ],
+  themeVariants ? [ ],
+  tweakVariants ? [ ],
+  iconVariants ? [ ],
 }:
 
 let
@@ -15,45 +19,102 @@ let
     "dark"
     "light"
   ];
-
+  sizeVariantList = [
+    "compact"
+    "standard"
+  ];
+  themeVariantList = [
+    "default"
+    "green"
+    "grey"
+    "orange"
+    "pink"
+    "purple"
+    "red"
+    "teal"
+    "yellow"
+    "all"
+  ];
+  tweakVariantList = [
+    "nord"
+    "carbon"
+    "black"
+    "float"
+    "outline"
+    "macos"
+  ];
+  iconVariantList = [
+    "Duskfox"
+    "Duskfox-Alt"
+    "Duskfox-Alt-2"
+    "Duskfox-Alt-3"
+  ];
 in
-lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
+lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib.checkListOfEnum
+  "${pname}: sizeVariants"
+  sizeVariantList
+  sizeVariants
+  lib.checkListOfEnum
+  "${pname}: themeVariants"
+  themeVariantList
+  themeVariants
+  lib.checkListOfEnum
+  "${pname}: tweakVariants"
+  tweakVariantList
+  tweakVariants
+  lib.checkListOfEnum
+  "${pname}: iconVariants"
+  iconVariantList
+  iconVariants
 
-stdenvNoCC.mkDerivation {
-  inherit pname;
-  version = "0-unstable-2024-06-27";
+  stdenvNoCC.mkDerivation
+  {
+    inherit pname;
+    version = "0-unstable-2024-07-22";
 
-  src = fetchFromGitHub {
-    owner = "Fausto-Korpsvart";
-    repo = "Nightfox-GTK-Theme";
-    rev = "ef4e6e1fa3efe2a5d838d61191776abfe4d87766";
-    hash = "sha256-RsDEHauz9jQs1rqsoKbL/s0Vst3GzJXyGsE3uFtLjCY=";
-  };
+    src = fetchFromGitHub {
+      owner = "Fausto-Korpsvart";
+      repo = "Nightfox-GTK-Theme";
+      rev = "1ef2f7092526658a24312bde230a5746b49b7d95";
+      hash = "sha256-Rnm0C8mmO54u5ntovIKnu2AdpdnjsQFABvlRPG5+cdo=";
+    };
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+    propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  nativeBuildInputs = [ gnome.gnome-shell sassc ];
-  buildInputs = [ gnome-themes-extra ];
+    nativeBuildInputs = [ sassc ];
+    buildInputs = [ gnome-themes-extra ];
 
-  dontBuild = true;
+    dontBuild = true;
 
-  postPatch = ''
-    patchShebangs themes/install.sh
-  '';
+    passthru.updateScript = unstableGitUpdater { };
 
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/themes
-    cd themes
-    ./install.sh -n Nightfox -c ${lib.concatStringsSep " " (if colorVariants != [] then colorVariants else colorVariantList)} --tweaks macos -d "$out/share/themes"
-    runHook postInstall
-  '';
+    postPatch = ''
+      patchShebangs themes/install.sh
+    '';
 
-  meta = with lib; {
-    description = "GTK theme based on the Nightfox colour palette";
-    homepage = "https://github.com/Fausto-Korpsvart/Nightfox-GTK-Theme";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ d3vil0p3r ];
-    platforms = platforms.unix;
-  };
-}
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share/themes
+      cd themes
+      ./install.sh -n Nightfox \
+      ${lib.optionalString (colorVariants != [ ]) "-c " + toString colorVariants} \
+      ${lib.optionalString (sizeVariants != [ ]) "-s " + toString sizeVariants} \
+      ${lib.optionalString (themeVariants != [ ]) "-t " + toString themeVariants} \
+      ${lib.optionalString (tweakVariants != [ ]) "--tweaks " + toString tweakVariants} \
+      -d "$out/share/themes"
+      cd ../icons
+      ${lib.optionalString (iconVariants != [ ]) ''
+        mkdir -p $out/share/icons
+        cp -a ${toString (map (v: "${v}") iconVariants)} $out/share/icons/
+      ''}
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "GTK theme based on the Nightfox colour palette";
+      homepage = "https://github.com/Fausto-Korpsvart/Nightfox-GTK-Theme";
+      license = lib.licenses.gpl3Plus;
+      platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ d3vil0p3r ];
+    };
+  }

pkgs/by-name/te/textlint/package.nix

@@ -26,13 +26,13 @@
 
 buildNpmPackage rec {
   pname = "textlint";
-  version = "14.0.5";
+  version = "14.1.0";
 
   src = fetchFromGitHub {
     owner = "textlint";
     repo = "textlint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-W2ySdd1ADqEpEBFgwRvzAzAivL//pj2PSlg7Kfcbspg=";
+    hash = "sha256-/pXUqpQ3cRjcwZAfBVpf9K9JsPmxB9iX8p64iE/n/68=";
   };
 
   patches = [
@@ -42,7 +42,7 @@ buildNpmPackage rec {
     ./remove-workspaces.patch
   ];
 
-  npmDepsHash = "sha256-IMXcdR9WqSvBwk3/0qihVr3OraJAwrsCMUVnTbx9z+Q=";
+  npmDepsHash = "sha256-FnDKPLhf9OxwRrrBJgejp4X13FGEI317yTgI3tA5cX8=";
 
   nativeBuildInputs = [
     autoconf

pkgs/by-name/uv/uv/package.nix

@@ -1,35 +1,36 @@
-{ lib
-, cmake
-, darwin
-, fetchFromGitHub
-, installShellFiles
-, libiconv
-, pkg-config
-, python3Packages
-, rustPlatform
-, stdenv
-, testers
-, uv
-, nix-update-script
+{
+  lib,
+  cmake,
+  darwin,
+  fetchFromGitHub,
+  installShellFiles,
+  libiconv,
+  pkg-config,
+  python3Packages,
+  rustPlatform,
+  stdenv,
+  testers,
+  uv,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "uv";
-  version = "0.2.27";
+  version = "0.2.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     rev = "refs/tags/${version}";
-    hash = "sha256-KYBHg0E06zeUpyIdPcMQijUorwX4QiiPwacR+UcDFJs=";
+    hash = "sha256-3FSA+JsAbLzS3ONoLciDzpyCsO6Em8lNVYR43WiK1xs=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
-      "pubgrub-0.2.1" = "sha256-4/Z/NA0MsHFaChu+sNzIQJgV0M62ZXOGQubzITIC4fI=";
+      "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss=";
+      "pubgrub-0.2.1" = "sha256-yhZm35Dyl6gcBTxKvsxJXv1GTOuMCDknnSTgGgKD488=";
       "reqwest-middleware-0.3.2" = "sha256-OiC8Kg+F2eKy7YNuLtgYPi95DrbxLvsIKrKEeyuzQTo=";
     };
   };
@@ -44,13 +45,14 @@ python3Packages.buildPythonApplication rec {
 
   buildInputs = [
     libiconv
-  ] ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
 
   dontUseCmakeConfigure = true;
 
-  cargoBuildFlags = [ "--package" "uv" ];
+  cargoBuildFlags = [
+    "--package"
+    "uv"
+  ];
 
   postInstall = ''
     export HOME=$TMPDIR
@@ -60,14 +62,10 @@ python3Packages.buildPythonApplication rec {
       --zsh <($out/bin/uv --generate-shell-completion zsh)
   '';
 
-  pythonImportsCheck = [
-    "uv"
-  ];
+  pythonImportsCheck = [ "uv" ];
 
   passthru = {
-    tests.version = testers.testVersion {
-      package = uv;
-    };
+    tests.version = testers.testVersion { package = uv; };
     updateScript = nix-update-script { };
   };
 
@@ -75,7 +73,10 @@ python3Packages.buildPythonApplication rec {
     description = "Extremely fast Python package installer and resolver, written in Rust";
     homepage = "https://github.com/astral-sh/uv";
     changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md";
-    license = with lib.licenses; [ asl20 mit ];
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
     maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "uv";
   };

pkgs/by-name/xe/xen-guest-agent/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitLab,
+  rustPlatform,
+  llvmPackages,
+  pkg-config,
+  xen-slim,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "xen-guest-agent";
+  version = "0.4.0-unstable-2024-05-31";
+
+  src = fetchFromGitLab {
+    owner = "xen-project";
+    repo = pname;
+    rev = "03aaadbe030f303b1503e172ee2abb6d0cab7ac6";
+    hash = "sha256-OhzRsRwDvt0Ov+nLxQSP87G3RDYSLREMz2w9pPtSUYg=";
+  };
+
+  cargoHash = "sha256-E6QKh4FFr6sLAByU5n6sLppFwPHSKtKffhQ7FfdXAu4=";
+
+  nativeBuildInputs = [
+    llvmPackages.clang
+    pkg-config
+  ];
+
+  buildInputs = [ xen-slim ];
+
+  env.LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+
+  postFixup = ''
+    patchelf $out/bin/xen-guest-agent --add-rpath ${xen-slim.out}/lib
+  '';
+
+  meta = {
+    description = "Xen agent running in Linux/BSDs (POSIX) VMs";
+    homepage = "https://gitlab.com/xen-project/xen-guest-agent";
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      matdibu
+      sigmasquadron
+    ];
+  };
+}

pkgs/development/embedded/avrdude/default.nix

@@ -1,5 +1,5 @@
 { lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, elfutils
-, libftdi1, readline, hidapi, libserialport
+, libftdi1, readline, hidapi, libserialport, libusb-compat-0_1
 # Documentation building doesn't work on Darwin. It fails with:
 #   Undefined subroutine &Locale::Messages::dgettext called in ... texi2html
 #
@@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     libftdi1
     libserialport
     readline
+    libusb-compat-0_1
   ];
 
   postPatch = lib.optionalString (!useElfutils) ''

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aioopenexchangerates";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aioopenexchangerates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XvpSHxPCsfxgHdPVf8NGKPpCYbeZhVLwRtj6koAt/Rk=";
+    hash = "sha256-4MKx2wbveuT8YwQKo4HsFUaTpt2KInLtIvMWFxZCFmE=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiovlc";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiovlc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wUtoL3e22ufyzB7MJH0EuxE4WyxKQXEgThAOw23AwLM=";
+    hash = "sha256-6oAnij92lR/sbU80j4WIBCvScPvoVLTMRYlT5zHnVnk=";
   };
 
   build-system = [ poetry-core ];

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

@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -38,7 +39,7 @@ buildPythonPackage rec {
     "testVFSWithWAL"
     # no lines in errout.txt
     "testWriteUnraisable"
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ "testzzForkChecker" ];
 
   pythonImportsCheck = [ "apsw" ];
 

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

@@ -4,7 +4,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   numpy,
@@ -27,28 +26,18 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.5.2";
+  version = "1.5.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-g4JVgykGNFT4ZEi5f8hkVjd7eUVJ+LxvPvmiVa86r1Y=";
+    hash = "sha256-6RaEyFckvF3WhbfeffysMB/zt+aU1NU6B7Nm06znt9k=";
   };
 
-  patches = [
-    # Fix invalid uses of the scipy library
-    # https://github.com/cvxpy/cvxpy/pull/2508
-    (fetchpatch {
-      name = "scipy-1-14-compat";
-      url = "https://github.com/cvxpy/cvxpy/pull/2508/commits/c343f4381c69f7e6b51a86b3eee8b42fbdda9d6a.patch";
-      hash = "sha256-SqIdPs9K+GuCLCEJMHUQ+QGWNH5B3tKuwr46tD9Ao2k=";
-    })
-  ];
-
   # we need to patch out numpy version caps from upstream
   postPatch = ''
     substituteInPlace pyproject.toml \
@@ -81,19 +70,13 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "cvxpy" ];
 
-  disabledTests =
-    [
-      # Disable the slowest benchmarking tests, cuts test time in half
-      "test_tv_inpainting"
-      "test_diffcp_sdp_example"
-      "test_huber"
-      "test_partial_problem"
-      # https://github.com/cvxpy/cvxpy/issues/2174
-      "test_scipy_mi_time_limit_reached"
-    ]
-    ++ lib.optionals stdenv.isAarch64 [
-      "test_ecos_bb_mi_lp_2" # https://github.com/cvxpy/cvxpy/issues/1241#issuecomment-780912155
-    ];
+  disabledTests = [
+    # Disable the slowest benchmarking tests, cuts test time in half
+    "test_tv_inpainting"
+    "test_diffcp_sdp_example"
+    "test_huber"
+    "test_partial_problem"
+  ];
 
   pythonImportsCheck = [ "cvxpy" ];
 

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

@@ -2,24 +2,24 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
+  setuptools,
   libGL,
   libX11,
 }:
 
 buildPythonPackage rec {
   pname = "glcontext";
-  version = "2.5.0";
-  format = "setuptools";
+  version = "3.0.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "moderngl";
-    repo = pname;
+    repo = "glcontext";
     rev = "refs/tags/${version}";
-    hash = "sha256-ld+INKIGDZA2Y+sTxDPY7MI1nru6x+FeixngaJQzKkg=";
+    hash = "sha256-GC2sb6xQjg99xLcXSynLOOyyqNwCHZwZqrs9RZh99pY=";
   };
 
-  disabled = !isPy3k;
+  build-system = [ setuptools ];
 
   buildInputs = [
     libGL
@@ -28,11 +28,11 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace glcontext/x11.cpp \
-      --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \
-      --replace '"libX11.so"' '"${libX11}/lib/libX11.so"'
+      --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
+      --replace-fail '"libX11.so"' '"${libX11}/lib/libX11.so"'
     substituteInPlace glcontext/egl.cpp \
-      --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \
-      --replace '"libEGL.so"' '"${libGL}/lib/libEGL.so"'
+      --replace-fail '"libGL.so"' '"${libGL}/lib/libGL.so"' \
+      --replace-fail '"libEGL.so"' '"${libGL}/lib/libEGL.so"'
   '';
 
   # Tests fail because they try to open display. See

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

@@ -8,7 +8,6 @@
   lib,
   mock,
   openssh,
-  packaging,
   pexpect,
   psutil,
   pyserial,
@@ -21,35 +20,31 @@
   requests,
   setuptools,
   setuptools-scm,
-  wheel,
   xmodem,
 }:
 
 buildPythonPackage rec {
   pname = "labgrid";
-  version = "23.0.6";
+  version = "24.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "labgrid-project";
     repo = "labgrid";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UAfBzQZeFNs2UJSFb5fH5wHXQoVU/dOTFciR0/UB7vc=";
+    hash = "sha256-XlndAmLkDjb4S2BD85noTMJCeqa5srZocjgg1x6Ry/g=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  pyproject = true;
-
-  propagatedBuildInputs = [
+  dependencies = [
     ansicolors
     attrs
     autobahn
     jinja2
-    packaging
     pexpect
     pyserial
     pyudev
@@ -59,20 +54,10 @@ buildPythonPackage rec {
     xmodem
   ];
 
-  pythonRelaxDeps = [
-    "attrs"
-    "autobahn"
-    "jinja2"
-    "packaging"
-    "pexpect"
-    "pytest"
-    "pyudev"
-    "requests"
-    "xmodem"
-  ];
-
   pythonRemoveDeps = [ "pyserial-labgrid" ];
 
+  pythonImportsCheck = [ "labgrid" ];
+
   nativeCheckInputs = [
     mock
     openssh
@@ -89,7 +74,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Embedded control & testing library";
-    homepage = "https://labgrid.org";
+    homepage = "https://github.com/labgrid-project/labgrid";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ emantor ];
     platforms = with platforms; linux;

pkgs/development/python-modules/losant-rest/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "losant-rest";
-  version = "1.19.8";
+  version = "1.19.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Losant";
     repo = "losant-rest-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CErC2Pwdw8CzV423uToysGaz92cBNyO3tLLuLozc0MU=";
+    hash = "sha256-rokoecBjBrk0iYbsGFkpSVZK5UcEw62TRGwLl8uaSAw=";
   };
 
   build-system = [ setuptools ];

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

@@ -4,28 +4,31 @@
   fetchPypi,
   libGL,
   libX11,
+  setuptools,
   glcontext,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "moderngl";
-  version = "5.10.0";
-  format = "setuptools";
+  version = "5.11.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EZyNNk3ePNjRwJ8jftSRZhe6dZlUoZUt9GlOUe5PZRE=";
+    hash = "sha256-rEVNXqhDHy9/DJXijaIEPb0wNTjChH/uBXA55AfdGRE=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [
     libGL
     libX11
   ];
 
-  propagatedBuildInputs = [ glcontext ];
+  dependencies = [ glcontext ];
 
   # Tests need a display to run.
   doCheck = false;

pkgs/development/python-modules/mypy-boto3-builder/default.nix

@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "mypy-boto3-builder";
-  version = "7.25.3";
+  version = "7.26.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "youtype";
     repo = "mypy_boto3_builder";
     rev = "refs/tags/${version}";
-    hash = "sha256-DHGeljGY8NRndlcDqvK1Noud90wUQrkaS54489b/6RQ=";
+    hash = "sha256-gEIh5uHoInuGE1avR2giyq59pm/Avu5NYr3DttvqQp8=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/tools/qtcreator/default.nix

@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtcreator";
-  version = "14.0.0";
+  version = "14.0.1";
 
   src = fetchurl {
     url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
-    hash = "sha256-8v3P+cuO1/1csfx3k1LHp6lCkieIygAN6F2229eo1FQ=";
+    hash = "sha256-lZXS5sZbuRjng3YxQ0HcK+9JHDIApcbVzm8wVQmwsos=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/rust/cargo-tauri/default.nix

@@ -18,20 +18,20 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "tauri";
-  version = "2.0.0-rc.2";
+  version = "1.7.1-unstable-2024-08-16";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
-    rev = "tauri-v${version}";
-    hash = "sha256-V3Lck5RzEAxXRHPAy0M2elRk9geF8qHWoi01N6wcHc4=";
+    rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768";
+    hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   sourceRoot = "${src.name}/tooling/cli";
 
-  cargoHash = "sha256-fGnre+vPzWtpp9NLLQtb/Feh06pBQipkCQ2kFCDTC+Y=";
+  cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA=";
 
   buildInputs =
     [ openssl ]

pkgs/misc/logging/pacemaker/default.nix

@@ -78,6 +78,7 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
     "-Wno-error=strict-prototypes"
+    "-Wno-error=deprecated-declarations"
   ]);
 
   enableParallelBuilding = true;

pkgs/os-specific/linux/kernel/linux-libre.nix

@@ -5,7 +5,7 @@
     sha256 = "0q3kg7dqvsiar3m70mvmn6bkkm4k1zn4fbh5r8ynib753wlhf504";
   }
 , ...
-}:
+} @ args:
 
 let
   majorMinor = lib.versions.majorMinor linux.modDirVersion;
@@ -45,4 +45,4 @@ in linux.override {
 
     maintainers = with lib.maintainers; [ qyliss ];
   };
-}
+} // (args.argsOverride or { })

pkgs/os-specific/linux/kernel/update-zen.py

@@ -64,16 +64,16 @@ def update_file(relpath, variant, version, suffix, sha256):
         for line in f:
             result = line
             result = re.sub(
-                fr'^    version = ".+"; #{variant}',
-                f'    version = "{version}"; #{variant}',
+                fr'^      version = ".+"; #{variant}',
+                f'      version = "{version}"; #{variant}',
                 result)
             result = re.sub(
-                fr'^    suffix = ".+"; #{variant}',
-                f'    suffix = "{suffix}"; #{variant}',
+                fr'^      suffix = ".+"; #{variant}',
+                f'      suffix = "{suffix}"; #{variant}',
                 result)
             result = re.sub(
-                fr'^    sha256 = ".+"; #{variant}',
-                f'    sha256 = "{sha256}"; #{variant}',
+                fr'^      sha256 = ".+"; #{variant}',
+                f'      sha256 = "{sha256}"; #{variant}',
                 result)
             print(result, end='')
 

pkgs/os-specific/linux/kernel/xanmod-kernels.nix

@@ -1,23 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
+{ lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args:
 
 let
   # These names are how they are designated in https://xanmod.org.
 
   # NOTE: When updating these, please also take a look at the changes done to
   # kernel config in the xanmod version commit
-  ltsVariant = {
-    version = "6.6.46";
-    hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo=";
-    variant = "lts";
+  variants = {
+    lts = {
+      version = "6.6.46";
+      hash = "sha256-ZtXFIHRM5YCb+5Ry3zcQt44OBqfhCI/Ig32jETUBrJo=";
+    };
+    main = {
+      version = "6.10.5";
+      hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA=";
+    };
   };
 
-  mainVariant = {
-    version = "6.10.5";
-    hash = "sha256-tETGtCNNgYj1IUNuI/Am5kimFndUC4O+cZwZzlPitFA=";
-    variant = "main";
-  };
-
-  xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
+  xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
     inherit version;
     pname = "linux-xanmod";
     modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
@@ -64,7 +63,4 @@ let
     };
   } // (args.argsOverride or { }));
 in
-{
-  lts = xanmodKernelFor ltsVariant;
-  main = xanmodKernelFor mainVariant;
-}
+xanmodKernelFor variants.${variant}

pkgs/os-specific/linux/kernel/zen-kernels.nix

@@ -1,20 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
+{ lib, stdenv, fetchFromGitHub, buildLinux, variant, ... } @ args:
 
 let
   # comments with variant added for update script
-  # ./update-zen.py zen
-  zenVariant = {
-    version = "6.10.5"; #zen
-    suffix = "zen1"; #zen
-    sha256 = "08ibz7560xsmlnrm8j13hxf8hjjcxfmnjdrwffqc81g9g6rvpqra"; #zen
-    isLqx = false;
-  };
-  # ./update-zen.py lqx
-  lqxVariant = {
-    version = "6.10.5"; #lqx
-    suffix = "lqx1"; #lqx
-    sha256 = "09rscj20j94qkmvk0hlpjm6v1n1ndnkv2vl035gsp5lwggws2jqm"; #lqx
-    isLqx = true;
+  variants = {
+    # ./update-zen.py zen
+    zen = {
+      version = "6.10.5"; #zen
+      suffix = "zen1"; #zen
+      sha256 = "08ibz7560xsmlnrm8j13hxf8hjjcxfmnjdrwffqc81g9g6rvpqra"; #zen
+      isLqx = false;
+    };
+    # ./update-zen.py lqx
+    lqx = {
+      version = "6.10.5"; #lqx
+      suffix = "lqx1"; #lqx
+      sha256 = "09rscj20j94qkmvk0hlpjm6v1n1ndnkv2vl035gsp5lwggws2jqm"; #lqx
+      isLqx = true;
+    };
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
     inherit version;
@@ -123,7 +125,4 @@ let
 
   } // (args.argsOverride or { }));
 in
-{
-  zen = zenKernelsFor zenVariant;
-  lqx = zenKernelsFor lqxVariant;
-}
+zenKernelsFor variants.${variant}

pkgs/os-specific/linux/microcode/intel.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "microcode-intel";
-  version = "20240531";
+  version = "20240813";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "Intel-Linux-Processor-Microcode-Data-Files";
     rev = "microcode-${version}";
-    hash = "sha256-64vcEc3UiiV5Rg4Eh3Wsi/WSCj5DbjvZBzKLr7EgNOU=";
+    hash = "sha256-O2UWa04MnU9ndzvWy8fruOTm85PexEd+i1McQNz6uFE=";
   };
 
   nativeBuildInputs = [ iucode-tool libarchive ];

pkgs/tools/virtualization/xen-guest-agent/default.nix

@@ -1,40 +0,0 @@
-{
-  lib,
-  fetchFromGitLab,
-  rustPlatform,
-  llvmPackages,
-  xen-slim,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "xen-guest-agent";
-  version = "0.3.0";
-
-  src = fetchFromGitLab {
-    owner = "xen-project";
-    repo = pname;
-    rev = version;
-    hash = "sha256-Csio24ofj+p0j/R0av/28P/KCNXhmcF+r8xGJEfoHjQ=";
-  };
-
-  cargoHash = "sha256-XWDDzSu88zCIwMuvkFjCb98DzXHvW2IP9u3EbpAMIgw=";
-
-  env = {
-    LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
-    BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${xen-slim.dev}/include";
-    RUSTFLAGS = "-L ${xen-slim.out}/lib";
-  };
-
-  nativeBuildInputs = [llvmPackages.clang xen-slim.out];
-
-  postFixup = ''
-    patchelf $out/bin/xen-guest-agent --add-rpath ${xen-slim.out}/lib
-  '';
-
-  meta = with lib; {
-    description = "Xen agent running in Linux/BSDs (POSIX) VMs";
-    homepage = "https://gitlab.com/xen-project/xen-guest-agent";
-    license = licenses.agpl3Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [matdibu];
-  };
-}

pkgs/top-level/all-packages.nix

@@ -14333,8 +14333,6 @@ with pkgs;
 
   xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
 
-  xen-guest-agent = callPackage ../tools/virtualization/xen-guest-agent { };
-
   xflux = callPackage ../tools/misc/xflux { };
   xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
 

pkgs/top-level/linux-kernels.nix

@@ -213,31 +213,46 @@ in {
     # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
     zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
 
-    linux_zen = (zenKernels {
-      kernelPatches = [
-        kernelPatches.bridge_stp_helper
-        kernelPatches.request_key_helper
-      ];
-    }).zen;
-
-    linux_lqx = (zenKernels {
-      kernelPatches = [
-        kernelPatches.bridge_stp_helper
-        kernelPatches.request_key_helper
-      ];
-    }).lqx;
-
-    # This contains the variants of the XanMod kernel
-    xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix {
+    linux_zen = zenKernels {
+      variant = "zen";
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
       ];
     };
 
-    linux_xanmod = xanmodKernels.lts;
-    linux_xanmod_stable = xanmodKernels.main;
-    linux_xanmod_latest = xanmodKernels.main;
+    linux_lqx = zenKernels {
+      variant = "lqx";
+      kernelPatches = [
+        kernelPatches.bridge_stp_helper
+        kernelPatches.request_key_helper
+      ];
+    };
+
+    # This contains the variants of the XanMod kernel
+    xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix;
+
+    linux_xanmod = xanmodKernels {
+      variant = "lts";
+      kernelPatches = [
+        kernelPatches.bridge_stp_helper
+        kernelPatches.request_key_helper
+      ];
+    };
+    linux_xanmod_stable = xanmodKernels {
+      variant = "main";
+      kernelPatches = [
+        kernelPatches.bridge_stp_helper
+        kernelPatches.request_key_helper
+      ];
+    };
+    linux_xanmod_latest = xanmodKernels {
+      variant = "main";
+      kernelPatches = [
+        kernelPatches.bridge_stp_helper
+        kernelPatches.request_key_helper
+      ];
+    };
 
     linux_libre = deblobKernel packageAliases.linux_default.kernel;