From 8ad0f66923456352fe39cd9e418941d3d70bf1fe Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 11 Feb 2026 15:49:21 -0600 Subject: [PATCH 1/2] axel: migrate to by-name --- .../axel/default.nix => by-name/ax/axel/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/networking/axel/default.nix => by-name/ax/axel/package.nix} (98%) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/by-name/ax/axel/package.nix similarity index 98% rename from pkgs/tools/networking/axel/default.nix rename to pkgs/by-name/ax/axel/package.nix index 9c06651ff328..9183e500511e 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/by-name/ax/axel/package.nix @@ -6,7 +6,7 @@ autoconf-archive, pkg-config, gettext, - libssl, + openssl, txt2man, }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext - libssl + openssl ]; installFlags = [ "ETCDIR=${placeholder "out"}/etc" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7b195c2e66..c9f3fed0ac60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1559,10 +1559,6 @@ with pkgs; withLibdnssdCompat = true; }; - axel = callPackage ../tools/networking/axel { - libssl = openssl; - }; - babelfish = callPackage ../shells/fish/babelfish.nix { }; bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras)); From 40e95ccc96f7d00fc436334b862907f748eacc14 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 11 Feb 2026 15:50:31 -0600 Subject: [PATCH 2/2] axel: modernize derivation --- pkgs/by-name/ax/axel/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ax/axel/package.nix b/pkgs/by-name/ax/axel/package.nix index 9183e500511e..38f2490df66d 100644 --- a/pkgs/by-name/ax/axel/package.nix +++ b/pkgs/by-name/ax/axel/package.nix @@ -10,15 +10,15 @@ txt2man, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "axel"; version = "2.17.14"; src = fetchFromGitHub { owner = "axel-download-accelerator"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM="; + repo = "axel"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5GUna5k8GhAx1Xe8n9IvXT7IO6gksxCLh+sMANlxTBM="; }; postPatch = '' @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "axel"; }; -} +})