From f2c540241a5730ec9f8674f53dfbe3b1f858433f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Mar 2007 10:57:24 +0000 Subject: [PATCH] * Refactoring. svn path=/nixpkgs/trunk/; revision=8290 --- .../taxes/aangifte-2005}/builder.sh | 0 .../taxes/aangifte-2005}/default.nix | 0 pkgs/top-level/all-packages.nix | 20 +++++++++---------- 3 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/{evil/belastingdienst => applications/taxes/aangifte-2005}/builder.sh (100%) rename pkgs/{evil/belastingdienst => applications/taxes/aangifte-2005}/default.nix (100%) diff --git a/pkgs/evil/belastingdienst/builder.sh b/pkgs/applications/taxes/aangifte-2005/builder.sh similarity index 100% rename from pkgs/evil/belastingdienst/builder.sh rename to pkgs/applications/taxes/aangifte-2005/builder.sh diff --git a/pkgs/evil/belastingdienst/default.nix b/pkgs/applications/taxes/aangifte-2005/default.nix similarity index 100% rename from pkgs/evil/belastingdienst/default.nix rename to pkgs/applications/taxes/aangifte-2005/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2aba63d8771..73db7f7ef96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2526,6 +2526,12 @@ rec { ### APPLICATIONS + aangifte2005 = import ../applications/taxes/aangifte2005 { + inherit stdenv fetchurl; + inherit (xlibs) libX11 libXext; + patchelf = patchelfNew; + }; + abiword = import ../applications/office/abiword { inherit fetchurl stdenv pkgconfig fribidi libpng popt; inherit (gtkLibs) glib gtk pango; @@ -2732,6 +2738,10 @@ rec { inherit (xlibs) libXft; }; + joe = import ../applications/editors/joe { + inherit stdenv fetchurl; + }; + kuickshow = import ../applications/graphics/kuickshow { inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl; inherit (xlibs) libX11 libXext libSM; @@ -3090,12 +3100,6 @@ rec { ### MISC - aangifte2005 = import ../evil/belastingdienst { - inherit stdenv fetchurl; - inherit (xlibs) libX11 libXext; - patchelf = patchelfNew; - }; - atari800 = import ../misc/emulators/atari800 { inherit fetchurl stdenv unzip zlib SDL; }; @@ -3126,10 +3130,6 @@ rec { x11Support = false; }; - joe = import ../applications/editors/joe { - inherit stdenv fetchurl; - }; - lazylist = import ../misc/tex/lazylist { inherit fetchurl stdenv tetex; };