From 21c526ba52942e01e6b1504ef7da6b3457e4c041 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 22 Jun 2025 02:05:02 +0800 Subject: [PATCH 1/2] xjobs: remove with lib --- pkgs/by-name/xj/xjobs/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xj/xjobs/package.nix b/pkgs/by-name/xj/xjobs/package.nix index da6cbc288580..d8882321ea9e 100644 --- a/pkgs/by-name/xj/xjobs/package.nix +++ b/pkgs/by-name/xj/xjobs/package.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Program which reads job descriptions line by line and executes them in parallel"; homepage = "https://www.maier-komor.de/xjobs.html"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = [ maintainers.siriobalmelli ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.siriobalmelli ]; longDescription = '' xjobs reads job descriptions line by line and executes them in parallel. From dfcfc6c1c0e3515994221619f23008c21fd98e65 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 22 Jun 2025 02:05:38 +0800 Subject: [PATCH 2/2] xjobs: 20200726 -> 20250209 --- pkgs/by-name/xj/xjobs/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xj/xjobs/package.nix b/pkgs/by-name/xj/xjobs/package.nix index d8882321ea9e..a86476ef280e 100644 --- a/pkgs/by-name/xj/xjobs/package.nix +++ b/pkgs/by-name/xj/xjobs/package.nix @@ -8,15 +8,20 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xjobs"; - version = "20200726"; + version = "20250209"; src = fetchurl { - url = "mirror://sourceforge//xjobs/files/xjobs-${version}.tgz"; - sha256 = "0ay6gn43pnm7r1jamwgpycl67bjg5n87ncl27jb01w2x6x70z0i3"; + url = "mirror://sourceforge//xjobs/files/xjobs-${finalAttrs.version}.tgz"; + hash = "sha256-I7Vu7NunJEE4ioLap+GPnqIG2jfzSx6Wj2dOQmb9vuk="; }; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace jobctrl.c \ + --replace-fail "#include " $'#include \n#include ' + ''; + nativeBuildInputs = [ flex installShellFiles @@ -69,4 +74,4 @@ stdenv.mkDerivation rec { ''; mainProgram = "xjobs"; }; -} +})