From 0c94fb56a695baa19f793ec4cf32825b5fb5f43c Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 09:47:41 +0100 Subject: [PATCH 01/17] cloak: move to by-name --- .../misc/cloak/default.nix => by-name/cl/cloak/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/cloak/default.nix => by-name/cl/cloak/package.nix} (100%) diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/by-name/cl/cloak/package.nix similarity index 100% rename from pkgs/applications/misc/cloak/default.nix rename to pkgs/by-name/cl/cloak/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b6a0bee6a3b..5c5b92e4b574 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,8 +290,6 @@ with pkgs; stdenv = clangStdenv; }; - cloak = callPackage ../applications/misc/cloak { }; - cotp = callPackage ../applications/misc/cotp { }; cope = callPackage ../by-name/co/cope/package.nix { From d6a60466acab0cebdde1b3b7eb9f3bce44414b4d Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 09:53:04 +0100 Subject: [PATCH 02/17] doing: move to by-name --- pkgs/{applications/misc => by-name/do}/doing/Gemfile | 0 pkgs/{applications/misc => by-name/do}/doing/Gemfile.lock | 0 pkgs/{applications/misc => by-name/do}/doing/gemset.nix | 0 .../misc/doing/default.nix => by-name/do/doing/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/do}/doing/Gemfile (100%) rename pkgs/{applications/misc => by-name/do}/doing/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/do}/doing/gemset.nix (100%) rename pkgs/{applications/misc/doing/default.nix => by-name/do/doing/package.nix} (100%) diff --git a/pkgs/applications/misc/doing/Gemfile b/pkgs/by-name/do/doing/Gemfile similarity index 100% rename from pkgs/applications/misc/doing/Gemfile rename to pkgs/by-name/do/doing/Gemfile diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/by-name/do/doing/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/doing/Gemfile.lock rename to pkgs/by-name/do/doing/Gemfile.lock diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/by-name/do/doing/gemset.nix similarity index 100% rename from pkgs/applications/misc/doing/gemset.nix rename to pkgs/by-name/do/doing/gemset.nix diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/by-name/do/doing/package.nix similarity index 100% rename from pkgs/applications/misc/doing/default.nix rename to pkgs/by-name/do/doing/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c5b92e4b574..f08b302a4f64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19102,8 +19102,6 @@ with pkgs; openbsd = callPackage ../os-specific/bsd/openbsd { }; - doing = callPackage ../applications/misc/doing { }; - alibuild = callPackage ../development/tools/build-managers/alibuild { python = python3; }; From e43015afa25b1d47e5ab2cd06a56aa14bbed759e Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 09:55:28 +0100 Subject: [PATCH 03/17] pt: move by-name --- pkgs/{applications/misc => by-name/pt}/pt/.bundle/config | 0 pkgs/{applications/misc => by-name/pt}/pt/Gemfile | 0 pkgs/{applications/misc => by-name/pt}/pt/Gemfile.lock | 0 pkgs/{applications/misc => by-name/pt}/pt/gemset.nix | 0 .../misc/pt/default.nix => by-name/pt/pt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/pt}/pt/.bundle/config (100%) rename pkgs/{applications/misc => by-name/pt}/pt/Gemfile (100%) rename pkgs/{applications/misc => by-name/pt}/pt/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/pt}/pt/gemset.nix (100%) rename pkgs/{applications/misc/pt/default.nix => by-name/pt/pt/package.nix} (100%) diff --git a/pkgs/applications/misc/pt/.bundle/config b/pkgs/by-name/pt/pt/.bundle/config similarity index 100% rename from pkgs/applications/misc/pt/.bundle/config rename to pkgs/by-name/pt/pt/.bundle/config diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/by-name/pt/pt/Gemfile similarity index 100% rename from pkgs/applications/misc/pt/Gemfile rename to pkgs/by-name/pt/pt/Gemfile diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/by-name/pt/pt/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/pt/Gemfile.lock rename to pkgs/by-name/pt/pt/Gemfile.lock diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/by-name/pt/pt/gemset.nix similarity index 100% rename from pkgs/applications/misc/pt/gemset.nix rename to pkgs/by-name/pt/pt/gemset.nix diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/by-name/pt/pt/package.nix similarity index 100% rename from pkgs/applications/misc/pt/default.nix rename to pkgs/by-name/pt/pt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f08b302a4f64..e0d37e563dc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18698,8 +18698,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security; }; - pt = callPackage ../applications/misc/pt { }; - pyupgrade = with python3Packages; toPythonApplication pyupgrade; pwntools = with python3Packages; toPythonApplication pwntools; From c44a31d3eac2996fea66179440b76d8c1e45f5f6 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:04:22 +0100 Subject: [PATCH 04/17] gollum: move by-name --- pkgs/{applications/misc => by-name/go}/gollum/Gemfile | 0 pkgs/{applications/misc => by-name/go}/gollum/Gemfile.lock | 0 pkgs/{applications/misc => by-name/go}/gollum/gemset.nix | 0 .../misc/gollum/default.nix => by-name/go/gollum/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/go}/gollum/Gemfile (100%) rename pkgs/{applications/misc => by-name/go}/gollum/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/go}/gollum/gemset.nix (100%) rename pkgs/{applications/misc/gollum/default.nix => by-name/go/gollum/package.nix} (100%) diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/by-name/go/gollum/Gemfile similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile rename to pkgs/by-name/go/gollum/Gemfile diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/by-name/go/gollum/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/gollum/Gemfile.lock rename to pkgs/by-name/go/gollum/Gemfile.lock diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/by-name/go/gollum/gemset.nix similarity index 100% rename from pkgs/applications/misc/gollum/gemset.nix rename to pkgs/by-name/go/gollum/gemset.nix diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/by-name/go/gollum/package.nix similarity index 100% rename from pkgs/applications/misc/gollum/default.nix rename to pkgs/by-name/go/gollum/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0d37e563dc1..9fb9b96cfbfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14337,8 +14337,6 @@ with pkgs; inherit (darwin) libobjc; }; - gollum = callPackage ../applications/misc/gollum { }; - googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; From 339478c850e90c0d86da082b0f731b3e1bd47563 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:06:15 +0100 Subject: [PATCH 05/17] cotp: move by-name --- .../misc/cotp/default.nix => by-name/co/cotp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/cotp/default.nix => by-name/co/cotp/package.nix} (100%) diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/by-name/co/cotp/package.nix similarity index 100% rename from pkgs/applications/misc/cotp/default.nix rename to pkgs/by-name/co/cotp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fb9b96cfbfc..52201cb74e4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,8 +290,6 @@ with pkgs; stdenv = clangStdenv; }; - cotp = callPackage ../applications/misc/cotp { }; - cope = callPackage ../by-name/co/cope/package.nix { perl = perl538; perlPackages = perl538Packages; From 22260d7916e476d8a892554494776c8446a5fb76 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:08:58 +0100 Subject: [PATCH 06/17] acpic: move by-name --- .../misc/acpic/default.nix => by-name/ac/acpic/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/acpic/default.nix => by-name/ac/acpic/package.nix} (100%) diff --git a/pkgs/applications/misc/acpic/default.nix b/pkgs/by-name/ac/acpic/package.nix similarity index 100% rename from pkgs/applications/misc/acpic/default.nix rename to pkgs/by-name/ac/acpic/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52201cb74e4b..c79407396c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13393,8 +13393,6 @@ with pkgs; pdfstudioviewer ; - acpic = callPackage ../applications/misc/acpic/default.nix { }; - aeolus = callPackage ../applications/audio/aeolus { }; aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { }; From 2196a645143a64b1886f68ba6147352ec70e5917 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:12:15 +0100 Subject: [PATCH 07/17] taskjuggler: move by-name --- pkgs/{applications/misc => by-name/ta}/taskjuggler/Gemfile | 0 pkgs/{applications/misc => by-name/ta}/taskjuggler/Gemfile.lock | 0 pkgs/{applications/misc => by-name/ta}/taskjuggler/gemset.nix | 0 .../default.nix => by-name/ta/taskjuggler/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/ta}/taskjuggler/Gemfile (100%) rename pkgs/{applications/misc => by-name/ta}/taskjuggler/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/ta}/taskjuggler/gemset.nix (100%) rename pkgs/{applications/misc/taskjuggler/default.nix => by-name/ta/taskjuggler/package.nix} (100%) diff --git a/pkgs/applications/misc/taskjuggler/Gemfile b/pkgs/by-name/ta/taskjuggler/Gemfile similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile rename to pkgs/by-name/ta/taskjuggler/Gemfile diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/by-name/ta/taskjuggler/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/taskjuggler/Gemfile.lock rename to pkgs/by-name/ta/taskjuggler/Gemfile.lock diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/by-name/ta/taskjuggler/gemset.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/gemset.nix rename to pkgs/by-name/ta/taskjuggler/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/by-name/ta/taskjuggler/package.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/default.nix rename to pkgs/by-name/ta/taskjuggler/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c79407396c02..1c47fea820f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15967,8 +15967,6 @@ with pkgs; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { }; - telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv From f585591dc65e5cfb5738180cbfb2ea9ca9f804c7 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:15:27 +0100 Subject: [PATCH 08/17] pdfposter: move by-name --- .../pdfposter/default.nix => by-name/pd/pdfposter/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/pdfposter/default.nix => by-name/pd/pdfposter/package.nix} (100%) diff --git a/pkgs/applications/misc/pdfposter/default.nix b/pkgs/by-name/pd/pdfposter/package.nix similarity index 100% rename from pkgs/applications/misc/pdfposter/default.nix rename to pkgs/by-name/pd/pdfposter/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c47fea820f5..b619ecace3a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4900,8 +4900,6 @@ with pkgs; pdd = python3Packages.callPackage ../tools/misc/pdd { }; - pdfposter = callPackage ../applications/misc/pdfposter { }; - pdfminer = with python3Packages; toPythonApplication pdfminer-six; pgsync = callPackage ../development/tools/database/pgsync { }; From af2057249eacdb23c42e3b7ec83040afd791ef34 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:19:15 +0100 Subject: [PATCH 09/17] jekyll: move by-name --- pkgs/{applications/misc => by-name/je}/jekyll/basic/Gemfile | 0 .../{applications/misc => by-name/je}/jekyll/basic/Gemfile.lock | 0 pkgs/{applications/misc => by-name/je}/jekyll/basic/gemset.nix | 0 pkgs/{applications/misc => by-name/je}/jekyll/full/Gemfile | 0 pkgs/{applications/misc => by-name/je}/jekyll/full/Gemfile.lock | 0 pkgs/{applications/misc => by-name/je}/jekyll/full/gemset.nix | 0 .../misc/jekyll/default.nix => by-name/je/jekyll/package.nix} | 0 pkgs/{applications/misc => by-name/je}/jekyll/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 9 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/je}/jekyll/basic/Gemfile (100%) rename pkgs/{applications/misc => by-name/je}/jekyll/basic/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/je}/jekyll/basic/gemset.nix (100%) rename pkgs/{applications/misc => by-name/je}/jekyll/full/Gemfile (100%) rename pkgs/{applications/misc => by-name/je}/jekyll/full/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/je}/jekyll/full/gemset.nix (100%) rename pkgs/{applications/misc/jekyll/default.nix => by-name/je/jekyll/package.nix} (100%) rename pkgs/{applications/misc => by-name/je}/jekyll/update.sh (100%) diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/by-name/je/jekyll/basic/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile rename to pkgs/by-name/je/jekyll/basic/Gemfile diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/by-name/je/jekyll/basic/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/basic/Gemfile.lock rename to pkgs/by-name/je/jekyll/basic/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/by-name/je/jekyll/basic/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/basic/gemset.nix rename to pkgs/by-name/je/jekyll/basic/gemset.nix diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/by-name/je/jekyll/full/Gemfile similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile rename to pkgs/by-name/je/jekyll/full/Gemfile diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/by-name/je/jekyll/full/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/jekyll/full/Gemfile.lock rename to pkgs/by-name/je/jekyll/full/Gemfile.lock diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/by-name/je/jekyll/full/gemset.nix similarity index 100% rename from pkgs/applications/misc/jekyll/full/gemset.nix rename to pkgs/by-name/je/jekyll/full/gemset.nix diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/by-name/je/jekyll/package.nix similarity index 100% rename from pkgs/applications/misc/jekyll/default.nix rename to pkgs/by-name/je/jekyll/package.nix diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/by-name/je/jekyll/update.sh similarity index 100% rename from pkgs/applications/misc/jekyll/update.sh rename to pkgs/by-name/je/jekyll/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b619ecace3a4..cc828eb8d389 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3965,8 +3965,6 @@ with pkgs; jc = with python3Packages; toPythonApplication jc; - jekyll = callPackage ../applications/misc/jekyll { }; - jello = with python3Packages; toPythonApplication jello; jing = res.jing-trang; From d696a5a53d7e195fa003ee5150fc40b9db7f7ab5 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 10:25:33 +0100 Subject: [PATCH 10/17] coltrane: move by-name --- pkgs/{applications/misc => by-name/co}/coltrane/Gemfile | 0 pkgs/{applications/misc => by-name/co}/coltrane/Gemfile.lock | 0 pkgs/{applications/misc => by-name/co}/coltrane/gemset.nix | 0 .../coltrane/default.nix => by-name/co/coltrane/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/co}/coltrane/Gemfile (100%) rename pkgs/{applications/misc => by-name/co}/coltrane/Gemfile.lock (100%) rename pkgs/{applications/misc => by-name/co}/coltrane/gemset.nix (100%) rename pkgs/{applications/misc/coltrane/default.nix => by-name/co/coltrane/package.nix} (100%) diff --git a/pkgs/applications/misc/coltrane/Gemfile b/pkgs/by-name/co/coltrane/Gemfile similarity index 100% rename from pkgs/applications/misc/coltrane/Gemfile rename to pkgs/by-name/co/coltrane/Gemfile diff --git a/pkgs/applications/misc/coltrane/Gemfile.lock b/pkgs/by-name/co/coltrane/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/coltrane/Gemfile.lock rename to pkgs/by-name/co/coltrane/Gemfile.lock diff --git a/pkgs/applications/misc/coltrane/gemset.nix b/pkgs/by-name/co/coltrane/gemset.nix similarity index 100% rename from pkgs/applications/misc/coltrane/gemset.nix rename to pkgs/by-name/co/coltrane/gemset.nix diff --git a/pkgs/applications/misc/coltrane/default.nix b/pkgs/by-name/co/coltrane/package.nix similarity index 100% rename from pkgs/applications/misc/coltrane/default.nix rename to pkgs/by-name/co/coltrane/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc828eb8d389..390d136fc196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1352,8 +1352,6 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - coltrane = callPackage ../applications/misc/coltrane { }; - dosbox = callPackage ../applications/emulators/dosbox { inherit (darwin.apple_sdk.frameworks ) OpenGL; SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat; From 2d0342923eb3f3746e7dd072339ab22c5351feed Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 11:28:50 +0100 Subject: [PATCH 11/17] denaro: move to by-name --- pkgs/{applications/finance => by-name/de}/denaro/deps.nix | 0 .../denaro/default.nix => by-name/de/denaro/package.nix} | 0 pkgs/{applications/finance => by-name/de}/denaro/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{applications/finance => by-name/de}/denaro/deps.nix (100%) rename pkgs/{applications/finance/denaro/default.nix => by-name/de/denaro/package.nix} (100%) rename pkgs/{applications/finance => by-name/de}/denaro/update.sh (100%) diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/by-name/de/denaro/deps.nix similarity index 100% rename from pkgs/applications/finance/denaro/deps.nix rename to pkgs/by-name/de/denaro/deps.nix diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/by-name/de/denaro/package.nix similarity index 100% rename from pkgs/applications/finance/denaro/default.nix rename to pkgs/by-name/de/denaro/package.nix diff --git a/pkgs/applications/finance/denaro/update.sh b/pkgs/by-name/de/denaro/update.sh similarity index 100% rename from pkgs/applications/finance/denaro/update.sh rename to pkgs/by-name/de/denaro/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 390d136fc196..3393a6fb79eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13705,8 +13705,6 @@ with pkgs; plugins = []; }; - denaro = callPackage ../applications/finance/denaro { }; - inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; From b97f7beed1b260dd523bb22fcf410b5500418044 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 12:36:20 +0100 Subject: [PATCH 12/17] xxx-pe: move to by-name --- .../xxe-pe/default.nix => by-name/xx/xxe-pe/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/editors/xxe-pe/default.nix => by-name/xx/xxe-pe/package.nix} (100%) diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/by-name/xx/xxe-pe/package.nix similarity index 100% rename from pkgs/applications/editors/xxe-pe/default.nix rename to pkgs/by-name/xx/xxe-pe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3393a6fb79eb..f674a6288b4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8798,8 +8798,6 @@ with pkgs; xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; - xxe-pe = callPackage ../applications/editors/xxe-pe { }; - xxdiff-tip = xxdiff; ycmd = callPackage ../by-name/yc/ycmd/package.nix { From 427ffbc994f51b26922b47e25bf3c97bdedd7c55 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 12:48:07 +0100 Subject: [PATCH 13/17] botamusique: move to by-name --- .../bo}/botamusique/catch-invalid-versions.patch | 0 .../bo}/botamusique/no-runtime-update.patch | 0 .../bo/botamusique/package.nix} | 0 .../audio => by-name/bo}/botamusique/src.json | 0 .../unconditional-relative-state-paths.patch | 0 pkgs/top-level/all-packages.nix | 13 ------------- 6 files changed, 13 deletions(-) rename pkgs/{tools/audio => by-name/bo}/botamusique/catch-invalid-versions.patch (100%) rename pkgs/{tools/audio => by-name/bo}/botamusique/no-runtime-update.patch (100%) rename pkgs/{tools/audio/botamusique/default.nix => by-name/bo/botamusique/package.nix} (100%) rename pkgs/{tools/audio => by-name/bo}/botamusique/src.json (100%) rename pkgs/{tools/audio => by-name/bo}/botamusique/unconditional-relative-state-paths.patch (100%) diff --git a/pkgs/tools/audio/botamusique/catch-invalid-versions.patch b/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch similarity index 100% rename from pkgs/tools/audio/botamusique/catch-invalid-versions.patch rename to pkgs/by-name/bo/botamusique/catch-invalid-versions.patch diff --git a/pkgs/tools/audio/botamusique/no-runtime-update.patch b/pkgs/by-name/bo/botamusique/no-runtime-update.patch similarity index 100% rename from pkgs/tools/audio/botamusique/no-runtime-update.patch rename to pkgs/by-name/bo/botamusique/no-runtime-update.patch diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/by-name/bo/botamusique/package.nix similarity index 100% rename from pkgs/tools/audio/botamusique/default.nix rename to pkgs/by-name/bo/botamusique/package.nix diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/by-name/bo/botamusique/src.json similarity index 100% rename from pkgs/tools/audio/botamusique/src.json rename to pkgs/by-name/bo/botamusique/src.json diff --git a/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch similarity index 100% rename from pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch rename to pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f674a6288b4d..6c5b9544f868 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -746,7 +746,6 @@ with pkgs; singularity-tools = callPackage ../build-support/singularity-tools { }; - srcOnly = callPackage ../build-support/src-only { }; substitute = callPackage ../build-support/substitute/substitute.nix { }; @@ -1766,8 +1765,6 @@ with pkgs; blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; - botamusique = callPackage ../tools/audio/botamusique { }; - bucklespring = bucklespring-x11; bucklespring-libinput = callPackage ../applications/audio/bucklespring { }; bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; }; @@ -4572,7 +4569,6 @@ with pkgs; apps = lib.importJSON ../servers/nextcloud/packages/30.json; }; - nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -4600,7 +4596,6 @@ with pkgs; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - mkgmap = callPackage ../applications/misc/mkgmap { }; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; @@ -8648,7 +8643,6 @@ with pkgs; inherit (__splicedPackages.haskellPackages) ShellCheck; }; - # Minimal shellcheck executable for package checks. # Use shellcheck which does not include docs, as # pandoc takes long to build and documentation isn't needed for just running the cli @@ -9578,7 +9572,6 @@ with pkgs; gtk4 = callPackage ../development/libraries/gtk/4.x.nix { }; - # On darwin gtk uses cocoa by default instead of x11. gtk3-x11 = gtk3.override { cairo = cairo.override { x11Support = true; }; @@ -11391,7 +11384,6 @@ with pkgs; jdk = jdk8; }; - ### DEVELOPMENT / LIBRARIES / JAVASCRIPT ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) @@ -13743,7 +13735,6 @@ with pkgs; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; - drawio = callPackage ../applications/graphics/drawio { inherit (darwin) autoSignDarwinBinariesHook; }; @@ -15278,7 +15269,6 @@ with pkgs; pythonPackages = python3Packages; }; - notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; @@ -17453,7 +17443,6 @@ with pkgs; xonotic-glx-unwrapped = xonotic-glx.xonotic-unwrapped; xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped; - xpilot-ng = callPackage ../games/xpilot { }; bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { }; bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { }; @@ -17991,7 +17980,6 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; - inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_12 z3_4_11 @@ -19000,7 +18988,6 @@ with pkgs; branch = "development"; }; - discord-screenaudio = qt6Packages.callPackage ../applications/networking/instant-messengers/discord-screenaudio { }; discordo = callPackage ../applications/networking/discordo/default.nix { }; From fb61e646af0033d107b479e4952641fc1a7988b6 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 12:52:49 +0100 Subject: [PATCH 14/17] loudgain: move to by-name --- pkgs/{tools/audio => by-name/lo}/loudgain/fix-gcc-14.patch | 0 .../loudgain/default.nix => by-name/lo/loudgain/package.nix} | 0 .../{tools/audio => by-name/lo}/loudgain/support-ffmpeg-5.patch | 0 .../{tools/audio => by-name/lo}/loudgain/support-ffmpeg-7.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/audio => by-name/lo}/loudgain/fix-gcc-14.patch (100%) rename pkgs/{tools/audio/loudgain/default.nix => by-name/lo/loudgain/package.nix} (100%) rename pkgs/{tools/audio => by-name/lo}/loudgain/support-ffmpeg-5.patch (100%) rename pkgs/{tools/audio => by-name/lo}/loudgain/support-ffmpeg-7.patch (100%) diff --git a/pkgs/tools/audio/loudgain/fix-gcc-14.patch b/pkgs/by-name/lo/loudgain/fix-gcc-14.patch similarity index 100% rename from pkgs/tools/audio/loudgain/fix-gcc-14.patch rename to pkgs/by-name/lo/loudgain/fix-gcc-14.patch diff --git a/pkgs/tools/audio/loudgain/default.nix b/pkgs/by-name/lo/loudgain/package.nix similarity index 100% rename from pkgs/tools/audio/loudgain/default.nix rename to pkgs/by-name/lo/loudgain/package.nix diff --git a/pkgs/tools/audio/loudgain/support-ffmpeg-5.patch b/pkgs/by-name/lo/loudgain/support-ffmpeg-5.patch similarity index 100% rename from pkgs/tools/audio/loudgain/support-ffmpeg-5.patch rename to pkgs/by-name/lo/loudgain/support-ffmpeg-5.patch diff --git a/pkgs/tools/audio/loudgain/support-ffmpeg-7.patch b/pkgs/by-name/lo/loudgain/support-ffmpeg-7.patch similarity index 100% rename from pkgs/tools/audio/loudgain/support-ffmpeg-7.patch rename to pkgs/by-name/lo/loudgain/support-ffmpeg-7.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c5b9544f868..9716192bb3f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4141,8 +4141,6 @@ with pkgs; lolcat = callPackage ../tools/misc/lolcat { }; - loudgain = callPackage ../tools/audio/loudgain/default.nix { }; - lsyncd = callPackage ../applications/networking/sync/lsyncd { lua = lua5_2_compat; }; From 687fa135815cda7e95c69fa81cf80d5f6325aa32 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 12:57:30 +0100 Subject: [PATCH 15/17] mpdcron: move to by-name --- pkgs/{tools/audio => by-name/mp}/mpdcron/Gemfile | 0 pkgs/{tools/audio => by-name/mp}/mpdcron/Gemfile.lock | 0 .../mp}/mpdcron/fix-canonicalize-conflict-with-glibc.patch | 0 pkgs/{tools/audio => by-name/mp}/mpdcron/gemset.nix | 0 .../mpdcron/default.nix => by-name/mp/mpdcron/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{tools/audio => by-name/mp}/mpdcron/Gemfile (100%) rename pkgs/{tools/audio => by-name/mp}/mpdcron/Gemfile.lock (100%) rename pkgs/{tools/audio => by-name/mp}/mpdcron/fix-canonicalize-conflict-with-glibc.patch (100%) rename pkgs/{tools/audio => by-name/mp}/mpdcron/gemset.nix (100%) rename pkgs/{tools/audio/mpdcron/default.nix => by-name/mp/mpdcron/package.nix} (100%) diff --git a/pkgs/tools/audio/mpdcron/Gemfile b/pkgs/by-name/mp/mpdcron/Gemfile similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile rename to pkgs/by-name/mp/mpdcron/Gemfile diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/by-name/mp/mpdcron/Gemfile.lock similarity index 100% rename from pkgs/tools/audio/mpdcron/Gemfile.lock rename to pkgs/by-name/mp/mpdcron/Gemfile.lock diff --git a/pkgs/tools/audio/mpdcron/fix-canonicalize-conflict-with-glibc.patch b/pkgs/by-name/mp/mpdcron/fix-canonicalize-conflict-with-glibc.patch similarity index 100% rename from pkgs/tools/audio/mpdcron/fix-canonicalize-conflict-with-glibc.patch rename to pkgs/by-name/mp/mpdcron/fix-canonicalize-conflict-with-glibc.patch diff --git a/pkgs/tools/audio/mpdcron/gemset.nix b/pkgs/by-name/mp/mpdcron/gemset.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/gemset.nix rename to pkgs/by-name/mp/mpdcron/gemset.nix diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/by-name/mp/mpdcron/package.nix similarity index 100% rename from pkgs/tools/audio/mpdcron/default.nix rename to pkgs/by-name/mp/mpdcron/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9716192bb3f5..42d6011dfb91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2605,8 +2605,6 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }; - mpdcron = callPackage ../tools/audio/mpdcron { }; - mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; From 2b331f344cca4c5460ea8d3844ea608754479148 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 13:07:22 +0100 Subject: [PATCH 16/17] castopod: move to by-name --- .../castopod/default.nix => by-name/ca/castopod/package.nix} | 0 pkgs/{applications/audio => by-name/ca}/castopod/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/audio/castopod/default.nix => by-name/ca/castopod/package.nix} (100%) rename pkgs/{applications/audio => by-name/ca}/castopod/update.sh (100%) diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/by-name/ca/castopod/package.nix similarity index 100% rename from pkgs/applications/audio/castopod/default.nix rename to pkgs/by-name/ca/castopod/package.nix diff --git a/pkgs/applications/audio/castopod/update.sh b/pkgs/by-name/ca/castopod/update.sh similarity index 100% rename from pkgs/applications/audio/castopod/update.sh rename to pkgs/by-name/ca/castopod/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d6011dfb91..23cb13f8f5e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1772,8 +1772,6 @@ with pkgs; buildbotPackages = recurseIntoAttrs (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot { }); inherit (buildbotPackages) buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker; - castopod = callPackage ../applications/audio/castopod { }; - certipy = with python3Packages; toPythonApplication certipy-ad; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; From cd04f10e7e21a0dd354cd12b1f85e68bf4bb1b05 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 21 Nov 2024 13:40:02 +0100 Subject: [PATCH 17/17] psst: move to by-name --- pkgs/{applications/audio => by-name/ps}/psst/Cargo.lock | 0 .../audio => by-name/ps}/psst/make-build-reproducible.patch | 0 .../audio/psst/default.nix => by-name/ps/psst/package.nix} | 0 pkgs/{applications/audio => by-name/ps}/psst/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/audio => by-name/ps}/psst/Cargo.lock (100%) rename pkgs/{applications/audio => by-name/ps}/psst/make-build-reproducible.patch (100%) rename pkgs/{applications/audio/psst/default.nix => by-name/ps/psst/package.nix} (100%) rename pkgs/{applications/audio => by-name/ps}/psst/update.sh (100%) diff --git a/pkgs/applications/audio/psst/Cargo.lock b/pkgs/by-name/ps/psst/Cargo.lock similarity index 100% rename from pkgs/applications/audio/psst/Cargo.lock rename to pkgs/by-name/ps/psst/Cargo.lock diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/by-name/ps/psst/make-build-reproducible.patch similarity index 100% rename from pkgs/applications/audio/psst/make-build-reproducible.patch rename to pkgs/by-name/ps/psst/make-build-reproducible.patch diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/by-name/ps/psst/package.nix similarity index 100% rename from pkgs/applications/audio/psst/default.nix rename to pkgs/by-name/ps/psst/package.nix diff --git a/pkgs/applications/audio/psst/update.sh b/pkgs/by-name/ps/psst/update.sh similarity index 100% rename from pkgs/applications/audio/psst/update.sh rename to pkgs/by-name/ps/psst/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23cb13f8f5e3..461590622d78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15839,8 +15839,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - psst = callPackage ../applications/audio/psst { }; - squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; };