diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-22 20:23:23 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-22 20:23:23 +0200 |
| commit | 645441c2075e9e449996e7368a918477c6da414e (patch) | |
| tree | f8d449ae88b04050863cdbc2dc3823019bed7451 | |
| parent | 2a28bc669124190e28f7d62663eee9ce31759bc8 (diff) | |
hello/ex-2 -> hello
| -rw-r--r-- | doc/meta.xml | 2 | ||||
| -rw-r--r-- | doc/quick-start.xml | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/hello/default.nix (renamed from pkgs/applications/misc/hello/ex-2/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/doc/meta.xml b/doc/meta.xml index b36f3915ec19b..98031612523e3 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -61,7 +61,7 @@ $ nix-env -qa hello --meta --json "i686-openbsd", "x86_64-openbsd" ], - "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/ex-2/default.nix:14" + "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" }, "name": "hello-2.9", "system": "x86_64-linux" diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 8d51f4c30e6e3..5ed959abacec5 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -56,7 +56,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen> <listitem> <para>GNU Hello: <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>. Trivial package, which specifies some <varname>meta</varname> attributes which is good practice.</para> </listitem> diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/default.nix index bf63df4d154e1..bf63df4d154e1 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93004d8949bf8..aed68689f7d6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11585,7 +11585,7 @@ let inherit (gnome) gnome_python; }; - hello = callPackage ../applications/misc/hello/ex-2 { }; + hello = callPackage ../applications/misc/hello { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; |