From 645441c2075e9e449996e7368a918477c6da414e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Sep 2015 20:23:23 +0200
Subject: [PATCH] hello/ex-2 -> hello

---
 doc/meta.xml                                        | 2 +-
 doc/quick-start.xml                                 | 2 +-
 pkgs/applications/misc/hello/{ex-2 => }/default.nix | 0
 pkgs/top-level/all-packages.nix                     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/applications/misc/hello/{ex-2 => }/default.nix (100%)

diff --git a/doc/meta.xml b/doc/meta.xml
index b36f3915ec19..98031612523e 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 8d51f4c30e6e..5ed959abacec 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
similarity index 100%
rename from pkgs/applications/misc/hello/ex-2/default.nix
rename to pkgs/applications/misc/hello/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93004d8949bf..aed68689f7d6 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 { };