Merge branch 'master' into systemd
This commit is contained in:
Eelco Dolstra
commit
c6c1bc6b0f
@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
|
||||
xlibs.xproto
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
|
||||
sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A range of synthesiser, electric piano and organ emulations";
|
||||
homepage = http://bristol.sourceforge.net;
|
||||
|
||||
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
||||
'' else "";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.imagemagick.org;
|
||||
homepage = http://www.imagemagick.org/;
|
||||
description = "A software suite to create, edit, compose, or convert bitmap images";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
|
||||
, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
|
||||
, libxml2, ncurses, gettext, libunistring
|
||||
, libxml2, ncurses, gettext, libunistring, libidn
|
||||
, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnunet-0.9.3";
|
||||
name = "gnunet-0.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnunet/${name}.tar.gz";
|
||||
sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h";
|
||||
sha256 = "162bahbskhzc0b2pda7v36dckm3p5p9rnbv2w0fbl0xl2gln63aa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libextractor libmicrohttpd libgcrypt gmp curl libtool
|
||||
zlib adns sqlite libxml2 ncurses
|
||||
zlib adns sqlite libxml2 ncurses libidn
|
||||
pkgconfig gettext libunistring makeWrapper
|
||||
];
|
||||
|
||||
@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
|
||||
echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
|
||||
substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
|
||||
done
|
||||
|
||||
# Ensure NSS installation works fine
|
||||
configureFlags="$configureFlags --with-nssdir=$out/lib"
|
||||
patchShebangs src/gns/nss/install-nss-plugin.sh
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
@ -72,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = "GPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo viric ];
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.20121211";
|
||||
version = "3.20130102";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "git-annex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
|
||||
sha256 = "1l5sffcn6mcfk0s808z490s30dbq8m4wi8a11ard35hyf599zawq";
|
||||
sha256 = "0aga3i7rzq21vyj2wq87n4yl5aljzxc69vbzw43nxx9sr2f3xyh5";
|
||||
name = "git-annex-${version}.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "1.8.0.1";
|
||||
version = "1.8.1";
|
||||
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
|
||||
sha1 = "4e7492f7558f3ba2a450c43efa7de3b0b1adc6c1";
|
||||
sha1 = "wfj2pbqf9l56014dm330wb13qgcwx3dc";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ];
|
||||
|
||||
@ -1,24 +1,19 @@
|
||||
{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }:
|
||||
{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad";
|
||||
version = "0.10";
|
||||
sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6";
|
||||
version = "0.11";
|
||||
sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ extensibleExceptions mtl utf8String X11 ];
|
||||
buildDepends = [
|
||||
extensibleExceptions filepath mtl utf8String X11
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://xmonad.org";
|
||||
description = "A tiling window manager";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
];
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace XMonad/Core.hs --replace \
|
||||
'"xmessage"' '"${xmessage}/bin/xmessage"'
|
||||
'';
|
||||
})
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad-contrib";
|
||||
version = "0.10";
|
||||
sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
|
||||
version = "0.11";
|
||||
sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0";
|
||||
buildDepends = [
|
||||
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
|
||||
];
|
||||
|
||||
@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
|
||||
xmonadContrib
|
||||
];
|
||||
configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/xmonad-extras";
|
||||
description = "Third party extensions for xmonad with wacky dependencies";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "man-pages-3.43";
|
||||
name = "man-pages-3.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
|
||||
sha256 = "05fjq8llfxm77mnf2jhly98780xbkakim7b7hbx6kafvvs5zisrf";
|
||||
sha256 = "1lwqrp79xcyhnjlyg1n0imz5wc88lpgv909xxz8bdgbk7c1mky0h";
|
||||
};
|
||||
|
||||
preBuild =
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
s= # Generated upstream information
|
||||
rec {
|
||||
baseName="sbcl";
|
||||
version="1.1.2";
|
||||
name="sbcl-1.1.2";
|
||||
hash="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc";
|
||||
url="mirror://sourceforge/project/sbcl/sbcl/1.1.2/sbcl-1.1.2-source.tar.bz2";
|
||||
sha256="04vp68cf0jfpjwx64iys7hi7qxbk2h7277wiym7k4jgirka08yhc";
|
||||
version="1.1.3";
|
||||
name="${baseName}-${version}";
|
||||
hash="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i";
|
||||
url="mirror://sourceforge/project/sbcl/sbcl/1.1.3/sbcl-1.1.3-source.tar.bz2";
|
||||
sha256="1qy64fy0nvjdgzlmasswgvzg1b2h2rygnnjvlf9vj7wg16i5383i";
|
||||
};
|
||||
buildInputs = with a; [
|
||||
clisp makeWrapper
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
|
||||
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
|
||||
, mp3Support ? true, lame ? null
|
||||
, speexSupport ? true, speex ? null
|
||||
, theoraSupport ? true, libtheora ? null
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
|
||||
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
|
||||
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
|
||||
++ stdenv.lib.optional mp3Support lame
|
||||
++ stdenv.lib.optional speexSupport speex
|
||||
++ stdenv.lib.optional theoraSupport libtheora
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Diff";
|
||||
version = "0.1.3";
|
||||
sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w";
|
||||
version = "0.2.0";
|
||||
sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k";
|
||||
meta = {
|
||||
description = "O(ND) diff algorithm in haskell";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Graphalyze";
|
||||
version = "0.13.0.1";
|
||||
sha256 = "1yk7iglsspbj0kxh5rhjkc6q65vz07vpygiig07w86g2s6gad8am";
|
||||
version = "0.14.0.0";
|
||||
sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg";
|
||||
buildDepends = [
|
||||
bktrees fgl filepath graphviz pandoc random text time
|
||||
];
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
{ cabal, libX11, libXext, libXinerama, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "X11";
|
||||
version = "1.5.0.1";
|
||||
sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
|
||||
buildDepends = [ syb ];
|
||||
extraLibraries = [ libX11 libXext libXinerama ];
|
||||
meta = {
|
||||
homepage = "https://github.com/haskell-pkg-janitors/X11";
|
||||
description = "A binding to the X11 graphics library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -1,13 +1,13 @@
|
||||
{ cabal, hashable, ReadArgs, systemFilepath, text, transformers
|
||||
, unorderedContainers, vector
|
||||
{ cabal, hashable, liftedBase, ReadArgs, systemFilepath, text
|
||||
, transformers, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "basic-prelude";
|
||||
version = "0.3.1.0";
|
||||
sha256 = "15k89z78zjhga36wrvfn8b17hsmlwr1na6xq0gmimivfrdlnz5j0";
|
||||
version = "0.3.2.0";
|
||||
sha256 = "1sdwkh9xrsx8v96d06jll7cqc0p6ykv2y9gnjzpbfx0k3ns69kcj";
|
||||
buildDepends = [
|
||||
hashable ReadArgs systemFilepath text transformers
|
||||
hashable liftedBase ReadArgs systemFilepath text transformers
|
||||
unorderedContainers vector
|
||||
];
|
||||
meta = {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cautious-file";
|
||||
version = "1.0.1";
|
||||
sha256 = "0mlgchvdhw9lhml4pqmxxvx1zcqmkcyl3yx6w3zp0df200njzsws";
|
||||
version = "1.0.2";
|
||||
sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
|
||||
buildDepends = [ filepath ];
|
||||
meta = {
|
||||
description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude-conduit";
|
||||
version = "0.4.2";
|
||||
sha256 = "1p5j519s95cgiy5ig0agbfs4vyay8srzwsimnblij68zz5jjfrzp";
|
||||
version = "0.4.3";
|
||||
sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
|
||||
buildDepends = [
|
||||
classyPrelude conduit monadControl resourcet transformers void
|
||||
xmlConduit
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "classy-prelude";
|
||||
version = "0.4.2";
|
||||
sha256 = "082zqhyswzlnl250g8pf88nmh7pkwxwjwnkp0pm9960qsl6kbn7s";
|
||||
version = "0.4.3";
|
||||
sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q";
|
||||
buildDepends = [
|
||||
basicPrelude hashable systemFilepath text transformers
|
||||
unorderedContainers vector
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "clientsession";
|
||||
version = "0.8.0.1";
|
||||
sha256 = "0r6j15wkyp4akhaxvimjxlwdka7cbm3c3nfk5bvkqan1nrip5rxv";
|
||||
version = "0.8.0.2";
|
||||
sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||
skein tagged
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.5.5";
|
||||
sha256 = "0av12gaxsrfmsbs70y532wfwnpz9v6ymn182dr8phpqn8d9lx2iq";
|
||||
version = "0.5.6";
|
||||
sha256 = "1a5apcds3jjksz7hzw4ag725796axqk9nm5fhn5i4l82zphq2cxs";
|
||||
buildDepends = [
|
||||
liftedBase monadControl resourcet text transformers
|
||||
transformersBase void
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cprng-aes";
|
||||
version = "0.3.1";
|
||||
sha256 = "0z1kpgy9d4yp1vmcparsv3r5g1khv2yqqkr99ac3mgvr6pyh24dk";
|
||||
version = "0.3.2";
|
||||
sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221";
|
||||
buildDepends = [
|
||||
cipherAes cryptoApi cryptoRandomApi entropy random
|
||||
];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-random-api";
|
||||
version = "0.1.0";
|
||||
sha256 = "1zx05hskzdxm0kfj6x9qsx8f659zv77pa189s3xg56i7h18d25md";
|
||||
version = "0.2.0";
|
||||
sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
|
||||
buildDepends = [ entropy ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-crypto-random-api";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cryptohash";
|
||||
version = "0.8.2";
|
||||
sha256 = "0mym1q5sa1pqfffy0p8v12lfim1dlaczppw3c3wjhxgs222303wj";
|
||||
version = "0.8.3";
|
||||
sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
|
||||
buildDepends = [ cereal cryptoApi tagged ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cryptohash";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "dataenc";
|
||||
version = "0.14.0.4";
|
||||
sha256 = "0xnn90nyz4m0rbzykkr5p9270s8dq2bfiz5j7qyzyy5m8vbl15bw";
|
||||
version = "0.14.0.5";
|
||||
sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
meta = {
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ cabal, digestiveFunctors, heist, text, xmlhtml }:
|
||||
{ cabal, digestiveFunctors, heist, mtl, text, xmlhtml }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "digestive-functors-heist";
|
||||
version = "0.5.1.0";
|
||||
sha256 = "1rycf6y1c0car2m71iia929si5iqpc2rdyyxzp326q0rgj94whpk";
|
||||
buildDepends = [ digestiveFunctors heist text xmlhtml ];
|
||||
version = "0.5.1.1";
|
||||
sha256 = "0jdg35xrikqg3r0rziv71g619vnmn8fzsv63b73m72fbj5xvy881";
|
||||
buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
|
||||
meta = {
|
||||
homepage = "http://github.com/jaspervdj/digestive-functors";
|
||||
description = "Heist frontend for the digestive-functors library";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "double-conversion";
|
||||
version = "0.2.0.5";
|
||||
sha256 = "1z23a8sfnq5lady8n2kcina9a7df8lmsliscf85x84dxkd3a1ahf";
|
||||
version = "0.2.0.6";
|
||||
sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "https://github.com/bos/double-conversion";
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ cabal }:
|
||||
{ cabal, filepath }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "file-embed";
|
||||
version = "0.0.4.6";
|
||||
sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp";
|
||||
version = "0.0.4.7";
|
||||
sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi";
|
||||
buildDepends = [ filepath ];
|
||||
meta = {
|
||||
homepage = "https://github.com/snoyberg/file-embed";
|
||||
description = "Use Template Haskell to embed file contents directly";
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "filestore";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "1wbiw3skbbcqi9p97xnhg5lnakq3vyan9v4f68wd3g4swk09xp7l";
|
||||
version = "0.6";
|
||||
sha256 = "1bmsqxrkiqw791h0xwasry3jm56rjsyvl9l5r78209bhiv5v6xk0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fsnotify";
|
||||
version = "0.0.4";
|
||||
sha256 = "0s71zxj48jimzhl7wz9j22g9c09z64g61nfmpy4mlrhpkzn1f8sz";
|
||||
version = "0.0.5";
|
||||
sha256 = "1pi1dpm48igcc8n5cn8hdml8bknxl18kqhjbh6jan839fgmwagb9";
|
||||
buildDepends = [ hinotify systemFileio systemFilepath text time ];
|
||||
meta = {
|
||||
description = "Cross platform library for file creation, modification, and deletion notification";
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "gitit";
|
||||
version = "0.10.0.2";
|
||||
sha256 = "0cnql35h4laqpaymg32dmszwzc74qmbmmjas44gcsd8v5n6f701i";
|
||||
version = "0.10.1.1";
|
||||
sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -4,12 +4,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "graphviz";
|
||||
version = "2999.14.1.0";
|
||||
sha256 = "13fni5sf6cdfvgyh7kqjjdhmjxkhbgl3gbi0cbq90n8blzg4q1ql";
|
||||
version = "2999.15.0.1";
|
||||
sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy";
|
||||
buildDepends = [
|
||||
colour dlist fgl filepath polyparse text transformers wlPprintText
|
||||
];
|
||||
patchPhase = "sed -i -e 's|bytestring.*,|bytestring,|' graphviz.cabal";
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/graphviz/";
|
||||
description = "Bindings to Graphviz for graph visualisation";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "heist";
|
||||
version = "0.10.2";
|
||||
sha256 = "13v9x5dph52xddkb2dy4gfrapvihf1881fin996ag0snbma3wh68";
|
||||
version = "0.10.2.1";
|
||||
sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
|
||||
filepath hashable MonadCatchIOTransformers mtl random text time
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hsemail";
|
||||
version = "1.7.3";
|
||||
sha256 = "0i9qh4rbgcgpjiz7nj8rrmj0ai53s420dskfvwrbwl4j6z67f7la";
|
||||
version = "1.7.4";
|
||||
sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw";
|
||||
buildDepends = [ mtl parsec ];
|
||||
meta = {
|
||||
homepage = "http://gitorious.org/hsemail";
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.8.5.2";
|
||||
sha256 = "0c1a6iknvi34sh97j7cfzwyikcz0kdz4vgsc47lr7c2a75gl0via";
|
||||
version = "1.8.6.1";
|
||||
sha256 = "1vkfld5kn8fql78mw8zwsp524m07kr4a10c411rzpv6xqx92azy7";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cookie
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-date";
|
||||
version = "0.0.3";
|
||||
sha256 = "12iylfzz1d0v0gl4cf31dxcmlg0x7bq5f7acacy2pb0ilrxmzsnn";
|
||||
version = "0.0.4";
|
||||
sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5";
|
||||
buildDepends = [ attoparsec ];
|
||||
meta = {
|
||||
description = "HTTP Date parser/formatter";
|
||||
|
||||
@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
|
||||
mainlandPretty mtl srcloc syb symbol
|
||||
];
|
||||
buildTools = [ alex happy ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~mainland/";
|
||||
description = "C/CUDA/OpenCL quasiquoting library";
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ cabal, aeson, attoparsec, curl, mtl, pureMD5, urlencoded
|
||||
, utf8String, xml
|
||||
{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
|
||||
, pureMD5, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "liblastfm";
|
||||
version = "0.0.3.8";
|
||||
sha256 = "0icx86x3w85z0pqdxcch583j6jk5id5aw9gf24266mgfg5k6iwdy";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x";
|
||||
buildDepends = [
|
||||
aeson attoparsec curl mtl pureMD5 urlencoded utf8String xml
|
||||
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
|
||||
];
|
||||
meta = {
|
||||
description = "Wrapper to Lastfm API";
|
||||
description = "Lastfm API interface";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mainland-pretty";
|
||||
version = "0.2.4";
|
||||
sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq";
|
||||
version = "0.2.5";
|
||||
sha256 = "0h3q7xw69dc0lcqwlacsnv36dlbj0sfgv5imjlqrixy6m5cniq9x";
|
||||
buildDepends = [ srcloc text ];
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~mainland/";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-template";
|
||||
version = "1.1.2";
|
||||
sha256 = "1hz8cxx2a84c93x364vgahmv4xd3cbpjx4j7si5n0pasyq3clbvr";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s";
|
||||
buildDepends = [ aeson monadControl persistent text transformers ];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "1.1.3.1";
|
||||
sha256 = "12gv2gjkrf7qchlv6kj0an8bvpkin8vdhdkxg4ck9ydw7hh292v2";
|
||||
version = "1.1.3.2";
|
||||
sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "random-fu";
|
||||
version = "0.2.3.1";
|
||||
sha256 = "06b4v7012fj1kmnz6i63vbwl9gkhzgk556gmcc62k14299ks8pci";
|
||||
version = "0.2.4.0";
|
||||
sha256 = "1wiwh52qfs699mcj3ylwc97pyabczn6dr8j92qczs89g8vvi91wd";
|
||||
buildDepends = [
|
||||
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
|
||||
transformers vector
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "random-source";
|
||||
version = "0.3.0.2";
|
||||
sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2";
|
||||
version = "0.3.0.4";
|
||||
sha256 = "1gvx9r6vy36lx7fy537zdbnbhpmfxz88a7gh0aiyd2vi7bvnndxy";
|
||||
buildDepends = [
|
||||
flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref
|
||||
syb thExtras
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ cabal, syb }:
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "srcloc";
|
||||
version = "0.3.0";
|
||||
sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz";
|
||||
buildDepends = [ syb ];
|
||||
version = "0.4.0";
|
||||
sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k";
|
||||
meta = {
|
||||
homepage = "http://www.eecs.harvard.edu/~mainland/";
|
||||
description = "Data types for managing source code locations";
|
||||
|
||||
@ -2,12 +2,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tabular";
|
||||
version = "0.2.2.3";
|
||||
sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76";
|
||||
version = "0.2.2.4";
|
||||
sha256 = "103fqbypsgykv6z29jp1s75pd99vra9sfa70krcnlhbk9kbvdyjk";
|
||||
buildDepends = [ csv html mtl ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://patch-tag.com/r/kowey/tabular";
|
||||
homepage = "http://hub.darcs.net/kowey/tabular";
|
||||
description = "Two-dimensional data tables with rendering functions";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-app-static";
|
||||
version = "1.3.0.5";
|
||||
sha256 = "1fz2a30f3imn0m5q6hjkm2xan0ddalhfbzx78pklz4g7k79s1ncn";
|
||||
version = "1.3.1";
|
||||
sha256 = "0r2ghx3nqh7nms8yxa874h5pyagj993r077f8riybjyjp078s2lk";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
|
||||
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-extra";
|
||||
version = "1.3.0.5";
|
||||
sha256 = "0xzsnsf4sdbzkw92xyzmyi6qp2qpbh5dj3579sppcihdq9djj8l8";
|
||||
version = "1.3.1.1";
|
||||
sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by";
|
||||
buildDepends = [
|
||||
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
|
||||
conduit dataDefault dateCache fastLogger httpTypes network
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xss-sanitize";
|
||||
version = "0.3.2";
|
||||
sha256 = "0m7gl232i06i090kbrlz67cs4q3pqf8169m9kjdj41kj6jay1dcx";
|
||||
version = "0.3.3";
|
||||
sha256 = "0xnyp8nwglh4waawijk1q5z8higf8mggh6hp0pp6ys4bm7gsp74a";
|
||||
buildDepends = [
|
||||
attoparsec cssText network tagsoup text utf8String
|
||||
];
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yaml";
|
||||
version = "0.8.1.2";
|
||||
sha256 = "1prk1nxzb84svqr552pgrfxg8kd34zvnh35js8l0q58y9rifxyq0";
|
||||
version = "0.8.2";
|
||||
sha256 = "1c83vxgry1425z4wk2mnijy183pnlhamcra7fvh55rvhq4bql1m8";
|
||||
buildDepends = [
|
||||
aeson attoparsec conduit resourcet text transformers
|
||||
unorderedContainers vector
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-core";
|
||||
version = "1.1.7";
|
||||
sha256 = "1z47h7ghhi8mvmrc0rcwb3si1bq4623i5x127k8fahcy6qk4qls8";
|
||||
version = "1.1.7.1";
|
||||
sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r";
|
||||
buildDepends = [
|
||||
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
|
||||
clientsession conduit cookie failure fastLogger hamlet httpTypes
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zip-archive";
|
||||
version = "0.1.2.1";
|
||||
sha256 = "1c0pjbrkfv44nbpz60b1c4xdbkdk8qaxlkfxl51rb2183gj1gkph";
|
||||
version = "0.1.3.3";
|
||||
sha256 = "0zzps6s6lsv35qv1xx1fwipk2nwv255wpa956mvzbwdr47pgqjwi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ binary digest filepath mtl time utf8String zlib ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, curl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libmicrohttpd-0.9.9";
|
||||
name = "libmicrohttpd-0.9.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
|
||||
sha256 = "0059isy80cmxv44dhngnsc4g25kwxdcfis5yrva199r0vnb8ab6c";
|
||||
sha256 = "0cp2ac6wbk493zslbvbmb5z96h18k496f9id8d2ji7hbdrwzfk6h";
|
||||
};
|
||||
|
||||
buildInputs = [ curl ];
|
||||
|
||||
@ -7,12 +7,15 @@ assert withMesa -> mesa != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "2.9.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "wxwidgets-2.9.3";
|
||||
name = "wxwidgets-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/wxwindows/wxWidgets-2.9.3.tar.bz2";
|
||||
sha256 = "739c31a360b5c46b55904a7fb086f5cdfff0816efbc491d8263349210bf323b2";
|
||||
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
|
||||
sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "SourceGraph";
|
||||
version = "0.7.0.3";
|
||||
sha256 = "04bx7przxha38n9vckcxz3mbcxcws5ifbc1xfm0rg6bn8rym78yb";
|
||||
version = "0.7.0.4";
|
||||
sha256 = "1rxbanvw1dpdnpmrf5gpl12gn9796yq89dnmdxy56mb9qzsm7nm6";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "splot";
|
||||
version = "0.3.7";
|
||||
sha256 = "0mal7zphwzycxm2i0v87vn6gvdb582zy51prngj4w11xgpxd7dg1";
|
||||
version = "0.3.8";
|
||||
sha256 = "188v9c070wn6gr47k5q55gsiph0lj96d96bss76gz7znknfj9rm3";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
40
pkgs/development/tools/misc/automake/automake-1.13.x.nix
Normal file
40
pkgs/development/tools/misc/automake/automake-1.13.x.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "automake-1.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/automake/${name}.tar.xz";
|
||||
sha256 = "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf";
|
||||
};
|
||||
|
||||
buildInputs = [ perl autoconf ];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
# Disable indented log output from Make, otherwise "make.test" will
|
||||
# fail.
|
||||
preCheck = "unset NIX_INDENT_MAKE";
|
||||
inherit doCheck;
|
||||
|
||||
# The test suite can run in parallel.
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
|
||||
# "fixed" path in generated files!
|
||||
dontPatchShebangs = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.gnu.org/software/automake/";
|
||||
description = "GNU Automake, a GNU standard-compliant makefile generator";
|
||||
license = "GPLv2+";
|
||||
|
||||
longDescription = ''
|
||||
GNU Automake is a tool for automatically generating
|
||||
`Makefile.in' files compliant with the GNU Coding
|
||||
Standards. Automake requires the use of Autoconf.
|
||||
'';
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
67
pkgs/games/anki/default.nix
Normal file
67
pkgs/games/anki/default.nix
Normal file
@ -0,0 +1,67 @@
|
||||
{ stdenv, lib, fetchurl
|
||||
, python, pyqt4, pythonPackages
|
||||
# This little flag adds a huge number of dependencies, but we assume that
|
||||
# everyone wants Anki to draw plots with statistics by default.
|
||||
, plotsSupport ? true }:
|
||||
|
||||
let
|
||||
py = pythonPackages;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "anki-2.0.3";
|
||||
src = fetchurl {
|
||||
url = "http://ankisrs.net/download/mirror/${name}.tgz";
|
||||
sha256 = "f40ee4ef29c91101cf9978ce7bd4c513f13ca7c77497a3fb50b8128adf3a5178";
|
||||
};
|
||||
|
||||
pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy ]
|
||||
++ lib.optional plotsSupport py.matplotlib;
|
||||
|
||||
buildInputs = [ python py.wrapPython ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace anki \
|
||||
--replace /usr/share/ $out/share/
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace PREFIX=/usr PREFIX=$out \
|
||||
--replace /local/bin/ /bin/
|
||||
|
||||
sed -i '/xdg-mime/ d' Makefile
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/pixmaps
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $out/share/man/man1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://ankisrs.net/;
|
||||
description = "Spaced repetition flashcard program";
|
||||
# Copy-pasted from the homepage
|
||||
longDescription = ''
|
||||
Anki is a program which makes remembering things easy. Because it is a lot
|
||||
more efficient than traditional study methods, you can either greatly
|
||||
decrease your time spent studying, or greatly increase the amount you learn.
|
||||
|
||||
Anyone who needs to remember things in their daily life can benefit from
|
||||
Anki. Since it is content-agnostic and supports images, audio, videos and
|
||||
scientific markup (via LaTeX), the possibilities are endless. For example:
|
||||
|
||||
* learning a language
|
||||
* studying for medical and law exams
|
||||
* memorizing people's names and faces
|
||||
* brushing up on geography
|
||||
* mastering long poems
|
||||
* even practicing guitar chords!
|
||||
'';
|
||||
license = "GPLv3";
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/wine/${name}.tar.bz2";
|
||||
sha256 = "0c14paj2j3sswl6mpjjmy9bxnpijk095ks58x9dsycx9c8x0gqvm";
|
||||
sha256 = "0l5kr3iq1lkv3gcw8ljzfjcfnsh9b5crdd4i0dzwdk1i3bfw2xxc";
|
||||
};
|
||||
|
||||
gecko = fetchurl {
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
version = "1.5.20";
|
||||
version = "1.5.21";
|
||||
homepage = "http://www.winehq.org/";
|
||||
license = "LGPL";
|
||||
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{stdenv, fetchurl, zlib, ncurses}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.27-3";
|
||||
version = "2.0.2";
|
||||
name = "atop-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
|
||||
sha256 = "bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f";
|
||||
sha256 = "029lfa2capz1lg3m3rnyrgb8v6jm4znin84vjh2f0zkwvvhdn856";
|
||||
};
|
||||
|
||||
buildInputs = [zlib ncurses];
|
||||
|
||||
@ -237,7 +237,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.2.35";
|
||||
version = "3.2.36";
|
||||
testing = false;
|
||||
|
||||
modDirVersion = version;
|
||||
@ -248,7 +248,7 @@ import ./generic.nix (
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "0p665msvhmjmcvgravi10yyfbnvn6bm9xfhsflj61qj0frj0lzn9";
|
||||
sha256 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -14,9 +14,13 @@ stdenv.mkDerivation (rec {
|
||||
sed -i -e 's/-idirafter.*//' Makefile
|
||||
'';
|
||||
|
||||
preBuild =''
|
||||
makeFlagsArray=( "LIBS=${if sslEnable then "-lcrypt -lssl -lcrypto " else ""}-lpam -lcap" )
|
||||
'';
|
||||
preBuild = let
|
||||
sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto " else "";
|
||||
in ''
|
||||
makeFlagsArray=( "LIBS=${sslLibs}-lpam -lcap -fstack-protector" )
|
||||
'';
|
||||
|
||||
# It won't link without this flag, used in CFLAGS
|
||||
|
||||
buildInputs = [ openssl libcap pam ];
|
||||
|
||||
|
||||
@ -75,4 +75,10 @@ stdenv.mkDerivation rec {
|
||||
cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
|
||||
'' # */
|
||||
+ stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.samba.org/;
|
||||
description = "The standard Windows interoperability suite of programs for Linux and Unix";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper }:
|
||||
{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper
|
||||
, par2cmdline, par2Support ? false }:
|
||||
|
||||
assert par2Support -> par2cmdline != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -26,6 +29,8 @@ stdenv.mkDerivation {
|
||||
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
|
||||
done
|
||||
substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
|
||||
'' + optionalString par2Support ''
|
||||
substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
|
||||
20
pkgs/tools/networking/maildrop/default.nix
Normal file
20
pkgs/tools/networking/maildrop/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ fetchurl, stdenv, pkgconfig, pcre, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "maildrop-2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2";
|
||||
sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig pcre perl ];
|
||||
|
||||
patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot
|
||||
|
||||
meta = {
|
||||
homepage = http://www.courier-mta.org/maildrop/;
|
||||
description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
|
||||
licenses = [ "GPLv3" ];
|
||||
};
|
||||
}
|
||||
13
pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
Normal file
13
pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/maildrop/configure 2012-09-06 01:52:13.000000000 +0100
|
||||
+++ b/maildrop/configure 2013-01-04 03:00:57.095628327 +0000
|
||||
@@ -17562,8 +17562,8 @@
|
||||
check_spooldir() {
|
||||
if test "$CHECKED_SPOOLDIR" != 1
|
||||
then
|
||||
- get_spooldir
|
||||
- MBOX_DIR="$SPOOLDIR"
|
||||
+ MBOX_DIR="/var/spool/mail"
|
||||
+ MBOX_RESET_GID=0
|
||||
CHECKED_SPOOLDIR=1
|
||||
fi
|
||||
}
|
||||
@ -2,20 +2,18 @@
|
||||
, gnutls, libgcrypt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nzbget-0.8.0";
|
||||
name = "nzbget-9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nzbget/${name}.tar.gz";
|
||||
sha256 = "15bxsxdbkml9cqpy6zxgv78ff69l8qrv8r201gmzvylpc1ckjsb4";
|
||||
sha256 = "1r4ys5nmcz1ilkdjdh3r8lawaf96i8spk6hl02h823q9rppvmya0";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
mkdir -p $out/etc
|
||||
cp nzbget.conf.example $out/etc/
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_LDFLAGS = "-lz";
|
||||
|
||||
meta = {
|
||||
homepage = http://nzbget.sourceforge.net/;
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.2";
|
||||
name = "nix-1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
|
||||
sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5";
|
||||
sha256 = "32cba96df0e02d6627f5625a441fdd4ea0db718dd5bfd50044cdfd3c606d4852";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ perl pkgconfig ];
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags =
|
||||
''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
|
||||
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
|
||||
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
|
||||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
|
||||
CFLAGS=-O3 CXXFLAGS=-O3
|
||||
'';
|
||||
|
||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
||||
|
||||
installFlags = "sysconfdir=$(out)/etc";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
crossAttrs = {
|
||||
|
||||
@ -513,6 +513,7 @@ let
|
||||
bup = callPackage ../tools/backup/bup {
|
||||
inherit (pythonPackages) pyxattr pylibacl setuptools fuse;
|
||||
inherit (haskellPackages) pandoc;
|
||||
par2Support = (config.bup.par2Support or false);
|
||||
};
|
||||
|
||||
atool = callPackage ../tools/archivers/atool { };
|
||||
@ -1054,6 +1055,8 @@ let
|
||||
|
||||
lzop = callPackage ../tools/compression/lzop { };
|
||||
|
||||
maildrop = callPackage ../tools/networking/maildrop { };
|
||||
|
||||
mailutils = callPackage ../tools/networking/mailutils {
|
||||
guile = guile_1_8;
|
||||
};
|
||||
@ -2972,6 +2975,8 @@ let
|
||||
&& stdenv.system != "i686-solaris";
|
||||
};
|
||||
|
||||
automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { };
|
||||
|
||||
automoc4 = callPackage ../development/tools/misc/automoc4 { };
|
||||
|
||||
avrdude = callPackage ../development/tools/misc/avrdude { };
|
||||
@ -4995,7 +5000,7 @@ let
|
||||
telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
|
||||
|
||||
tinyxml = tinyxml2;
|
||||
|
||||
|
||||
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
|
||||
|
||||
tk = callPackage ../development/libraries/tk { };
|
||||
@ -6750,7 +6755,7 @@ let
|
||||
|
||||
cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
|
||||
inherit cmake patchelf;
|
||||
imagemagick=imagemagick;
|
||||
imagemagick = imagemagick;
|
||||
};
|
||||
|
||||
cvs = callPackage ../applications/version-management/cvs { };
|
||||
@ -8161,6 +8166,8 @@ let
|
||||
|
||||
andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
|
||||
|
||||
anki = callPackage ../games/anki { };
|
||||
|
||||
asc = callPackage ../games/asc {
|
||||
lua = lua5;
|
||||
libsigcxx = libsigcxx12;
|
||||
|
||||
@ -1784,9 +1784,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
|
||||
|
||||
X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {};
|
||||
X11_1_6_0_2 = callPackage ../development/libraries/haskell/X11/1.6.0.2.nix {};
|
||||
X11 = self.X11_1_6_0_2;
|
||||
X11 = callPackage ../development/libraries/haskell/X11 {};
|
||||
|
||||
X11Xft = callPackage ../development/libraries/haskell/X11-xft {};
|
||||
|
||||
@ -1960,18 +1958,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
stm = self.stm_2_3;
|
||||
};
|
||||
|
||||
xmonad = callPackage ../applications/window-managers/xmonad {
|
||||
X11 = self.X11_1_5_0_1;
|
||||
};
|
||||
xmonad = callPackage ../applications/window-managers/xmonad {};
|
||||
|
||||
xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {
|
||||
X11 = self.X11_1_5_0_1;
|
||||
X11Xft = self.X11Xft.override { X11 = self.X11_1_5_0_1; };
|
||||
};
|
||||
xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};
|
||||
|
||||
xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {
|
||||
X11 = self.X11_1_5_0_1;
|
||||
};
|
||||
xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix {};
|
||||
|
||||
# Tools.
|
||||
|
||||
@ -1983,7 +1974,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
tar = self.tar_0_3_2_0;
|
||||
};
|
||||
|
||||
|
||||
cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
|
||||
|
||||
cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {};
|
||||
|
||||
@ -86,13 +86,13 @@ let pythonPackages = python.modules // rec {
|
||||
|
||||
|
||||
alot = buildPythonPackage rec {
|
||||
rev = "09804636609b4245cde4faceddffdb5361f3d390";
|
||||
rev = "5b5dbecb5a03840b751219db90bcf4dcffda315e";
|
||||
name = "alot-0.3.3_${rev}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pazz/alot/tarball/${rev}";
|
||||
name = "${name}.tar.bz";
|
||||
sha256 = "b5239c4dfcd9882608fb48ef80fe9ba9223949ab7e6a2c1abe970ac307ebcd4a";
|
||||
sha256 = "156q7x4wilhcgmaap7rjci3cgwm5ia85ddgx6xm6lfp5hkf5300v";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
@ -1047,6 +1047,22 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
jedi = buildPythonPackage (rec {
|
||||
name = "jedi-0.5b5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz";
|
||||
sha256 = "10xqdhda9kdbc22h4dphxqjncpdb80s1crxsirr5h016rw9czsa4";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/davidhalter/jedi";
|
||||
description = "An autocompletion tool for Python that can be used for text editors.";
|
||||
license = pkgs.lib.licenses.lgpl3Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
platforms = python.meta.platforms;
|
||||
};
|
||||
});
|
||||
|
||||
jinja2 = buildPythonPackage {
|
||||
name = "jinja2-2.6";
|
||||
@ -2102,23 +2118,19 @@ let pythonPackages = python.modules // rec {
|
||||
|
||||
|
||||
pymacs = pkgs.stdenv.mkDerivation rec {
|
||||
version = "v0.24-beta2";
|
||||
version = "v0.25";
|
||||
name = "Pymacs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pinard/Pymacs/tarball/${version}";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "0nzb3wrxwy0cmmj087pszkwgj2v22x0y5m4vxb6axz94zfl02r8j";
|
||||
sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
configurePhase = ''
|
||||
python p4 -C p4config.py *.in Pymacs contrib tests
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
python setup.py install --prefix=$out
|
||||
patchPhase = ''
|
||||
sed -e "s@ install@ install --prefix=$out@g" -i Makefile
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -2449,21 +2461,15 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
});
|
||||
|
||||
rope = pkgs.stdenv.mkDerivation rec {
|
||||
version = "0.9.3";
|
||||
rope = buildPythonPackage rec {
|
||||
version = "0.9.4";
|
||||
name = "rope-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz";
|
||||
sha256 = "1092rlsfna7rm1jkdanilsmw7rr3hlkgyji02xfd02wfcm8xa2i7";
|
||||
sha256 = "1fm6ahff50b10mlnc0ar4x1fv9sxmcp1g651myyqy7c50hk39h1d";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
installPhase = ''
|
||||
python setup.py install --prefix=$out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "python refactoring library";
|
||||
homepage = http://rope.sf.net;
|
||||
@ -2472,20 +2478,16 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
ropemacs = pkgs.stdenv.mkDerivation rec {
|
||||
version = "0.6";
|
||||
ropemacs = buildPythonPackage rec {
|
||||
version = "0.7";
|
||||
name = "ropemacs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rope/${name}.tar.gz";
|
||||
sha256 = "1afqybmjn7fqkwx8y8kx1kfx181ix73cbq3a0d5n7ryjm7k1r0s4";
|
||||
url = "http://pypi.python.org/packages/source/r/ropemacs/${name}.tar.gz";
|
||||
sha256 = "1x5qf1drcdz9jfiiakc60kzqkb3ahsg9j902c5byf3gjfacdrmqj";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
installPhase = ''
|
||||
python setup.py install --prefix=$out
|
||||
'';
|
||||
propagatedBuildInputs = [ ropemode ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "a plugin for performing python refactorings in emacs";
|
||||
@ -2495,6 +2497,26 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
ropemode = buildPythonPackage rec {
|
||||
version = "0.2";
|
||||
name = "ropemode-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/r/ropemode/${name}.tar.gz";
|
||||
sha256 = "0jw6h1wvk6wk0wknqdf7s9pw76m8472jv546lqdd88jbl2scgcjl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ rope ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "a plugin for performing python refactorings in emacs";
|
||||
homepage = http://rope.sf.net;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
routes = buildPythonPackage rec {
|
||||
name = "routes-1.12.3";
|
||||
|
||||
@ -145,7 +145,6 @@ with (import ./release-lib.nix);
|
||||
icewm = linux;
|
||||
idutils = all;
|
||||
ifplugd = linux;
|
||||
imagemagick = allBut "i686-cygwin";
|
||||
impressive = linux;
|
||||
inetutils = linux;
|
||||
inkscape = linux;
|
||||
@ -251,7 +250,6 @@ with (import ./release-lib.nix);
|
||||
rubber = allBut "i686-cygwin";
|
||||
ruby = all;
|
||||
rxvt_unicode = linux;
|
||||
samba = linux;
|
||||
screen = linux ++ darwin;
|
||||
scrot = linux;
|
||||
sdparm = linux;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user