diff options
author | Marc Weber <marco-oweber@gmx.de> | 2008-12-20 01:20:35 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2008-12-20 01:20:35 +0000 |
commit | e996113be7f41f067aaefac881c540b5ceb8d2d4 (patch) | |
tree | 177f16552ca2d05020c3d45a0b45502556a09502 /pkgs/development/compilers | |
parent | 5ab6464edb9bbc2a9aa15122ffc02b57ad236bb7 (diff) |
removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now svn path=/nixpkgs/trunk/; revision=13661
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/bigloo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/hugs/default.nix | 101 | ||||
-rw-r--r-- | pkgs/development/compilers/roadsend/default.nix | 54 |
3 files changed, 80 insertions, 79 deletions
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 53e1099a069e7..efb762b20185d 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "bigloo3.1b"; + name = "bigloo3.2a-alpha04Dec08"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${name}.tar.gz"; - sha256 = "1m7mrrrqm6668j6x834mclzc9am63wlf0knm4xiwrhv3zcky8vnv"; + sha256 = "1sqzqlg6zrmh9980qk5w7rm9jnb85zsf3nqy0741ibx30wvbrki9"; }; patchPhase = '' diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix index 1918f8f372b2f..c910d88ccb19f 100644 --- a/pkgs/development/compilers/hugs/default.nix +++ b/pkgs/development/compilers/hugs/default.nix @@ -1,57 +1,56 @@ -args: with args.lib; with args; -let - co = chooseOptionsByFlags { - inherit args; - flagDescr = { - # does without X make sense? We can try - mandatory ={ cfgOption = [ "--prefix=\$out" ]; implies = "pthreads"; }; - pathcanonicalization = { cfgOption = "--enable-path-canonicalization"; }; # enable canonicalization of filenames - timer = { cfgOption = "--enable-timer"; };# enable evaluation timing (for benchmarking Hugs) - profiling = { cfgOption = "--enable-profiling"; };# enable heap profiler - stack = { cfgOption = "--enable-stack-dumps"; };#-dumps enable stack dump on stack overflow - large = { cfgOption = "--disable-large-banner"; };#-banner disable multiline startup banner - internal = { cfgOption = "--enable-internal-prims"; };#-prims experimental primitives to access Hugs's innards - debug = { cfgOption = "--enable-debug"; };# include C debugging information (for debugging Hugs) - tag = { cfgOption = "--enable-tag-checks"; };#-checks runtime tag checking (for debugging Hugs) - lint = { cfgOption = "--enable-lint"; };# enable "lint" flags (for debugging Hugs) - only98 = { cfgOption = "--enable-only98"; };# build Hugs to understand Haskell 98 only - ffi = { cfgOption = "--enable-ffi"; };# include modules that use the FFI [default=autodetect] - char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; }; - #-encoding encode all character I/O using the byte encoding - #determined by the locale in effect at that time. To - #require that the UTF-8 encoding is always used, give - #the --enable-char-encoding=utf8 option. - #[default=autodetect] - utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; }; - - - #--with-nmake produce a Makefile compatible with nmake - #--with-gui build Hugs for Windows GUI (Borland C++ only) - pthreads = { cfgOption = "--with-pthreads"; }; # build Hugs using POSIX threads C library - # I think we need this as long as not using nptl ? +args: with args; +let edf = composableDerivation.edf; + wwf = composableDerivation.wwf; in +composableDerivation.composableDerivation { + initial = { - }; - optionals = []; - defaultFlags = ["ffi"]; - }; - -in args.stdenv.mkDerivation { - - # passing the flags in case a library using this want's to check them (*) .. - inherit (co) /* flags */ buildInputs; + name="hugs98"; - configurePhase="./configure --prefix=\$out"; - - src = fetchurl { - url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; - sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; + src = fetchurl { + url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; + sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6"; }; - name="hugs98"; - - meta = { - license = "as-is"; # gentoo is calling it this way.. - description = "The HUGS98 Haskell <interpreter"; - homepage = http://www.haskell.org/hugs; + #encode all character I/O using the byte encoding + #determined by the locale in effect at that time. To + #require that the UTF-8 encoding is always used, give + #the --enable-char-encoding=utf8 option. + #[default=autodetect] + postUnpack = '' + find -type f | xargs sed -i 's@/bin/cp@cp@'; + ''; + configurePhase="./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags"; + + flags = + edf { name = "pathCanonicalization"; feat="path-canonicalization"; } + // edf { name="timer"; } # enable evaluation timing (for benchmarking Hugs) + // edf { name="profiling"; }# enable heap profiler + // edf { name="stackDumps"; feat="stack-dummps"; } # enable stack dump on stack overflow + // edf { name="largeBanner"; feat="large-banner"; } # disable multiline startup banner + // edf { name="internal-prims"; } # experimental primitives to access Hugs's innards + // edf { name="debug"; } # include C debugging information (for debugging Hugs) + // edf { name="tag"; } # runtime tag checking (for debugging Hugs) + // edf { name="lint"; } # enable "lint" flags (for debugging Hugs) + // edf { name="only98"; } # build Hugs to understand Haskell 98 only + // edf { name="ffi"; } + #--with-nmake produce a Makefile compatible with nmake + #--with-gui build Hugs for Windows GUI (Borland C++ only) + // wwf { name="pthreads"; } # build Hugs using POSIX threads C library + ; + + cfg = { + largeBannerSupport = true; # seems to be default + + + char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; }; + utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; }; + + }; + + meta = { + license = "as-is"; # gentoo is calling it this way.. + description = "The HUGS98 Haskell <interpreter"; + homepage = http://www.haskell.org/hugs; + }; }; } diff --git a/pkgs/development/compilers/roadsend/default.nix b/pkgs/development/compilers/roadsend/default.nix index c7b04f8710908..c6d2249c8947d 100644 --- a/pkgs/development/compilers/roadsend/default.nix +++ b/pkgs/development/compilers/roadsend/default.nix @@ -1,31 +1,33 @@ -args: -let edf = args.lib.enableDisableFeature; in -( args.mkDerivationByConfiguration { - flagConfig = { - mandatory = { buildInputs = ["bigloo" "curl"]; }; - } // edf "pcre" "pcre" { } #support pcre extension [default=check] - // edf "fcgi" "fcgi" { pass = "fcgi"; } #support FastCGI web backend [default=check] - // edf "xml" "xml" { pass ="libxml2"; } #support xml extension [default=check] - // edf "mysql" "mysql" { pass = "mysql"; } #support mysql extension [default=check] - #// edf "sqlite3=[ARG]" "sqlite3=[ARG]" { } [>use SQLite 3 library [default=yes], optionally - #specify the prefix for sqlite3 library - // edf "odbc" "odbc" { } #support ODBC extension [default=check] - // edf "gtk" "gtk" { } #support PHP-GTK extension [default=no] - // edf "gtk2" "gtk2" { }; #support PHP-GTK 2 extension [default=no] - - optionals = [ "libxml2" "gettext" "fcgi" ]; - extraAttrs = co : { - name = "roadsend-2.9.3"; +args: with args; +let edf = composableDerivation.edf; in +composableDerivation.composableDerivation { + initial = { + name = "roadsend-2.9.3"; + buildInputs = [bigloo curl]; + flags = edf { name = "pcre"; } + // edf { name = "fcgi"; enable = { inherit fcgi; }; } + // edf { name = "xml"; enable = { buildInputs = [ libxml2 ]; }; } + // edf { name = "mysql"; enable = { buildInputs = [ mysql ]; }; } + // edf { name = "odbc"; }; + # // edf { name = "gtk"} } + # // edf { name = "gtk2", enable = { buildInputs = [ mysql ]; } } + cfg = { + pcreSupport = true; + fcgiSupport = true; + xmlSupport = true; + mysqlSupport = true; + }; + src = args.fetchurl { + url = "http://code.roadsend.com/snaps/roadsend-php-20081210.tar.bz2"; + sha256 = "0yhpiik0dyayd964wvn2k0cq7b1gihx1k3qx343r2l7lla4mapsx"; + }; - src = args.fetchurl { - url = "http://code.roadsend.com/snaps/roadsend-php-2.9.4.tar.bz2"; - sha256 = "0nw7rvrrwkss5cp6ws0m3q63q1mcyy27s8yjhy7kn508db1rgl9x"; - }; +# http://code.roadsend.com/snaps/roadsend-php-testsuite-2.9.7.tar.bz2"; +# sha256 = "0rf0g9r0prla7daq3aif24d7dx0j01i35hcm8h5bbg3gvpfim463"; # tell pcc where to find the fastcgi library - postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L \$fcgi)=\" -i \$out/etc/pcc.conf "; - - meta = { + postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L \$fcgi)=\" -i \$out/etc/pcc.conf "; + meta = { description = "roadsend PHP -> C compiler"; homepage = http://www.roadsend.com; # you can choose one of the following licenses: @@ -33,4 +35,4 @@ let edf = args.lib.enableDisableFeature; in license = ["GPL2"]; }; }; -} ) args +} |