forked from mirrors/nixpkgs
missing files previous patch
svn path=/nixpkgs/trunk/; revision=11565
This commit is contained in:
Marc Weber
parent
79bd6ee48a
commit
05ebf87bbf
56
pkgs/misc/ghc68executables/default.nix
Normal file
56
pkgs/misc/ghc68executables/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
args: with args;
|
||||
let inherit (bleedingEdgeRepos) sourceByName;
|
||||
in
|
||||
# map ghcCabalExecutableFun and add cabal dependency to all
|
||||
lib.mapAttrs ( name_dummy : a : ghcCabalExecutableFun (a // { libsFun = x : (a.libsFun x) ++ [x.cabal_darcs]; } ) )
|
||||
{
|
||||
happy = {
|
||||
name = "happy-1.17";
|
||||
libsFun = x : [x.base x.directory x.haskell98 x.mtl];
|
||||
src = fetchurl {
|
||||
url = "http://hackage.haskell.org/packages/archive/happy/1.17/happy-1.17.tar.gz";
|
||||
sha256 = "0aqaqy27fkkilj3wk03krx2gdgrw5hynn8wnahrkimg52xyy996w";
|
||||
};
|
||||
meta = {
|
||||
executables = ["happy"];
|
||||
description = "A lexical analyser generator for Haskell";
|
||||
homepage = http://www.haskell.org/happy/;
|
||||
license = "BSD3";
|
||||
};
|
||||
pass = {
|
||||
patchPhase = '' sed -e "s/buildVerbose flags/fromFlag (buildVerbose flags)/g" -e "s/BuildFlags(..)/BuildFlags(..), fromFlag/g" -i Setup.lhs '';
|
||||
};
|
||||
};
|
||||
alex = {
|
||||
name = "alex-2.2";
|
||||
libsFun = x : [x.base x.haskell98];
|
||||
src = fetchurl {
|
||||
url = "http://hackage.haskell.org/packages/archive/alex/2.2/alex-2.2.tar.gz";
|
||||
sha256 = "1zhzlhwljbd52hwd8dm7fcbinfzjhal5x91rvi8x7cgxdkyd8n79";
|
||||
};
|
||||
meta = {
|
||||
executables = ["alex"];
|
||||
description = "tool generating lexical analysers";
|
||||
homepage = http://www.haskell.org/alex/;
|
||||
license = "BSD3";
|
||||
};
|
||||
pass = {
|
||||
patchPhase = '' sed -e "s/buildVerbose flags/fromFlag (buildVerbose flags)/g" -e "s/BuildFlags(..)/BuildFlags(..), fromFlag/g" -i Setup.lhs '';
|
||||
};
|
||||
};
|
||||
xmonad = {
|
||||
name = "xmonad-darcs";
|
||||
libsFun = x : [x.base x.mtl x.unix x.x11 x.x11extras xmessage ];
|
||||
src = sourceByName "xmonad";
|
||||
};
|
||||
darcs_unstable = {
|
||||
name = "darcs_unstable";
|
||||
libsFun = x : [x.base x.haskell98 x.http_darcs x.regex_compat x.quickcheck x.bytestring x.parsec x.html x.containers];
|
||||
src = sourceByName "pg_darcsone";
|
||||
pass = {
|
||||
buildInputs = [ autoconf zlib ];
|
||||
postUnpack = "cd nix_*; pwd; autoconf; cd ..";
|
||||
NIX_LDFLAGS = "-lz";
|
||||
};
|
||||
};
|
||||
}
|
||||
73
pkgs/misc/ghc68extraLibs/hsql-mysql-patch
Normal file
73
pkgs/misc/ghc68extraLibs/hsql-mysql-patch
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
--- b/Setup.lhs 2008-04-04 19:21:06.000000000 +0200
|
||||
+++ a/Setup.lhs 2008-04-04 19:43:42.000000000 +0200
|
||||
@@ -1,12 +1,14 @@
|
||||
+-- packages: process, Cabal, directory, filepath
|
||||
#!/usr/bin/runghc
|
||||
|
||||
\begin{code}
|
||||
import Data.Maybe(fromMaybe)
|
||||
import Distribution.PackageDescription
|
||||
+import Distribution.Verbosity
|
||||
+import Distribution.PackageDescription.Parse
|
||||
import Distribution.Setup
|
||||
import Distribution.Simple
|
||||
import Distribution.Simple.LocalBuildInfo
|
||||
-import Distribution.Simple.Utils(rawSystemVerbose)
|
||||
import System.Info
|
||||
import System.Exit
|
||||
import System.Directory
|
||||
@@ -15,19 +17,19 @@
|
||||
import Control.Monad(when)
|
||||
import Control.Exception(try)
|
||||
|
||||
+
|
||||
main = defaultMainWithHooks defaultUserHooks{preConf=preConf, postConf=postConf}
|
||||
where
|
||||
preConf :: [String] -> ConfigFlags -> IO HookedBuildInfo
|
||||
preConf args flags = do
|
||||
try (removeFile "MySQL.buildinfo")
|
||||
return emptyHookedBuildInfo
|
||||
- postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ExitCode
|
||||
+ postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
|
||||
postConf args flags _ localbuildinfo = do
|
||||
- mb_bi <- mysqlConfigBuildInfo (configVerbose flags)
|
||||
+ mb_bi <- mysqlConfigBuildInfo (fromFlag (configVerbose flags))
|
||||
let default_binfo | os == "mingw32" = emptyBuildInfo{extraLibs=["libmySQL"], ccOptions=["-Dmingw32_HOST_OS"]}
|
||||
| otherwise = emptyBuildInfo{extraLibs=["mysqlclient"]}
|
||||
writeHookedBuildInfo "MySQL.buildinfo" (Just (fromMaybe default_binfo mb_bi),[])
|
||||
- return ExitSuccess
|
||||
\end{code}
|
||||
|
||||
The following code is derived from Distribution.Simple.Configure
|
||||
@@ -46,9 +48,9 @@
|
||||
message ("Using " ++ name ++ ": " ++ path)
|
||||
return (Just path)
|
||||
|
||||
-rawSystemGrabOutput :: Int -> FilePath -> [String] -> IO String
|
||||
+rawSystemGrabOutput :: Verbosity -> FilePath -> [String] -> IO String
|
||||
rawSystemGrabOutput verbose path args = do
|
||||
- when (verbose > 0) $
|
||||
+ when (verbose > silent ) $
|
||||
putStrLn (path ++ concatMap (' ':) args)
|
||||
(inp,out,err,pid) <- runInteractiveProcess path args Nothing Nothing
|
||||
exitCode <- waitForProcess pid
|
||||
@@ -67,7 +69,7 @@
|
||||
|
||||
Populate BuildInfo using pkg-config tool.
|
||||
\begin{code}
|
||||
-mysqlConfigBuildInfo :: Int -> IO (Maybe BuildInfo)
|
||||
+mysqlConfigBuildInfo :: Verbosity -> IO (Maybe BuildInfo)
|
||||
mysqlConfigBuildInfo verbose = do
|
||||
mb_mysql_config_path <- findProgram "mysql_config" Nothing
|
||||
case mb_mysql_config_path of
|
||||
--- a/hsql-mysql.cabal 2008-04-07 17:36:32.000000000 +0200
|
||||
+++ b/hsql-mysql.cabal 2008-04-07 17:34:17.000000000 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
category: Database
|
||||
description: MySQL driver for HSQL.
|
||||
exposed-modules: Database.HSQL.MySQL
|
||||
-build-depends: base, hsql
|
||||
+build-depends: base, hsql, old-time
|
||||
extensions: ForeignFunctionInterface, CPP
|
||||
cc-options: -IDatabase/HSQL
|
||||
extra-source-files: Database/HSQL/HsMySQL.h
|
||||
Loading…
Reference in a new issue