From 7f99df7e2a9f9e6d69567873366394c4135e51a4 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:08:55 +0100 Subject: [PATCH 1/3] jen: cleanup --- pkgs/by-name/je/jen/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index f59d6dbee404..e6cd9e41b2cb 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jen"; version = "1.7.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; }; @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; - meta = with lib; { + meta = { description = "Simple CLI generation tool for creating large datasets"; mainProgram = "jen"; homepage = "https://github.com/whitfin/jen"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From fd3afb40bd4f60cacc1c0090a8bfad9838806b17 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:13:44 +0100 Subject: [PATCH 2/3] jen: 1.7.0 -> 1.7.1 --- pkgs/by-name/je/jen/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index e6cd9e41b2cb..717fc077e55a 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -2,27 +2,30 @@ lib, rustPlatform, fetchCrate, - fetchpatch, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jen"; - version = "1.7.0"; + version = "1.7.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; + hash = "sha256-dRUIyy4aQRwofZ/zWOHThclfxxrpXGWHruqg2Pp2BtQ="; }; - cargoPatches = [ - (fetchpatch { - name = "fix-rust-1.80-build.patch"; - url = "https://github.com/whitfin/jen/commit/a6b5239593cecfd803a111ff317afa88c94c3640.patch"; - hash = "sha256-ikfmEj6Xm0nT9dxpx6xdm/mQbw0b3gh2PT6Zo69Zg0E="; - }) - ]; + cargoHash = "sha256-2c4XHA8fl2BA/Qtz+Hp29SjiWqPEJEj4WQiIFG/O4fE="; - cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "Simple CLI generation tool for creating large datasets"; From 10981b0a872e11ccdd2faaa4686c71dc0ae0dff9 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:17:30 +0100 Subject: [PATCH 3/3] jen: add liberodark to maintainers --- pkgs/by-name/je/jen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index 717fc077e55a..dbcfb71f6c39 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "jen"; homepage = "https://github.com/whitfin/jen"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; }; })