From d827f6d44190f3c7197db24d503b06185256469c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 8 May 2026 08:33:19 -0500 Subject: [PATCH 1/3] amule-daemon: migrate to by-name --- pkgs/by-name/am/amule-daemon/package.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/am/amule-daemon/package.nix diff --git a/pkgs/by-name/am/amule-daemon/package.nix b/pkgs/by-name/am/amule-daemon/package.nix new file mode 100644 index 000000000000..ba17bbd9921d --- /dev/null +++ b/pkgs/by-name/am/amule-daemon/package.nix @@ -0,0 +1,13 @@ +{ + amule, + ... +}@args: + +amule.override ( + { + monolithic = false; + enableDaemon = true; + mainProgram = "amuled"; + } + // removeAttrs args [ "amule" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f9e52e654f5..d48ea19bece9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1446,12 +1446,6 @@ with pkgs; crystfel-headless = crystfel.override { withGui = false; }; - amule-daemon = amule.override { - monolithic = false; - enableDaemon = true; - mainProgram = "amuled"; - }; - amule-gui = amule.override { monolithic = false; client = true; From 3406028f0ffcfdd4ea92890166b990ecdcbdbd31 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 8 May 2026 08:36:52 -0500 Subject: [PATCH 2/3] amule-gui: migrate to by-name --- pkgs/by-name/am/amule-gui/package.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/am/amule-gui/package.nix diff --git a/pkgs/by-name/am/amule-gui/package.nix b/pkgs/by-name/am/amule-gui/package.nix new file mode 100644 index 000000000000..52df23c780c8 --- /dev/null +++ b/pkgs/by-name/am/amule-gui/package.nix @@ -0,0 +1,13 @@ +{ + amule, + ... +}@args: + +amule.override ( + { + monolithic = false; + client = true; + mainProgram = "amulegui"; + } + // removeAttrs args [ "amule" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d48ea19bece9..4538daa76867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1446,12 +1446,6 @@ with pkgs; crystfel-headless = crystfel.override { withGui = false; }; - amule-gui = amule.override { - monolithic = false; - client = true; - mainProgram = "amulegui"; - }; - amule-web = amule.override { monolithic = false; httpServer = true; From d4ee715652c326bc1c0d0dae5d47dd0b5b224774 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 8 May 2026 08:38:47 -0500 Subject: [PATCH 3/3] amule-web: migrate to by-name --- pkgs/by-name/am/amule-web/package.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/am/amule-web/package.nix diff --git a/pkgs/by-name/am/amule-web/package.nix b/pkgs/by-name/am/amule-web/package.nix new file mode 100644 index 000000000000..a6900be2b59b --- /dev/null +++ b/pkgs/by-name/am/amule-web/package.nix @@ -0,0 +1,13 @@ +{ + amule, + ... +}@args: + +amule.override ( + { + monolithic = false; + httpServer = true; + mainProgram = "amuleweb"; + } + // removeAttrs args [ "amule" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4538daa76867..ae1e40f86519 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1446,12 +1446,6 @@ with pkgs; crystfel-headless = crystfel.override { withGui = false; }; - amule-web = amule.override { - monolithic = false; - httpServer = true; - mainProgram = "amuleweb"; - }; - inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector