From fea270510ec85a484cb7df119996d6adc57a8fdd Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 28 Sep 2025 09:48:58 +0300 Subject: [PATCH 1/4] parallel: move to `pkgs/by-name` --- .../parallel/default.nix => by-name/pa/parallel/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/parallel/default.nix => by-name/pa/parallel/package.nix} (100%) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/by-name/pa/parallel/package.nix similarity index 100% rename from pkgs/tools/misc/parallel/default.nix rename to pkgs/by-name/pa/parallel/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7a82f49c6f7..f8aef52ecfb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3811,8 +3811,6 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; - parallel = callPackage ../tools/misc/parallel { }; - parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { }; parcellite = callPackage ../tools/misc/parcellite { }; From f775b4aea621c948bb6dae8b552523d8d83a9705 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 28 Sep 2025 12:42:29 +0300 Subject: [PATCH 2/4] parallel: switch to `finalAttrs` --- pkgs/by-name/pa/parallel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix index cc9dacc51e94..3ec39ba0bf25 100644 --- a/pkgs/by-name/pa/parallel/package.nix +++ b/pkgs/by-name/pa/parallel/package.nix @@ -10,12 +10,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "parallel"; version = "20250822"; src = fetchurl { - url = "mirror://gnu/parallel/parallel-${version}.tar.bz2"; + url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2"; hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "parallel"; }; -} +}) From 791de5a4b772d79022e9b77308176f945363ddf7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 28 Sep 2025 12:43:05 +0300 Subject: [PATCH 3/4] parallel: remove `with lib` --- pkgs/by-name/pa/parallel/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix index 3ec39ba0bf25..b9ff9d0d9e85 100644 --- a/pkgs/by-name/pa/parallel/package.nix +++ b/pkgs/by-name/pa/parallel/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job @@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: { programs. ''; homepage = "https://www.gnu.org/software/parallel/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ pSub tomberek ]; From 760ed7b659e76f4e931992ca7c2a66031a63f696 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 28 Sep 2025 09:51:57 +0300 Subject: [PATCH 4/4] parallel-full: move to `pkgs/by-name` --- .../wrapper.nix => by-name/pa/parallel-full/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/parallel/wrapper.nix => by-name/pa/parallel-full/package.nix} (100%) diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/by-name/pa/parallel-full/package.nix similarity index 100% rename from pkgs/tools/misc/parallel/wrapper.nix rename to pkgs/by-name/pa/parallel-full/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8aef52ecfb7..430cae43ec90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3811,8 +3811,6 @@ with pkgs; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; - parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { }; - parcellite = callPackage ../tools/misc/parcellite { }; patchutils = callPackage ../tools/text/patchutils { };