diff options
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/gcc/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/ghc/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/helium/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/helium/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/j2sdk/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/j2sdk/default.nix | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/jikes/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/jikes/default.nix | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/strategoxt/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/strategoxt/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/compilers/tiger/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/tiger/default.nix | 4 |
14 files changed, 10 insertions, 32 deletions
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index a5aa83cc61147..c97c9823b34f7 100755..100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - . $stdenv/setup diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index cedd38dac843b..46b6a2d863e3e 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -4,13 +4,12 @@ assert langC; -derivation { +stdenv.mkDerivation { name = "gcc-3.3.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2; md5 = "3c6cfd9fcd180481063b4058cf6faff2"; }; - inherit stdenv noSysDirs langC langCC langF77; + inherit noSysDirs langC langCC langF77; } diff --git a/pkgs/development/compilers/ghc/builder.sh b/pkgs/development/compilers/ghc/builder.sh index 9a2a235158f56..168ca0cbab7d4 100755..100644 --- a/pkgs/development/compilers/ghc/builder.sh +++ b/pkgs/development/compilers/ghc/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$perl $ghc $m4" . $stdenv/setup || exit 1 diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix index 5872c81eb8bca..fafd3982aa751 100644 --- a/pkgs/development/compilers/ghc/default.nix +++ b/pkgs/development/compilers/ghc/default.nix @@ -2,13 +2,12 @@ assert perl != null && ghc != null && m4 != null; -derivation { +stdenv.mkDerivation { name = "ghc-6.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-src.tar.bz2; md5 = "cc495e263f4384e1d6b38e851bf6eca0"; }; - inherit stdenv perl ghc m4; + inherit perl ghc m4; } diff --git a/pkgs/development/compilers/helium/builder.sh b/pkgs/development/compilers/helium/builder.sh index 82667936e43e0..d7946ab8a52da 100755..100644 --- a/pkgs/development/compilers/helium/builder.sh +++ b/pkgs/development/compilers/helium/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$ghc" . $stdenv/setup || exit 1 diff --git a/pkgs/development/compilers/helium/default.nix b/pkgs/development/compilers/helium/default.nix index e45aab344e845..ac4ef2fb20d2a 100644 --- a/pkgs/development/compilers/helium/default.nix +++ b/pkgs/development/compilers/helium/default.nix @@ -2,13 +2,12 @@ assert ghc != null; -derivation { +stdenv.mkDerivation { name = "helium-1.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.cs.uu.nl/helium/distr/helium-1.2-src.tar.gz; md5 = "6ea1d6e4436e137d75f5354b4758f299"; }; - inherit stdenv ghc; + inherit ghc; } diff --git a/pkgs/development/compilers/j2sdk/builder.sh b/pkgs/development/compilers/j2sdk/builder.sh index 3cf67f8f4ceed..1f19cde82a813 100755..100644 --- a/pkgs/development/compilers/j2sdk/builder.sh +++ b/pkgs/development/compilers/j2sdk/builder.sh @@ -1,4 +1,3 @@ -#!/bin/sh . $stdenv/setup || exit 1 version=j2sdk1.4.2_03 diff --git a/pkgs/development/compilers/j2sdk/default.nix b/pkgs/development/compilers/j2sdk/default.nix index 91b60e7fa2872..aae1537011069 100644 --- a/pkgs/development/compilers/j2sdk/default.nix +++ b/pkgs/development/compilers/j2sdk/default.nix @@ -3,7 +3,6 @@ if stdenv.system == "i686-linux" then (import ./j2sdk-sun-linux.nix) { - stdenv = stdenv; fetchurl = fetchurl; } else diff --git a/pkgs/development/compilers/jikes/builder.sh b/pkgs/development/compilers/jikes/builder.sh index 7e0cd9e13610f..35b2aa8cc97b7 100755..100644 --- a/pkgs/development/compilers/jikes/builder.sh +++ b/pkgs/development/compilers/jikes/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfj $src || exit 1 diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix index cac79a4cad49b..05fd014afc066 100644 --- a/pkgs/development/compilers/jikes/default.nix +++ b/pkgs/development/compilers/jikes/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "jikes-1.18"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2; md5 = "74bbcfd31aa2d7df4b86c5fe2db315cc"; }; - stdenv = stdenv; } diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh index 68289b2f8be12..5ccf79af02b86 100755..100644 --- a/pkgs/development/compilers/strategoxt/builder.sh +++ b/pkgs/development/compilers/strategoxt/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildInputs="$aterm $sdf" . $stdenv/setup diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix index 75f8eacc3da45..b4207a3bb9924 100644 --- a/pkgs/development/compilers/strategoxt/default.nix +++ b/pkgs/development/compilers/strategoxt/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, aterm, sdf}: -derivation { +stdenv.mkDerivation { name = "strategoxt-0.9.4"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.4.tar.gz; md5 = "b61aee784cebac6cce0d96383bdb1b37"; }; - inherit stdenv aterm sdf; + inherit aterm sdf; } diff --git a/pkgs/development/compilers/tiger/builder.sh b/pkgs/development/compilers/tiger/builder.sh index 880cd4c4e0589..aab09f5e1ee31 100755..100644 --- a/pkgs/development/compilers/tiger/builder.sh +++ b/pkgs/development/compilers/tiger/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm $sdf $strategoxt" . $stdenv/setup || exit 1 diff --git a/pkgs/development/compilers/tiger/default.nix b/pkgs/development/compilers/tiger/default.nix index c7185fc659b72..2fd297b8848a5 100644 --- a/pkgs/development/compilers/tiger/default.nix +++ b/pkgs/development/compilers/tiger/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt}: derivation { +{stdenv, fetchurl, aterm, sdf, strategoxt}: stdenv.mkDerivation { name = "tiger-1.3-4631"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/tiger/src/tiger-1.3-4631.tar.gz; md5 = "1ea6070d84134eb6cff7fb32a75ef90a"; }; - stdenv = stdenv; aterm = aterm; sdf = sdf; strategoxt = strategoxt; |