nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-15 06:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

added 2 repos and renamed ghc_68_extra to ghc68extraLibs

Browse Source 
svn path=/nixpkgs/trunk/; revision=11109
This commit is contained in:
Marc Weber 2008-03-13 22:55:18 +00:00
parent 9433120f1f
commit 5695543482
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/misc/bleeding-edge-repos/default.nix
View File

@ -45,6 +45,9 @@ args:
happs_plugins = { type="darcs"; url=http://happs.org/repos/HAppS-Plugins; groups="happs"; };
happs_ixset = { type="darcs"; url=http://happs.org/repos/HAppS-IxSet; groups="happs"; };
happs_server = { type="darcs"; url=http://happs.org/repos/HAppS-HTTP; groups="happs"; };
takusen = { type="darcs"; url=http://darcs.haskell.org/takusen/; };
cabal = { type="darcs"; url=http://darcs.haskell.org/cabal; };
# git repositories
hypertable = { type="git"; url="git://scm.hypertable.org/pub/repos/hypertable.git"; groups=""; };

0
pkgs/misc/ghc68_extra_libs/default.nix → pkgs/misc/ghc68extraLibs/default.nix
View File

0
pkgs/misc/ghc68_extra_libs/hdbc_postgresql_patch → pkgs/misc/ghc68extraLibs/hdbc_postgresql_patch
View File

0
pkgs/misc/ghc68_extra_libs/takusen_setup_patch → pkgs/misc/ghc68extraLibs/takusen_setup_patch
View File

10
pkgs/top-level/all-packages.nix
View File

@ -159,7 +159,7 @@ rec {
";
};
# example usage
#testSourceWithTags = sourceWithTagsDerivation (ghc68_extra_libs ghcsAndLibs.ghc68).happs_server_darcs.passthru.sourceWithTags;
#testSourceWithTags = sourceWithTagsDerivation (ghc68extraLibs ghcsAndLibs.ghc68).happs_server_darcs.passthru.sourceWithTags;
addCTaggingInfo = deriv :
deriv // {
@ -1169,7 +1169,7 @@ rec {
flapjax = import ../development/compilers/flapjax {
inherit fetchurl stdenv;
ghc = ghcsAndLibs.ghc68.ghc;
libs = with (ghc68_extra_libs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ mtl parsec random ];
libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ mtl parsec random ];
};
g77 = import ../build-support/gcc-wrapper {
@ -1348,7 +1348,7 @@ rec {
};
# this may change in the future
ghc68_extra_libs = (import ../misc/ghc68_extra_libs ) {
ghc68extraLibs = (import ../misc/ghc68extraLibs ) {
# lib like stuff
inherit bleedingEdgeRepos fetchurl lib addHasktagsTaggingInfo ghcCabalDerivation pkgconfig unzip;
# used (non haskell) libraries (ffi etc)
@ -1374,8 +1374,8 @@ rec {
# (map ( a : __getAttr a ghcsAndLibs.ghc68.core_libs ) [ "cabal" "mtl" "base" ]
# some extra libs
++ (lib.flattenAttrs (ghc68_extra_libs ghcsAndLibs.ghc68) );
# ++ map ( a : __getAttr a (ghc68_extra_libs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ]
++ (lib.flattenAttrs (ghc68extraLibs ghcsAndLibs.ghc68) );
# ++ map ( a : __getAttr a (ghc68extraLibs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ]
inherit ghc;
};