From 6c4a6e83b4665ba1b5effa7d153c587e2668d8ed Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Fri, 5 Sep 2008 17:21:45 +0000 Subject: [PATCH] Move maxima close to scilab. (applications/science/math) Requested by Michael Raskin. svn path=/nixpkgs/trunk/; revision=12812 --- .../{misc => science/math}/maxima/default.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/applications/{misc => science/math}/maxima/default.nix (100%) diff --git a/pkgs/applications/misc/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix similarity index 100% rename from pkgs/applications/misc/maxima/default.nix rename to pkgs/applications/science/math/maxima/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b691c25e9b27..c9e1e4d373f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6440,10 +6440,6 @@ let inherit fetchurl stdenv emacs; }; - maxima = import ../applications/misc/maxima { - inherit fetchurl stdenv clisp; - }; - mercurial = import ../applications/version-management/mercurial { inherit fetchurl stdenv python makeWrapper; }; @@ -7300,6 +7296,10 @@ let ### SCIENCE / MATH + maxima = import ../applications/science/math/maxima { + inherit fetchurl stdenv clisp; + }; + scilab = (import ../applications/science/math/scilab) { inherit stdenv fetchurl lib g77; inherit (gtkLibs) gtk;