Merge remote-tracking branch 'origin/master' into stdenv-updates.

This commit is contained in:
Peter Simons
2013-06-17 10:14:45 +02:00
105 changed files with 2566 additions and 914 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "atk-2.6.0";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
};
buildInputs = libintlOrEmpty;
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ glib ];

View File

@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
configureFlags =
[ "--enable-tee" ]
++ stdenv.lib.optional xcbSupport "--enable-xcb"

View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
, jasper, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.26.1";
@@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ libX11 ];
buildInputs = [ libX11 libintlOrEmpty ];
nativeBuildInputs = [ pkgconfig ];

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, xz
, gdk_pixbuf, xz, libintlOrEmpty
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@@ -17,12 +17,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
nativeBuildInputs = [ perl pkgconfig ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ]
++ libintlOrEmpty
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];

View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "Agda";
version = "2.3.2";
sha256 = "1xp0qvag6wx6zjwhmb7nm13hp63vlh8h4a2rkc85rsh610m0nynl";
version = "2.3.2.1";
sha256 = "1dlf0cs913ma8wjvra8x6p0lwi1pk7ynbdq4lxgbdfgqkbnh43kr";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@@ -0,0 +1,18 @@
{ cabal, cairo, Chart, colour, dataAccessor, dataAccessorTemplate
, gtk, mtl, time
}:
cabal.mkDerivation (self: {
pname = "Chart-gtk";
version = "0.17";
sha256 = "1i411kdpz75azyhfaryazr0bpij5xcl0y82m9a7k23w8mhybqwc7";
buildDepends = [
cairo Chart colour dataAccessor dataAccessorTemplate gtk mtl time
];
meta = {
homepage = "https://github.com/timbod7/haskell-chart/wiki";
description = "Utility functions for using the chart library with GTK";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -4,13 +4,13 @@
cabal.mkDerivation (self: {
pname = "Chart";
version = "0.16";
sha256 = "1mb8hgxj0i5s7l061pfn49m5f6qdwvmgy6ni7jmg85vpy6b7jra3";
version = "0.17";
sha256 = "1ip1a61ryypwfzj6dc6n6pl92rflf7lqf1760ppjyg05q5pn6qxg";
buildDepends = [
cairo colour dataAccessor dataAccessorTemplate mtl time
];
meta = {
homepage = "http://www.dockerz.net/software/chart.html";
homepage = "https://github.com/timbod7/haskell-chart/wiki";
description = "A library for generating 2D Charts and Plots";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

View File

@@ -1,11 +1,11 @@
{ cabal }:
{ cabal, HUnit, QuickCheck, random, text, vector }:
cabal.mkDerivation (self: {
pname = "ListLike";
version = "3.1.7.1";
sha256 = "1g3i8iz71x3j41ji9xsbh84v5hj3mxls0zqnx27sb31mx6bic4w1";
isLibrary = true;
isExecutable = true;
version = "4.0.0";
sha256 = "13dw8pkj8dwxb81gbcm7gn221zyr3ck9s9s1iv7v1b69chv0zyxk";
buildDepends = [ text vector ];
testDepends = [ HUnit QuickCheck random text vector ];
meta = {
homepage = "http://software.complete.org/listlike";
description = "Generic support for list-like structures";

View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "accelerate-cuda";
version = "0.13.0.2";
sha256 = "1i8p6smj82k9nw0kz17247nzby8k8x0il8d2d3rbps5j03795dfk";
version = "0.13.0.3";
sha256 = "1y0v7w08pywb8qlw0b5aw4f8pkx4bjlfwxpqq2zfqmjsclnlifkb";
buildDepends = [
accelerate binary cryptohash cuda fclabels filepath hashable
hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "accelerate-io";
version = "0.13.0.1";
sha256 = "0wjprbhcddnjqbhmpxiwq73hazdnhafhjj7mpvpxhs9pz1dbv89h";
version = "0.13.0.2";
sha256 = "0lm1kkjs5gbd70k554vi9977v4bxxcxaw39r9wmwxf8nx2qxvshh";
buildDepends = [ accelerate bmp repa vector ];
meta = {
homepage = "https://github.com/AccelerateHS/accelerate-io";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "accelerate";
version = "0.13.0.4";
sha256 = "1rhbvzgafw3cx2wi4zfil4nxcziqpbh20q3nafck30q2xvrwkmwm";
version = "0.13.0.5";
sha256 = "1vqkv3k0w1zy0111a786npf3hypbcg675lbdkv2cf3zx5hqcnn6j";
buildDepends = [ fclabels hashable hashtables ];
meta = {
homepage = "https://github.com/AccelerateHS/accelerate/";

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "acid-state";
version = "0.8.3";
sha256 = "1n7vafw3jz7kmlp5jqn1wv0ip2rcbyfx0cdi2m1a2lvpi6dh97gc";
version = "0.10.0";
sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc";
buildDepends = [
cereal extensibleExceptions filepath mtl network safecopy stm
];

View File

@@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "binary";
version = "0.6.0.0";
sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv";
meta = {
homepage = "https://github.com/kolmodin/binary";
description = "Binary serialisation for Haskell values using lazy ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -0,0 +1,15 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "bytedump";
version = "1.0";
sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
isLibrary = true;
isExecutable = true;
meta = {
homepage = "http://github.com/vincenthz/hs-bytedump";
description = "Flexible byte dump helpers for human readers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "concurrent-extra";
version = "0.7.0.5";
sha256 = "0g1ckrwgdyrlp1m352ivplajqzqhw5ymlkb4miiv7c5i9xyyyqnc";
version = "0.7.0.6";
sha256 = "12wq86hkgy22qydkj4fw6vb7crzv3010c2mkhsph4rdynr0v588i";
buildDepends = [ baseUnicodeSymbols stm unboundedDelays ];
testDepends = [
baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit

View File

@@ -1,34 +1,31 @@
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs
, cryptohash, dataDefault, deepseq, filepath, httpConduit
, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit
, httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck
, random, regexBase, regexTdfa, snapCore, snapServer, tagsoup
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
, time
, random, regexBase, regexTdfa, snapCore, snapServer
, systemFilepath, tagsoup, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, text, time
}:
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.2.2.0";
sha256 = "0kz8v2ip0hmvqnrxgv44g2863z1dql88razl7aa3fw01q56ihz0y";
version = "4.3.0.0";
sha256 = "188j3spdi2mivx5a10whpb09fm8yhg54ddfwc6x0k040c7q3aq0q";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
dataDefault deepseq filepath httpConduit httpTypes lrucache mtl
pandoc parsec random regexBase regexTdfa snapCore snapServer
tagsoup text time
dataDefault deepseq filepath fsnotify httpConduit httpTypes
lrucache mtl pandoc parsec random regexBase regexTdfa snapCore
snapServer systemFilepath tagsoup text time
];
testDepends = [
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash
dataDefault deepseq filepath httpConduit httpTypes HUnit lrucache
mtl pandoc parsec QuickCheck random regexBase regexTdfa snapCore
snapServer tagsoup testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time
dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit
lrucache mtl pandoc parsec QuickCheck random regexBase regexTdfa
snapCore snapServer systemFilepath tagsoup testFramework
testFrameworkHunit testFrameworkQuickcheck2 text time
];
doCheck = false;
patchPhase = ''
sed -i -e 's|cryptohash .*,|cryptohash,|' hakyll.cabal
'';
meta = {
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hashable";
version = "1.2.0.7";
sha256 = "1v70b85g9kx0ikgxpiqpl8dp3w9hdxm75h73g69giyiy7swn9630";
version = "1.2.0.10";
sha256 = "155r7zqc0kisjdslr8d1c04yqwvzwqx4d99c0zla113dvsdjhp37";
buildDepends = [ text ];
testDepends = [
HUnit QuickCheck random testFramework testFrameworkHunit

View File

@@ -0,0 +1,14 @@
{ cabal, text }:
cabal.mkDerivation (self: {
pname = "hflags";
version = "0.1.3";
sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3";
buildDepends = [ text ];
meta = {
homepage = "http://github.com/errge/hflags";
description = "Command line flag parser, very similar to Google's gflags";
license = "Apache-2.0";
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -0,0 +1,27 @@
{ cabal, attoparsec, blazeBuilder, bytedump, cryptohash, HUnit, mtl
, parsec, QuickCheck, random, systemFileio, systemFilepath
, testFramework, testFrameworkQuickcheck2, time, vector, zlib
, zlibBindings
}:
cabal.mkDerivation (self: {
pname = "hit";
version = "0.5.0";
sha256 = "05v49l3k8gwn922d5b5xrzdrakh6bw02bp8hd8yc8163jyazk2vx";
isLibrary = true;
isExecutable = true;
buildDepends = [
attoparsec blazeBuilder cryptohash mtl parsec random systemFileio
systemFilepath time vector zlib zlibBindings
];
testDepends = [
bytedump HUnit QuickCheck testFramework testFrameworkQuickcheck2
time
];
meta = {
homepage = "http://github.com/vincenthz/hit";
description = "Git operations in haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -2,11 +2,10 @@
cabal.mkDerivation (self: {
pname = "hsdns";
version = "1.6";
sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa";
version = "1.6.1";
sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
buildDepends = [ network ];
extraLibraries = [ adns ];
noHaddock = true;
meta = {
homepage = "http://github.com/peti/hsdns";
description = "Asynchronous DNS Resolver";

View File

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
ListLike MonadCatchIOTransformers monadControl parallel
transformers transformersBase
];
jailbreak = true;
meta = {
homepage = "http://www.tiresiaspress.us/haskell/iteratee";
description = "Iteratee-based I/O";

View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.2.0.1";
sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb";
version = "1.2.0.2";
sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "shake";
version = "0.10.3";
sha256 = "0dvpjswiiw2s4zh5sjx7qs4xp41bw2wqny0k61pkg5wvgw3b7jmh";
version = "0.10.5";
sha256 = "1abbls2rmpyxpj41c0afvfjh1bw6j6rz1n0w4jhqrmq0d32kpg7a";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@@ -1,19 +1,19 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl
, random, regexPosix, text, time, unixCompat, unorderedContainers
, vector, zlibEnum
, enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers
, mtl, random, regexPosix, text, time, unixCompat
, unorderedContainers, vector, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "snap-core";
version = "0.9.3.1";
sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq";
version = "0.9.4.0";
sha256 = "08afaj4ln4nl7ymdixijzjx8hc7nnr70gz7avpzaanq5nrw0k054";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
bytestringMmap caseInsensitive deepseq enumerator filepath HUnit
MonadCatchIOTransformers mtl random regexPosix text time unixCompat
unorderedContainers vector zlibEnum
bytestringMmap caseInsensitive deepseq enumerator filepath hashable
HUnit MonadCatchIOTransformers mtl random regexPosix text time
unixCompat unorderedContainers vector zlibEnum
];
meta = {
homepage = "http://snapframework.com/";

View File

@@ -0,0 +1,14 @@
{ cabal, dataDefault }:
cabal.mkDerivation (self: {
pname = "template-default";
version = "0.1.1";
sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
buildDepends = [ dataDefault ];
meta = {
homepage = "https://github.com/haskell-pkg-janitors/template-default";
description = "declaring Default instances just got even easier";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -0,0 +1,13 @@
{ cabal, vector }:
cabal.mkDerivation (self: {
pname = "vector-th-unbox";
version = "0.2.0.1";
sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv";
buildDepends = [ vector ];
meta = {
description = "Deriver for Data.Vector.Unboxed using Template Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -0,0 +1,14 @@
{ cabal, libXtst, X11 }:
cabal.mkDerivation (self: {
pname = "xtest";
version = "0.2";
sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
buildDepends = [ X11 ];
extraLibraries = [ libXtst ];
meta = {
description = "Thin FFI bindings to X11 XTest library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "jquery-ui-1.10.2";
name = "jquery-ui-1.10.3";
src = fetchurl {
url = "http://jqueryui.com/resources/download/${name}.custom.zip";
sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl";
sha256 = "1nqh3fmjgy73cbwb5sj775242i6jhz3f5b9fxgrkq00dfvkls779";
};
buildInputs = [ unzip ];
@@ -17,9 +17,13 @@ stdenv.mkDerivation rec {
# For convenience, provide symlinks "jquery.min.js" etc. (i.e.,
# without the version number).
ln -s $out/js/jquery-ui-*.custom.min.js $out/js/jquery-ui.min.js
ln -s $out/js/jquery-1.*.min.js $out/js/jquery.min.js
ln -s $out/css/smoothness/jquery-ui-*.custom.css $out/css/smoothness/jquery-ui.css
pushd $out/js
ln -s jquery-ui-*.custom.js jquery-ui.js
ln -s jquery-ui-*.custom.min.js jquery-ui.min.js
ln -s jquery-1.*.js jquery.js
popd
pushd $out/css/smoothness
ln -s jquery-ui-*.custom.css jquery-ui.css
'';
meta = {

View File

@@ -1,6 +1,6 @@
{ fetchurl, stdenv, libgpgerror }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "libgcrypt-1.5.2";
src = fetchurl {
@@ -34,4 +34,8 @@ stdenv.mkDerivation rec {
homepage = http://gnupg.org/;
platforms = stdenv.lib.platforms.all;
};
}
} # old "as" problem, see #616 and http://gnupg.10057.n7.nabble.com/Fail-to-build-on-freebsd-7-3-td30245.html
// stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686)
{ configureFlags = [ "--disable-aesni-support" ]; }
)

View File

@@ -0,0 +1,51 @@
{stdenv, fetchurl, gmp}:
stdenv.mkDerivation (rec {
name = "mpfr-3.1.2";
src = fetchurl {
url = "mirror://gnu/mpfr/${name}.tar.bz2";
sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
};
buildInputs = [ gmp ];
doCheck = true;
enableParallelBuilding = true;
meta = {
homepage = http://www.mpfr.org/;
description = "GNU MPFR, a library for multiple-precision floating-point arithmetic";
longDescription = ''
The GNU MPFR library is a C library for multiple-precision
floating-point computations with correct rounding. MPFR is
based on the GMP multiple-precision library.
The main goal of MPFR is to provide a library for
multiple-precision floating-point computation which is both
efficient and has a well-defined semantics. It copies the good
ideas from the ANSI/IEEE-754 standard for double-precision
floating-point arithmetic (53-bit mantissa).
'';
license = "LGPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}
//
(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
/* Work around a FreeBSD bug that otherwise leads to segfaults in
the test suite:
http://hydra.bordeaux.inria.fr/build/34862
http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
*/
configureFlags = [ "--disable-thread-safe" ];
}))

View File

@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
};
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ];

View File

@@ -0,0 +1,64 @@
{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }:
stdenv.mkDerivation {
name = "ruby-gpgme-1.0.8";
src = fetchurl {
url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz";
sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb";
};
meta = {
description = ''
Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made
Easy)
'';
homepage = "http://rubyforge.org/projects/ruby-gpgme/";
longDescription = ''
Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy).
GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
easier for applications. It provides a High-Level Crypto API for
encryption, decryption, signing, signature verification and key
management.
'';
};
buildInputs = [ gpgme rubygems hoe ruby ];
buildPhase = ''
${ruby}/bin/ruby extconf.rb
rake gem
'';
installPhase = ''
export HOME=$TMP/home; mkdir -pv "$HOME"
# For some reason, the installation phase doesn't work with the default
# make install command run by gem (we'll fix it and do it ourselves later)
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true
# Create a bare-bones gemspec file so that ruby will recognise the gem
cat <<EOF >"$out/${ruby.gemPath}/specifications/gpgme.gemspec"
Gem::Specification.new do |s|
s.name = 'gpgme'
s.version = '1.0.8'
s.files = Dir['{lib,examples}/**/*']
s.rubyforge_project = 'ruby-gpgme'
s.require_paths = ['lib']
end
EOF
cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8"
mkdir src
mv lib src
sed -i "s/srcdir = ./srcdir = src/" Makefile
make install
mv lib lib.bak
mv src/lib lib
rmdir src
'';
}

View File

@@ -0,0 +1,47 @@
{ stdenv, fetchurl, ncurses, ruby, rubygems }:
stdenv.mkDerivation rec {
name = ''ncursesw-sup-afd962b9c06108ff0643e98593c5605314d76917'';
src = fetchurl {
url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/afd962b9c06108ff0643e98593c5605314d76917.tar.gz";
sha256 = "13i286p4bm8zqg9xh96a1dg7wkywj9m6975gbh3w43d3rmfc1h6a";
};
meta = {
description = ''
Hacked up version of ncurses gem that supports wide characters for
supmua.org
'';
homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby'';
longDescription = ''
This wrapper provides access to the functions, macros, global variables
and constants of the ncurses library. These are mapped to a Ruby Module
named "Ncurses": Functions and external variables are implemented as
singleton functions of the Module Ncurses.
'';
};
buildInputs = [ ncurses rubygems ];
buildPhase = "gem build ncursesw.gemspec";
installPhase = ''
export HOME=$TMP/home; mkdir -pv "$HOME"
# For some reason, the installation phase doesn't work with the default
# make install command run by gem (we'll fix it and do it ourselves later)
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri ncursesw-sup-1.3.1.2.gem || true
# Needed for ruby to recognise the gem
cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications"
cd "$out/${ruby.gemPath}/gems/ncursesw-sup-1.3.1.2"
mkdir src
mv lib src
sed -i "s/srcdir = ./srcdir = src/" Makefile
make install
'';
}

View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, blas, liblapack, gfortran } :
stdenv.mkDerivation rec {
version = "4.0.0";
version = "4.2.0";
name = "suitesparse-${version}";
src = fetchurl {
url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
sha256 = "1nvbdw10wa6654k8sa2vhr607q6fflcywyji5xd767cqpwag4v5j";
sha256 = "0i0ivsc5sr3jdz6nqq4wz5lwxc8rpnkqgddyhqqgfhwzgrcqh9v6";
};
buildInputs = [blas liblapack gfortran] ;
patches = [./disable-metis.patch];