public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into haskell-snap

Browse Source 
Conflicts:
	pkgs/development/libraries/haskell/comonad-transformers/default.nix
	pkgs/development/libraries/haskell/semigroupoids/default.nix
	pkgs/top-level/haskell-packages.nix
This commit is contained in:
Alexander Foremny
2012-07-26 12:27:59 +02:00
parent 932574a529 da63b3d2e7
commit d987fedd43
53 changed files with 489 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/HsOpenSSL/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HsOpenSSL";
version = "0.10.3.1";
sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py";
version = "0.10.3.2";
sha256 = "15mlllzw8ahvrx259bz5vwisdig7bvkany1qjhmz6y8v2rcplr7f";
buildDepends = [ network time ];
extraLibraries = [ openssl ];
meta = {

7
pkgs/development/libraries/haskell/benchpress/default.nix
View File

@@ -2,12 +2,9 @@
cabal.mkDerivation (self: {
pname = "benchpress";
version = "0.2.2.5";
sha256 = "0md66nnn9ad8f3y0dd411plnza59fvhfd6nibag3a556bpfa0kgs";
version = "0.2.2.6";
sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
buildDepends = [ mtl time ];
patchPhase = ''
sed -i -e 's|mtl .*,|mtl,|' benchpress.cabal
'';
meta = {
homepage = "http://github.com/tibbe/benchpress";
description = "Micro-benchmarking with detailed statistics";

19
pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix Normal file
View File

@@ -0,0 +1,19 @@
{ cabal, comonad, contravariant, distributive, semigroupoids
, semigroups, transformers
}:
cabal.mkDerivation (self: {
pname = "comonad-transformers";
version = "2.1.2";
sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
buildDepends = [
comonad contravariant distributive semigroupoids semigroups
transformers
];
meta = {
homepage = "http://github.com/ekmett/comonad-transformers/";
description = "Comonad transformers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/comonad-transformers/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "comonad-transformers";
version = "2.1.2";
sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
version = "3.0";
sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24";
buildDepends = [
comonad contravariant distributive semigroupoids semigroups
transformers

14
pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix Normal file
View File

@@ -0,0 +1,14 @@
{ cabal, comonad, contravariant, semigroups, transformers }:
cabal.mkDerivation (self: {
pname = "semigroupoids";
version = "1.3.4";
sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
buildDepends = [ comonad contravariant semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/semigroupoids";
description = "Haskell 98 semigroupoids: Category sans id";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/semigroupoids/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroupoids";
version = "1.3.4";
sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
version = "3.0";
sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag";
buildDepends = [ comonad contravariant semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/semigroupoids";

13
pkgs/development/libraries/haskell/snap/loader-static.nix Normal file
View File

@@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "snap-loader-static";
version = "0.9.0";
sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7";
meta = {
homepage = "http://snapframework.com/";
description = "Snap: A Haskell Web Framework: static loader";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/tls/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls";
version = "0.9.7";
sha256 = "0px34l6lw6nv3cbnrgf8ajwja7ifd1pckddmbvrbwk6q459w1pjh";
version = "0.9.8";
sha256 = "022hak5wy47j4zpf2f89zvz4j2586s3d0a5jkxvz54dkqimy63r6";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/vector-space/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-space";
version = "0.8.1";
sha256 = "0khbi46i9q585nhxhf842wsdifcj1i1dqm84hj0r36474rfh55z5";
version = "0.8.2";
sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad";
buildDepends = [ Boolean MemoTrie NumInstances ];
meta = {
homepage = "http://haskell.org/haskellwiki/vector-space";

2
pkgs/development/libraries/mpich2/default.nix
View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared --enable-sharedlib";
buildInputs = [ python perl gfortran ];
propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ];
propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc;
patchPhase =
'' for i in $(find -type f -not -name Makefile.\*)

4
pkgs/development/libraries/opencv/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
, pkgconfig, gstreamer, xineLib, glib }:
let v = "2.4.1"; in
let v = "2.4.2"; in
stdenv.mkDerivation rec {
name = "opencv-${v}";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9";
sha256 = "0a1c4ys78k670dsk1fapylpf8hwfyzy944r9jvwivqh33s0j6039";
};
buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];

2
pkgs/development/libraries/readline/readline-6.2-patches.nix
View File

@@ -3,4 +3,6 @@
patch: [
(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
]

36
pkgs/development/libraries/v8/default.nix
View File

@@ -1,36 +1,42 @@
{ stdenv, fetchsvn, python, scons, readline, makeWrapper }:
{ stdenv, fetchsvn, gyp, readline, python }:
assert readline != null;
let
system = stdenv.system;
arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
version = "3.6.6.25";
version = "3.11.10.15";
in
assert arch != "";
stdenv.mkDerivation rec {
name = "v8-${version}";
src = fetchsvn {
url = "http://v8.googlecode.com/svn/tags/${version}";
sha256 = "2a097cbea29a8488419840245bf7bf85513941ceb22c5ef0a3825bfe5edaa045";
sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi";
};
buildInputs = [python scons readline makeWrapper];
buildPhase = ''
export CXX=`type -p g++`
export CPPPATH=${readline}/include
export LIBPATH=${readline}/lib
scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8
configurePhase = ''
mkdir build/gyp
ln -sv ${gyp}/bin/gyp build/gyp/gyp
'';
buildInputs = [ readline python ];
buildFlags = [
"library=shared"
"console=readline"
"${arch}.release"
];
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib
cp -v libv8.* $out/lib
cp -v d8 $out/bin/d8
cp -vR include $out/
wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib
mv -v out/${arch}.release/d8 $out/bin
mv -v out/${arch}.release/lib.target/libv8.so $out/lib
mv -v include $out/
'';
}