From c2fd001fd4728bca9808e47b1339bf2582acf911 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 4 May 2014 12:17:35 +0200 Subject: [PATCH] Remove obsolete Agda-executable package; the compiler is not part of 'Agda'. --- .../compilers/agda/agda-executable.nix | 18 ------------------ .../default.nix => compilers/agda/agda.nix} | 0 .../agda/{agda-stdlib.nix => stdlib.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 ++---- 4 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/compilers/agda/agda-executable.nix rename pkgs/development/{libraries/haskell/Agda/default.nix => compilers/agda/agda.nix} (100%) rename pkgs/development/compilers/agda/{agda-stdlib.nix => stdlib.nix} (100%) diff --git a/pkgs/development/compilers/agda/agda-executable.nix b/pkgs/development/compilers/agda/agda-executable.nix deleted file mode 100644 index f9acff43ef71..000000000000 --- a/pkgs/development/compilers/agda/agda-executable.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, Agda }: - -cabal.mkDerivation (self: { - pname = "Agda-executable"; - version = "2.3.0.1"; - sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Agda ]; - jailbreak = true; - meta = { - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "Command-line program for type-checking and compiling Agda programs"; - license = "unknown"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/compilers/agda/agda.nix similarity index 100% rename from pkgs/development/libraries/haskell/Agda/default.nix rename to pkgs/development/compilers/agda/agda.nix diff --git a/pkgs/development/compilers/agda/agda-stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix similarity index 100% rename from pkgs/development/compilers/agda/agda-stdlib.nix rename to pkgs/development/compilers/agda/stdlib.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 87be3ee67d52..4a8ec0c02661 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -502,8 +502,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x acidState = callPackage ../development/libraries/haskell/acid-state {}; - Agda = callPackage ../development/libraries/haskell/Agda {}; - accelerate = callPackage ../development/libraries/haskell/accelerate {}; accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {}; @@ -2923,8 +2921,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x # Compilers. - AgdaExecutable = callPackage ../development/compilers/agda/agda-executable.nix {}; - AgdaStdlib = callPackage ../development/compilers/agda/agda-stdlib.nix {}; + Agda = callPackage ../development/compilers/agda/agda.nix {}; + AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {}; uhc = callPackage ../development/compilers/uhc {};