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

Merge remote-tracking branch 'origin/master' into systemd

Browse Source
This commit is contained in:
Eelco Dolstra
2013-01-21 13:01:00 +01:00
parent bcc0c1dc59 c6b874be2f
commit 331e7ac221
25 changed files with 241 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/compilers/mit-scheme/default.nix
View File

@@ -1,8 +1,12 @@
{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
let
version = "9.1.1";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
arch = if stdenv.isi686 then "-i386"
else if stdenv.isx86_64 then "-x86-64"
else "";
in
stdenv.mkDerivation {
name = "mit-scheme-${version}";
@@ -25,6 +29,11 @@ stdenv.mkDerivation {
sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
};
configurePhase =
'' (cd src && ./configure)
(cd doc && ./configure)
'';
buildPhase =
'' cd src
${if bootstrapFromC
@@ -42,11 +51,16 @@ stdenv.mkDerivation {
'';
installPhase =
'' make install -C src
make install -C doc
'' make prefix=$out install -C src
make prefix=$out install -C doc
'';
buildNativeInputs = [ gnum4 texinfo texLive automake ];
fixupPhase =
'' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}
'';
buildNativeInputs = [ makeWrapper gnum4 texinfo texLive automake ];
# XXX: The `check' target doesn't exist.
doCheck = false;

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

@@ -40,7 +40,7 @@ stdenv.mkDerivation (rec {
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD);
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
meta = {
description = "The GNU Transport Layer Security Library";

10
pkgs/development/libraries/haskell/JuicyPixels/default.nix
View File

@@ -1,17 +1,17 @@
{ cabal, cereal, deepseq, mtl, primitive, transformers, vector
{ cabal, binary, deepseq, mtl, primitive, transformers, vector
, zlib
}:
cabal.mkDerivation (self: {
pname = "JuicyPixels";
version = "2.0.2";
sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff";
version = "3.0";
sha256 = "1qhhhnfs12r67nf07bx58n8a2v6wikan8cqs1wnjnaad8yk2spsg";
buildDepends = [
cereal deepseq mtl primitive transformers vector zlib
binary deepseq mtl primitive transformers vector zlib
];
meta = {
homepage = "https://github.com/Twinside/Juicy.Pixels";
description = "Picture loading/serialization (in png, jpeg, bitmap and gif)";
description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.3.3";
sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2";
version = "1.3.5";
sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.0.0.0";
sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr";
version = "4.1.2.0";
sha256 = "1kbilad4ry8lyfcygajaphkgragmq5js349mjmh1bjn04rhjm54c";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.3.4";
sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77";
version = "0.5.3.5";
sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "mongoDB";
version = "1.3.1";
sha256 = "1qvsb993n5gmchym4zz2pv68mdyir439cfindqdqlvjwam0jf4l5";
version = "1.3.2";
sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y";
buildDepends = [
binary bson cryptohash liftedBase monadControl mtl network parsec
random randomShuffle text transformersBase

4
pkgs/development/libraries/haskell/pandoc-types/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "pandoc-types";
version = "1.9.1";
sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i";
version = "1.10";
sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6";
buildDepends = [ syb ];
meta = {
homepage = "http://johnmacfarlane.net/pandoc";

14
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@@ -1,20 +1,20 @@
{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs
, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl
, network, pandocTypes, parsec, random, syb, tagsoup, temporary
, texmath, time, utf8String, xml, zipArchive, zlib
, dataDefault, extensibleExceptions, filepath, highlightingKate
, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib
}:
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.9.4.5";
sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb";
version = "1.10.0.4";
sha256 = "1zwjwzxgip3zhbs7v7i981f5ch1rrd8i04cmn1gkfxnapbxx6z26";
isLibrary = true;
isExecutable = true;
buildDepends = [
base64Bytestring blazeHtml blazeMarkup citeprocHs
base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault
extensibleExceptions filepath highlightingKate HTTP json mtl
network pandocTypes parsec random syb tagsoup temporary texmath
time utf8String xml zipArchive zlib
text time xml zipArchive zlib
];
configureFlags = "-fblaze_html_0_5";
meta = {

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

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.6.0";
sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx";
version = "0.6.1";
sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yst";
version = "0.3.0.1";
sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv";
version = "0.3.1";
sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation (rec {
buildInputs = [ gnum4 ];
propagatedBuildInputs = [ gmp ];
doCheck = (stdenv.system != "i686-cygwin");
doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);
enableParallelBuilding = true;

10
pkgs/development/python-modules/generic/default.nix
View File

@@ -40,6 +40,8 @@
, preInstall ? ""
, postInstall ? ""
, meta ? {}
, ... } @ attrs:
# Keep extra attributes from ATTR, e.g., `patchPhase', etc.
@@ -48,6 +50,14 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
# default to python's platforms and add maintainer(s) to every
# package
meta = {
platforms = python.meta.platforms;
} // meta // {
maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
};
# checkPhase after installPhase to run tests on installed packages
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";

2
pkgs/development/python-modules/offline-distutils/default.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
unpackPhase = "true";
installPhase = ''
dst="$out/lib/${python.libPrefix}"
dst="$out/lib/${python.libPrefix}/site-packages"
ensureDir $dst/distutils
ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/
cat <<EOF > $dst/distutils/distutils.cfg

4
pkgs/development/tools/haskell/hlint/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.40";
sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x";
version = "1.8.41";
sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q";
isLibrary = true;
isExecutable = true;
buildDepends = [