From 7a1e0f89693f5cd367dda0c28aa26554ee88d1b3 Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Sun, 6 Sep 2026 15:42:34 +0200 Subject: [PATCH] discord: move to pkgs/by-name --- pkgs/by-name/di/discord-canary/package.nix | 6 ++++++ .../di/discord-development/package.nix | 6 ++++++ pkgs/by-name/di/discord-ptb/package.nix | 6 ++++++ .../di}/discord/darwin.nix | 0 .../di}/discord/disable-breaking-updates.py | 0 .../di}/discord/linux.nix | 0 .../di/discord/metadata.nix} | 17 +++++++--------- .../di/discord/package.nix} | 20 +++++++++++-------- .../di}/discord/sources.json | 0 .../di}/discord/update.py | 0 pkgs/top-level/all-packages.nix | 7 ------- 11 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 pkgs/by-name/di/discord-canary/package.nix create mode 100644 pkgs/by-name/di/discord-development/package.nix create mode 100644 pkgs/by-name/di/discord-ptb/package.nix rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/darwin.nix (100%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/disable-breaking-updates.py (100%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/linux.nix (100%) rename pkgs/{applications/networking/instant-messengers/discord/default.nix => by-name/di/discord/metadata.nix} (93%) rename pkgs/{applications/networking/instant-messengers/discord/wrapper.nix => by-name/di/discord/package.nix} (96%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/sources.json (100%) rename pkgs/{applications/networking/instant-messengers => by-name/di}/discord/update.py (100%) diff --git a/pkgs/by-name/di/discord-canary/package.nix b/pkgs/by-name/di/discord-canary/package.nix new file mode 100644 index 000000000000..968c5990523f --- /dev/null +++ b/pkgs/by-name/di/discord-canary/package.nix @@ -0,0 +1,6 @@ +{ + discord, + ... +}@args: + +discord.override ({ pname = "discord-canary"; } // removeAttrs args [ "discord" ]) diff --git a/pkgs/by-name/di/discord-development/package.nix b/pkgs/by-name/di/discord-development/package.nix new file mode 100644 index 000000000000..6d3d34251320 --- /dev/null +++ b/pkgs/by-name/di/discord-development/package.nix @@ -0,0 +1,6 @@ +{ + discord, + ... +}@args: + +discord.override ({ pname = "discord-development"; } // removeAttrs args [ "discord" ]) diff --git a/pkgs/by-name/di/discord-ptb/package.nix b/pkgs/by-name/di/discord-ptb/package.nix new file mode 100644 index 000000000000..52785ef6fc54 --- /dev/null +++ b/pkgs/by-name/di/discord-ptb/package.nix @@ -0,0 +1,6 @@ +{ + discord, + ... +}@args: + +discord.override ({ pname = "discord-ptb"; } // removeAttrs args [ "discord" ]) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/by-name/di/discord/darwin.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/darwin.nix rename to pkgs/by-name/di/discord/darwin.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py b/pkgs/by-name/di/discord/disable-breaking-updates.py similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py rename to pkgs/by-name/di/discord/disable-breaking-updates.py diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/by-name/di/discord/linux.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/linux.nix rename to pkgs/by-name/di/discord/linux.nix diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/by-name/di/discord/metadata.nix similarity index 93% rename from pkgs/applications/networking/instant-messengers/discord/default.nix rename to pkgs/by-name/di/discord/metadata.nix index 31facadf34d7..193774b55506 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/by-name/di/discord/metadata.nix @@ -1,5 +1,4 @@ { - callPackage, lib, stdenv, discord, @@ -95,13 +94,11 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ] platformName = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; source = sources."${platformName}-${args.branch}"; in - callPackage ./wrapper.nix ( - args - // { - inherit pname source; - meta = meta // { - mainProgram = args.binaryName; - }; - } - ) + args + // { + inherit source; + meta = meta // { + mainProgram = args.binaryName; + }; + } ) diff --git a/pkgs/applications/networking/instant-messengers/discord/wrapper.nix b/pkgs/by-name/di/discord/package.nix similarity index 96% rename from pkgs/applications/networking/instant-messengers/discord/wrapper.nix rename to pkgs/by-name/di/discord/package.nix index 5184722f636d..510af8075a22 100644 --- a/pkgs/applications/networking/instant-messengers/discord/wrapper.nix +++ b/pkgs/by-name/di/discord/package.nix @@ -1,12 +1,6 @@ { # Package metadata - pname, - source, - meta, - binaryName, - desktopName, - self, - branch, + pname ? "discord", # Feature flags (cross-platform) withOpenASAR ? false, withVencord ? false, @@ -46,7 +40,17 @@ let inherit (stdenv.hostPlatform) isLinux; - pkgArgs = removeAttrs args [ + metadata = (callPackage ./metadata.nix { }).${pname}; + inherit (metadata) + source + meta + binaryName + desktopName + self + branch + ; + + pkgArgs = removeAttrs (args // metadata) [ "branch" "self" "unwrappedDiscord" diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/by-name/di/discord/sources.json similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/sources.json rename to pkgs/by-name/di/discord/sources.json diff --git a/pkgs/applications/networking/instant-messengers/discord/update.py b/pkgs/by-name/di/discord/update.py similarity index 100% rename from pkgs/applications/networking/instant-messengers/discord/update.py rename to pkgs/by-name/di/discord/update.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cce505519d7..bd5049e7da98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10673,13 +10673,6 @@ with pkgs; dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { }); - inherit (callPackage ../applications/networking/instant-messengers/discord { }) - discord - discord-ptb - discord-canary - discord-development - ; - torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { }; hy = with python3Packages; toPythonApplication hy;