From 7b2e8203fd979eb6447fbc26e45c1ff5c09568e9 Mon Sep 17 00:00:00 2001 From: BirdeeHub Date: Tue, 11 Feb 2025 22:54:28 -0800 Subject: [PATCH 1/9] vimPlugins.lzextras: init at 0.1.17 extensions repository for https://github.com/BirdeeHub/lze --- maintainers/scripts/luarocks-packages.csv | 1 + .../editors/vim/plugins/overrides.nix | 1 + .../lua-modules/generated-packages.nix | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8a973374a1a3..c4cd68dc9fcd 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/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,,,,,, diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 27e72add1390..50fa07219ca2 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4007,6 +4007,7 @@ in "lush-nvim" "lz-n" "lze" + "lzextras" "lzn-auto-require" "middleclass" "neorg" diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 9c78f7931a36..6362b2a2642f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2585,6 +2585,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"; From b23262c13b46de5bff9a24c3079f62f9ce93116e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 04:55:42 +0000 Subject: [PATCH 2/9] proton-pass: 1.29.0 -> 1.29.2 --- pkgs/by-name/pr/proton-pass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index d62bdc861971..aa5db79706ac 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/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; From 9bd7e85d64c1b970141dfad5f1b1f336b3bf98f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 12:51:38 +0000 Subject: [PATCH 3/9] dita-ot: 4.2.4 -> 4.3 --- pkgs/by-name/di/dita-ot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix index 6f9cabfea4b4..9e73f2364b8e 100644 --- a/pkgs/by-name/di/dita-ot/package.nix +++ b/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 = '' From 9502f3f4ac5b6a8c5543954c6c67b6c18c753e85 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:25:58 -0300 Subject: [PATCH 4/9] stress: replace `rec` with `finalAttrs` --- pkgs/by-name/st/stress/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index 6aee23949676..0c89c2522720 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -5,14 +5,14 @@ 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 = finalAttrs.pname; + rev = finalAttrs.version; hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "stress"; }; -} +}) From d93057e49f2b7fcb65681edf90b851ba87d3423a Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:27:05 -0300 Subject: [PATCH 5/9] stress: remove `with lib` from meta --- pkgs/by-name/st/stress/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index 0c89c2522720..ff4f75e071fe 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation (finalAttrs: { 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"; }; }) From 743e15e45f44172c3b7d5c79605d486798d8860b Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:27:37 -0300 Subject: [PATCH 6/9] stress: hardcode source repository --- pkgs/by-name/st/stress/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index ff4f75e071fe..13aa17217819 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; - repo = finalAttrs.pname; + repo = "stress"; rev = finalAttrs.version; hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg="; }; From 4bd83c8f3fe70a5e3fd837ef4cf04a3079914e44 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 15 Feb 2025 17:29:09 -0300 Subject: [PATCH 7/9] stress: replace `rev` with `tag` in `fetchFromGitHub` --- pkgs/by-name/st/stress/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stress/package.nix b/pkgs/by-name/st/stress/package.nix index 13aa17217819..a61ba45c7b12 100644 --- a/pkgs/by-name/st/stress/package.nix +++ b/pkgs/by-name/st/stress/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = "stress"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-1r0n/KE4RpO0txIViGxuc7G+I4Ds9AJYcuMx2/R97jg="; }; From 6cae0d6e407e95ce79871065518406eb8a491418 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 05:02:06 +0000 Subject: [PATCH 8/9] kubelogin-oidc: 1.31.1 -> 1.32.2 --- pkgs/by-name/ku/kubelogin-oidc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix index b8c600bade79..30e5da39200f 100644 --- a/pkgs/by-name/ku/kubelogin-oidc/package.nix +++ b/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 = '' From 521f819b0c1024b35d49a47aa0241d5604ff1959 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 10:25:47 +0000 Subject: [PATCH 9/9] hugo: 0.143.0 -> 0.143.1 --- pkgs/by-name/hu/hugo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 87249e26ec81..c2d2d3efa9c2 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/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=";