diff --git a/pkgs/development/interpreters/acl2/0001-path-changes-for-nix.patch b/pkgs/by-name/ac/acl2/0001-path-changes-for-nix.patch similarity index 100% rename from pkgs/development/interpreters/acl2/0001-path-changes-for-nix.patch rename to pkgs/by-name/ac/acl2/0001-path-changes-for-nix.patch diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch b/pkgs/by-name/ac/acl2/libipasirglucose4/0001-Support-shared-library-build.patch similarity index 100% rename from pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch rename to pkgs/by-name/ac/acl2/libipasirglucose4/0001-Support-shared-library-build.patch diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/by-name/ac/acl2/libipasirglucose4/default.nix similarity index 100% rename from pkgs/development/interpreters/acl2/libipasirglucose4/default.nix rename to pkgs/by-name/ac/acl2/libipasirglucose4/default.nix diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/by-name/ac/acl2/package.nix similarity index 100% rename from pkgs/development/interpreters/acl2/default.nix rename to pkgs/by-name/ac/acl2/package.nix diff --git a/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch b/pkgs/by-name/cr/crystfel/libccp4-use-hardcoded-syminfo-lib.patch similarity index 100% rename from pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch rename to pkgs/by-name/cr/crystfel/libccp4-use-hardcoded-syminfo-lib.patch diff --git a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch b/pkgs/by-name/cr/crystfel/link-to-argp-standalone-if-needed.patch similarity index 100% rename from pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch rename to pkgs/by-name/cr/crystfel/link-to-argp-standalone-if-needed.patch diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/by-name/cr/crystfel/package.nix similarity index 100% rename from pkgs/applications/science/physics/crystfel/default.nix rename to pkgs/by-name/cr/crystfel/package.nix diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/by-name/gr/graphviz/package.nix similarity index 100% rename from pkgs/tools/graphics/graphviz/default.nix rename to pkgs/by-name/gr/graphviz/package.nix diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/by-name/ip/ipu6-camera-hal/package.nix similarity index 100% rename from pkgs/development/libraries/ipu6-camera-hal/default.nix rename to pkgs/by-name/ip/ipu6-camera-hal/package.nix diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/by-name/ja/jabcode/package.nix similarity index 100% rename from pkgs/development/libraries/jabcode/default.nix rename to pkgs/by-name/ja/jabcode/package.nix diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/by-name/li/libint/package.nix similarity index 100% rename from pkgs/development/libraries/libint/default.nix rename to pkgs/by-name/li/libint/package.nix diff --git a/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch b/pkgs/by-name/li/librealsense/0001-fix-pybind11.patch similarity index 100% rename from pkgs/development/libraries/librealsense/0001-fix-pybind11.patch rename to pkgs/by-name/li/librealsense/0001-fix-pybind11.patch diff --git a/pkgs/development/libraries/librealsense/install-presets.patch b/pkgs/by-name/li/librealsense/install-presets.patch similarity index 100% rename from pkgs/development/libraries/librealsense/install-presets.patch rename to pkgs/by-name/li/librealsense/install-presets.patch diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/by-name/li/librealsense/package.nix similarity index 100% rename from pkgs/development/libraries/librealsense/default.nix rename to pkgs/by-name/li/librealsense/package.nix diff --git a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/pkgs/by-name/li/librealsense/py_pybind11_no_external_download.patch similarity index 100% rename from pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch rename to pkgs/by-name/li/librealsense/py_pybind11_no_external_download.patch diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/by-name/mi/miniupnpd/package.nix similarity index 100% rename from pkgs/tools/networking/miniupnpd/default.nix rename to pkgs/by-name/mi/miniupnpd/package.nix diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/by-name/mt/mtr/package.nix similarity index 100% rename from pkgs/tools/networking/mtr/default.nix rename to pkgs/by-name/mt/mtr/package.nix diff --git a/pkgs/applications/graphics/nufraw/nufraw.thumbnailer b/pkgs/by-name/nu/nufraw/nufraw.thumbnailer similarity index 100% rename from pkgs/applications/graphics/nufraw/nufraw.thumbnailer rename to pkgs/by-name/nu/nufraw/nufraw.thumbnailer diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/by-name/nu/nufraw/package.nix similarity index 100% rename from pkgs/applications/graphics/nufraw/default.nix rename to pkgs/by-name/nu/nufraw/package.nix diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/by-name/nw/nwjs/package.nix similarity index 100% rename from pkgs/development/tools/nwjs/default.nix rename to pkgs/by-name/nw/nwjs/package.nix diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/by-name/pa/pantalaimon/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pantalaimon/default.nix rename to pkgs/by-name/pa/pantalaimon/package.nix diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/by-name/pi/pinegrow/package.nix similarity index 100% rename from pkgs/applications/editors/pinegrow/default.nix rename to pkgs/by-name/pi/pinegrow/package.nix diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/by-name/qu/quarto/package.nix similarity index 100% rename from pkgs/development/libraries/quarto/default.nix rename to pkgs/by-name/qu/quarto/package.nix diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/by-name/ta/tartube/package.nix similarity index 100% rename from pkgs/applications/video/tartube/default.nix rename to pkgs/by-name/ta/tartube/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8951a440a691..151683a8a620 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1426,8 +1426,6 @@ with pkgs; else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; - crystfel = callPackage ../applications/science/physics/crystfel { }; - crystfel-headless = crystfel.override { withGui = false; }; amule-daemon = amule.override { @@ -2438,8 +2436,6 @@ with pkgs; callPackage ../tools/misc/graylog/plugins.nix { graylogPackage = graylog-6_0; } ); - graphviz = callPackage ../tools/graphics/graphviz { }; - graphviz-nox = graphviz.override { withXorg = false; }; @@ -2744,7 +2740,6 @@ with pkgs; ; lerna = lerna_8; - libint = callPackage ../development/libraries/libint { }; libintPsi4 = libint.override { enableFortran = false; enableSSE = false; @@ -2817,8 +2812,6 @@ with pkgs; mcstatus = with python3Packages; toPythonApplication mcstatus; - miniupnpd = callPackage ../tools/networking/miniupnpd { }; - miniupnpd-nftables = miniupnpd.override { firewall = "nftables"; }; mir-qualia = callPackage ../tools/text/mir-qualia { @@ -2841,8 +2834,6 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; - mtr = callPackage ../tools/networking/mtr { }; - mtr-gui = mtr.override { withGtk = true; }; multitran = recurseIntoAttrs ( @@ -3330,8 +3321,6 @@ with pkgs; w3m = w3m-batch; }; - tartube = callPackage ../applications/video/tartube { }; - tartube-yt-dlp = tartube.override { youtube-dl = yt-dlp; }; @@ -4702,7 +4691,6 @@ with pkgs; ### DEVELOPMENT / INTERPRETERS - acl2 = callPackage ../development/interpreters/acl2 { }; acl2-minimal = acl2.override { certifyBooks = false; }; uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { uiua_versionType = "unstable"; }; @@ -5715,8 +5703,6 @@ with pkgs; _7zz = _7zz-rar; }; - nwjs = callPackage ../development/tools/nwjs { }; - nwjs-sdk = nwjs.override { sdk = true; }; @@ -7087,8 +7073,6 @@ with pkgs; qdjango = libsForQt5.callPackage ../development/libraries/qdjango { }; - quarto = callPackage ../development/libraries/quarto { }; - quartoMinimal = quarto.override { rWrapper = null; python3 = null; @@ -8356,8 +8340,6 @@ with pkgs; i7z = qt5.callPackage ../os-specific/linux/i7z { }; - ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { }; - ipu6ep-camera-hal = ipu6-camera-hal.override { ipuVersion = "ipu6ep"; }; @@ -8443,8 +8425,6 @@ with pkgs; cryptodev = linuxPackages.cryptodev; - librealsense = callPackage ../development/libraries/librealsense { }; - librealsenseWithCuda = librealsense.override { cudaSupport = true; }; @@ -9550,8 +9530,6 @@ with pkgs; callPackages ../applications/graphics/inkscape/extensions.nix { } ); - jabcode = callPackage ../development/libraries/jabcode { }; - jabcode-writer = jabcode.override { subproject = "writer"; }; @@ -9819,8 +9797,6 @@ with pkgs; pinegrow6 = pinegrow.override { pinegrowVersion = "6"; }; - pinegrow = callPackage ../applications/editors/pinegrow { }; - pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { }; pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { }; @@ -9877,8 +9853,6 @@ with pkgs; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; - nufraw = callPackage ../applications/graphics/nufraw { }; - nufraw-thumbnailer = nufraw.override { addThumbnailer = true; }; @@ -9925,8 +9899,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { }; - pantalaimon-headless = pantalaimon.override { enableDbusUi = false; };