Merge master into staging-next

maintainers/scripts/luarocks-packages.csv

@@ -108,6 +108,7 @@ luv,,,,1.48.0-2,,
 lyaml,,,,,,lblasc
 lz.n,,,,,,mrcjkb
 lze,,,,,,birdee
+lzextras,,,,,,birdee
 lzn-auto-require,,,,,,mrcjkb
 magick,,,,,5.1,donovanglover
 markdown,,,,,,

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

@@ -4007,6 +4007,7 @@ in
       "lush-nvim"
       "lz-n"
       "lze"
+      "lzextras"
       "lzn-auto-require"
       "middleclass"
       "neorg"

pkgs/by-name/di/dita-ot/package.nix

@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dita-ot";
-  version = "4.2.4";
+  version = "4.3";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ openjdk17 ];
 
   src = fetchzip {
     url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-XAuqW4crJldkVJaW/tF7m/nnpV86z78d456/1hwLdU0=";
+    hash = "sha256-/qWu9lUfK/3gp/IO4WOO8g8LuZlXErEU5sPt9qZep1I=";
   };
 
   installPhase = ''

pkgs/by-name/hu/hugo/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.143.0";
+  version = "0.143.1";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${version}";
-    hash = "sha256-h0BrWL3dvdn1x0Z5bGrss8iVl0VG483mCHhg1CnZuaQ=";
+    hash = "sha256-O0rqCurCWiYVmhG9QxNOX7e3pYSuvI/xyW/pL/EhyXU=";
   };
 
   vendorHash = "sha256-2OZajJZnbD3Ks3xq501Ta5ba+3jDnI1GFiI5u2Y/i3A=";

pkgs/by-name/ku/kubelogin-oidc/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "1.31.1";
+  version = "1.32.2";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
     rev = "v${version}";
-    hash = "sha256-LfMxfXM3L4r0S8eDQVgFO1jTf/BcYpxxQSMl4zRh/yA=";
+    hash = "sha256-fX0Hjb0j6KbdGuFdy5MaZc3zL/EOVXFTTNlIUQZjnsc=";
   };
 
   subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule rec {
     "-X main.version=v${version}"
   ];
 
-  vendorHash = "sha256-o+74+PnwhMe2oMfFLMD95R4m3gMjQS2d4pAvCEjh05U=";
+  vendorHash = "sha256-93B2TzptvXNevNLGGpWhUoLfefwb6uFk7tObnEf2wNg=";
 
   # test all packages
   preCheck = ''

pkgs/by-name/pr/proton-pass/package.nix

@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.29.0";
+  version = "1.29.2";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-aLDu1XTVMjEPxoJm3Stm9qDHjsoVlS4IWClS9+WLrXU=";
+    hash = "sha256-swq4zDcBephqqtabg36eDSWubo0LDpScUxB30RnzGHQ=";
   };
 
   dontConfigure = true;

pkgs/by-name/st/stress/package.nix

@@ -5,23 +5,23 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "stress";
   version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "resurrecting-open-source-projects";
-    repo = pname;
-    rev = version;
+    repo = "stress";
+    tag = finalAttrs.version;
     hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
     mainProgram = "stress";
   };
-}
+})

pkgs/development/lua-modules/generated-packages.nix

@@ -2586,6 +2586,29 @@ buildLuarocksPackage {
   };
 }) {};
 
+lzextras = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
+buildLuarocksPackage {
+  pname = "lzextras";
+  version = "0.1.19-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/lzextras-0.1.19-1.rockspec";
+    sha256 = "1wdkikn246b25c8j6984nz0c7fr6vz4rbjfl4wq4785jkf4k95mc";
+  }).outPath;
+  src = fetchzip {
+    url    = "https://github.com/BirdeeHub/lzextras/archive/v0.1.19.zip";
+    sha256 = "0hq5939lygmi8i8rhqhxsjr98aixrlr7m2sb0kxppca6pb18g38c";
+  };
+
+  disabled = luaOlder "5.1";
+
+  meta = {
+    homepage = "https://github.com/BirdeeHub/lzextras";
+    description = "A collection of utilities and handlers for BirdeeHub/lze";
+    maintainers = with lib.maintainers; [ birdee ];
+    license.fullName = "GPL-2+";
+  };
+}) {};
+
 lzn-auto-require = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, lz-n }:
 buildLuarocksPackage {
   pname = "lzn-auto-require";