From 77d50b03e4388f22e1f36a2621a9287a12a138be Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 31 Aug 2023 22:45:21 +0200 Subject: [PATCH] hello: Move to pkgs/by-name --- pkgs/README.md | 2 +- .../misc/hello/default.nix => by-name/he/hello/package.nix} | 0 pkgs/{applications/misc => by-name/he}/hello/test.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/misc/hello/default.nix => by-name/he/hello/package.nix} (100%) rename pkgs/{applications/misc => by-name/he}/hello/test.nix (100%) diff --git a/pkgs/README.md b/pkgs/README.md index 3fd3098f3b7059f..8833f7d54acab00 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -68,7 +68,7 @@ Now that this is out of the way. To add a package to Nixpkgs: You can have a look at the existing Nix expressions under `pkgs/` to see how it’s done, some of which are also using the [category hierarchy](#category-hierarchy). Here are some good ones: - - GNU Hello: [`pkgs/applications/misc/hello/default.nix`](applications/misc/hello/default.nix). Trivial package, which specifies some `meta` attributes which is good practice. + - GNU Hello: [`pkgs/by-name/he/hello/package.nix`](./by-name/he/hello/package.nix). Trivial package, which specifies some `meta` attributes which is good practice. - GNU cpio: [`pkgs/tools/archivers/cpio/default.nix`](tools/archivers/cpio/default.nix). Also a simple package. The generic builder in `stdenv` does everything for you. It has no dependencies beyond `stdenv`. diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/by-name/he/hello/package.nix similarity index 100% rename from pkgs/applications/misc/hello/default.nix rename to pkgs/by-name/he/hello/package.nix diff --git a/pkgs/applications/misc/hello/test.nix b/pkgs/by-name/he/hello/test.nix similarity index 100% rename from pkgs/applications/misc/hello/test.nix rename to pkgs/by-name/he/hello/test.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292624c41fd3586..b015b3b37f33867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32514,8 +32514,6 @@ with pkgs; heimer = libsForQt5.callPackage ../applications/misc/heimer { }; - hello = callPackage ../applications/misc/hello { }; - hello-wayland = callPackage ../applications/graphics/hello-wayland { }; hello-unfree = callPackage ../applications/misc/hello-unfree { };