mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
Merge remote-tracking branch 'origin/master' into systemd
This commit is contained in:
Eelco Dolstra
commit
9da086c08d
@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux";
|
||||
|
||||
let
|
||||
|
||||
version = "1.4.0";
|
||||
sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e";
|
||||
version = "1.4.21";
|
||||
sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2";
|
||||
|
||||
# relative location where the dropbox libraries are stored
|
||||
appdir = "opt/dropbox";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.3";
|
||||
version = "2.5";
|
||||
release = ".1";
|
||||
name = "bazaar-${version}${release}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
|
||||
sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53";
|
||||
sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn";
|
||||
};
|
||||
|
||||
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
, versionSuffix ?
|
||||
if officialRelease
|
||||
then ""
|
||||
else if src ? rev then "pre${toString src.rev}" else ""
|
||||
else "pre${toString (src.rev or src.revCount or "")}"
|
||||
, src, stdenv, autoconf, automake, libtool
|
||||
, ... } @ args:
|
||||
|
||||
|
||||
@ -38,8 +38,8 @@ rec {
|
||||
name = "lazarus-${version}";
|
||||
meta = {
|
||||
description = "Lazarus graphical IDE for FreePascal language";
|
||||
homepage = http://www.lazarus.freepascal.org ;
|
||||
homepage = http://www.lazarus.freepascal.org;
|
||||
maintainers = [args.lib.maintainers.raskin];
|
||||
platforms = args.lib.platforms.linux;
|
||||
#platforms = args.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -48,13 +48,12 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides.";
|
||||
description = "A concise and elegant language for writing distributed web applications";
|
||||
longDescription = ''
|
||||
Opa is a new generation of web development platform that lets you write distributed
|
||||
web applications using a single technology. Among the the many features of Opa are these:
|
||||
Opa is concise, simple, concurrent, dynamically distributed, and secure.
|
||||
Opa is a new generation of web development platform that lets you write distributed
|
||||
web applications using a single technology. Among the the many features of Opa are these:
|
||||
Opa is concise, simple, concurrent, dynamically distributed, and secure.
|
||||
'';
|
||||
|
||||
homepage = http://opalang.org/;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.kkallio ];
|
||||
|
||||
@ -68,6 +68,8 @@ let
|
||||
rm -rf "$out/lib/python${majorVersion}/test"
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
|
||||
mv $out/share/man/man1/{python.1,python2.6.1}
|
||||
ln -s $out/share/man/man1/{python2.6.1,python.1}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -76,6 +76,7 @@ let
|
||||
rm -rf "$out/lib/python${majorVersion}/test"
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
|
||||
ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
|
||||
ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# Create a python that knows about additional python packages via
|
||||
# PYTHONPATH
|
||||
|
||||
{stdenv, python, makeWrapper, extraLibs ? []}:
|
||||
{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "python-${python.version}-wrapper";
|
||||
|
||||
propagatedBuildInputs = [python makeWrapper] ++ extraLibs;
|
||||
propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ];
|
||||
|
||||
unpackPhase = "true";
|
||||
installPhase = ''
|
||||
|
||||
13
pkgs/development/libraries/haskell/cipher-rc4/default.nix
Normal file
13
pkgs/development/libraries/haskell/cipher-rc4/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cipher-rc4";
|
||||
version = "0.1.2";
|
||||
sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1";
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cipher-rc4";
|
||||
description = "Fast RC4 cipher implementation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,14 +1,14 @@
|
||||
{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi
|
||||
, cryptocipher, entropy, skein, tagged
|
||||
{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi
|
||||
, entropy, skein, tagged
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "clientsession";
|
||||
version = "0.8.0.2";
|
||||
sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r";
|
||||
version = "0.8.1";
|
||||
sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd";
|
||||
buildDepends = [
|
||||
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
|
||||
skein tagged
|
||||
base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein
|
||||
tagged
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/yesodweb/clientsession/tree/master";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-conduit";
|
||||
version = "0.4.2";
|
||||
sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3";
|
||||
version = "0.4.3";
|
||||
sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk";
|
||||
buildDepends = [ cereal conduit cryptoApi transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/meteficha/crypto-conduit";
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
{ cabal, cryptoRandomApi, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-numbers";
|
||||
version = "0.1.3";
|
||||
sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1";
|
||||
buildDepends = [ cryptoRandomApi vector ];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-crypto-numbers";
|
||||
description = "Cryptographic numbers: functions and algorithms";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
18
pkgs/development/libraries/haskell/crypto-pubkey/default.nix
Normal file
18
pkgs/development/libraries/haskell/crypto-pubkey/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes
|
||||
, cryptoRandomApi
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "crypto-pubkey";
|
||||
version = "0.1.2";
|
||||
sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5";
|
||||
buildDepends = [
|
||||
cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-crypto-pubkey";
|
||||
description = "Public Key cryptography";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,19 +1,20 @@
|
||||
{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive
|
||||
, tagged, vector
|
||||
{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi
|
||||
, cryptoPubkeyTypes, primitive, tagged, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cryptocipher";
|
||||
version = "0.3.7";
|
||||
sha256 = "14qhi3969q1h9n85flb7wwsr50gdn63q7pmcpm2npy5vkp34lkp5";
|
||||
version = "0.4.0";
|
||||
sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector
|
||||
cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes
|
||||
primitive tagged vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-cryptocipher";
|
||||
description = "Symmetrical Block, Stream and PubKey Ciphers";
|
||||
description = "Symmetrical block and stream ciphers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash
|
||||
, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase
|
||||
, regexTdfa, snapCore, snapServer, tagsoup, text, time
|
||||
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs
|
||||
, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache
|
||||
, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore
|
||||
, snapServer, tagsoup, text, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hakyll";
|
||||
version = "3.5.2.1";
|
||||
sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4";
|
||||
version = "4.0.0.0";
|
||||
sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet
|
||||
lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
|
||||
tagsoup text time
|
||||
binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq
|
||||
filepath httpConduit httpTypes lrucache mtl pandoc parsec random
|
||||
regexBase regexTdfa snapCore snapServer tagsoup text time
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/hakyll";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hashable";
|
||||
version = "1.2.0.3";
|
||||
sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp";
|
||||
version = "1.2.0.5";
|
||||
sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "http://github.com/tibbe/hashable";
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hs-bibutils";
|
||||
version = "4.15";
|
||||
sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9";
|
||||
version = "4.16";
|
||||
sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb";
|
||||
buildDepends = [ syb ];
|
||||
meta = {
|
||||
homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
|
||||
|
||||
@ -1,21 +1,23 @@
|
||||
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
|
||||
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
|
||||
, conduit, cookie, cprngAes, dataDefault, deepseq, failure
|
||||
, httpTypes, liftedBase, monadControl, mtl, network, regexCompat
|
||||
, resourcet, socks, text, time, tls, tlsExtra, transformers
|
||||
, transformersBase, utf8String, void, zlibConduit
|
||||
, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl
|
||||
, network, random, regexCompat, resourcet, socks, text, time, tls
|
||||
, tlsExtra, transformers, transformersBase, utf8String, void
|
||||
, zlibConduit
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.8.6.3";
|
||||
sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r";
|
||||
version = "1.8.7";
|
||||
sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i";
|
||||
buildDepends = [
|
||||
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
|
||||
blazeBuilderConduit caseInsensitive certificate conduit cookie
|
||||
cprngAes dataDefault deepseq failure httpTypes liftedBase
|
||||
monadControl mtl network regexCompat resourcet socks text time tls
|
||||
tlsExtra transformers transformersBase utf8String void zlibConduit
|
||||
cprngAes dataDefault deepseq failure filepath httpTypes liftedBase
|
||||
mimeTypes monadControl mtl network random regexCompat resourcet
|
||||
socks text time tls tlsExtra transformers transformersBase
|
||||
utf8String void zlibConduit
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/http-conduit";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "mime-types";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs";
|
||||
buildDepends = [ text ];
|
||||
meta = {
|
||||
homepage = "https://github.com/yesodweb/wai";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network";
|
||||
version = "2.4.0.1";
|
||||
sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw";
|
||||
version = "2.4.1.0";
|
||||
sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3";
|
||||
buildDepends = [ parsec ];
|
||||
meta = {
|
||||
homepage = "https://github.com/haskell/network";
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent";
|
||||
version = "1.1.3.2";
|
||||
sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv";
|
||||
version = "1.1.4";
|
||||
sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj";
|
||||
buildDepends = [
|
||||
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
|
||||
liftedBase monadControl monadLogger pathPieces poolConduit
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "smallcheck";
|
||||
version = "0.6.1";
|
||||
sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
|
||||
version = "0.6.2";
|
||||
sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr";
|
||||
buildDepends = [ dlist ];
|
||||
meta = {
|
||||
homepage = "https://github.com/feuerbach/smallcheck";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "system-fileio";
|
||||
version = "0.3.10";
|
||||
sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4";
|
||||
version = "0.3.11";
|
||||
sha256 = "0hnjrzhzbqx9l93c8dnl5b54f72ki584cn3jh8m6z56x2lrs24zb";
|
||||
buildDepends = [ systemFilepath text time ];
|
||||
meta = {
|
||||
homepage = "https://john-millikin.com/software/haskell-filesystem/";
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
{ cabal, certificate, cipherAes, cryptoApi, cryptocipher
|
||||
, cryptohash, mtl, network, pem, text, time, tls, vector
|
||||
{ cabal, certificate, cipherAes, cipherRc4, cryptohash
|
||||
, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls
|
||||
, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tls-extra";
|
||||
version = "0.5.1";
|
||||
sha256 = "0a977qy6ig4bhgsl6y5iw0xv52yswmcc2x37ypm1601wikjv38x3";
|
||||
version = "0.6.0";
|
||||
sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
certificate cipherAes cryptoApi cryptocipher cryptohash mtl network
|
||||
pem text time tls vector
|
||||
certificate cipherAes cipherRc4 cryptohash cryptoPubkey
|
||||
cryptoRandomApi mtl network pem text time tls vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-tls";
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash
|
||||
, mtl, network
|
||||
{ cabal, cereal, certificate, cryptohash, cryptoPubkey
|
||||
, cryptoRandomApi, mtl, network
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tls";
|
||||
version = "1.0.3";
|
||||
sha256 = "14wgwz032skkgkxg2lyh8kwg1fkapmlg2jh74czbacvnssc2iidb";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
version = "1.1.1";
|
||||
sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq";
|
||||
buildDepends = [
|
||||
cereal certificate cryptoApi cryptocipher cryptohash mtl network
|
||||
cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl
|
||||
network
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://github.com/vincenthz/hs-tls";
|
||||
description = "TLS/SSL protocol native implementation (Server and Client)";
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "1.3.7";
|
||||
sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf";
|
||||
version = "1.3.7.1";
|
||||
sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
|
||||
httpTypes liftedBase network networkConduit simpleSendfile
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, popt }:
|
||||
{ stdenv, fetchurl, popt, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "libnatspec-0.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
@ -16,4 +16,8 @@ stdenv.mkDerivation rec {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
|
||||
NIX_CFLAGS_COMPILE = "-I${libiconv}/include";
|
||||
|
||||
NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv";
|
||||
})
|
||||
|
||||
@ -49,6 +49,6 @@ rec {
|
||||
maintainers = [
|
||||
a.lib.maintainers.raskin
|
||||
];
|
||||
platforms = a.lib.platforms.linux ;
|
||||
#platforms = a.lib.platforms.linux ;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{stdenv, androidsdk, titaniumsdk, xcodewrapper}:
|
||||
{ appId, name, src, target, androidPlatformVersions ? [ "8" ]
|
||||
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
|
||||
, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
|
||||
, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
|
||||
}:
|
||||
|
||||
assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
|
||||
@ -12,9 +12,12 @@ let
|
||||
platformVersions = androidPlatformVersions;
|
||||
useGoogleAPIs = true;
|
||||
};
|
||||
|
||||
deleteKeychain = "security delete-keychain $keychainName";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
name = stdenv.lib.replaceChars [" "] [""] name;
|
||||
inherit src;
|
||||
|
||||
buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
|
||||
|
||||
@ -25,13 +28,12 @@ stdenv.mkDerivation {
|
||||
|
||||
${if target == "android" then
|
||||
if release then
|
||||
"${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out"
|
||||
''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out''
|
||||
else
|
||||
"${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}"
|
||||
''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}''
|
||||
|
||||
else if target == "iphone" then
|
||||
if release then
|
||||
''
|
||||
if iosDistribute then ''
|
||||
export HOME=/Users/$(whoami)
|
||||
export keychainName=$(basename $out)
|
||||
|
||||
@ -51,11 +53,39 @@ stdenv.mkDerivation {
|
||||
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
|
||||
fi
|
||||
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName"
|
||||
|
||||
# Remove our generated keychain
|
||||
|
||||
security delete-keychain $keychainName
|
||||
${deleteKeychain}
|
||||
''
|
||||
else
|
||||
if release then
|
||||
''
|
||||
export HOME=/Users/$(whoami)
|
||||
export keychainName=$(basename $out)
|
||||
|
||||
# Create a keychain with the component hash name (should always be unique)
|
||||
security create-keychain -p "" $keychainName
|
||||
security default-keychain -s $keychainName
|
||||
security unlock-keychain -p "" $keychainName
|
||||
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
|
||||
|
||||
provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}")
|
||||
|
||||
# Ensure that the requested provisioning profile can be found
|
||||
|
||||
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ]
|
||||
then
|
||||
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
|
||||
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
|
||||
fi
|
||||
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
|
||||
|
||||
# Remove our generated keychain
|
||||
|
||||
${deleteKeychain}
|
||||
''
|
||||
else
|
||||
''
|
||||
@ -66,7 +96,7 @@ stdenv.mkDerivation {
|
||||
|
||||
cp -av * $out
|
||||
cd $out
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} ${name}
|
||||
${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}"
|
||||
''
|
||||
|
||||
else throw "Target: ${target} is not supported!"}
|
||||
@ -84,4 +114,6 @@ stdenv.mkDerivation {
|
||||
else if target == "iphone" then ""
|
||||
else throw "Target: ${target} is not supported!"}
|
||||
'';
|
||||
|
||||
failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
|
||||
}
|
||||
|
||||
@ -53,5 +53,8 @@ stdenv.mkDerivation {
|
||||
--prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix JAVA_HOME : ${jdk}
|
||||
'' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
|
||||
# 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
|
||||
sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
|
||||
'';
|
||||
}
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm
|
||||
--- Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm 2008-10-23 13:46:01.000000000 -0400
|
||||
+++ Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm 2013-01-16 13:52:09.855063997 -0500
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
my $grammar = <<'END_OF_GRAMMAR';
|
||||
|
||||
-proto : <skip: qr! (?: //.*\n | \s+ )* !x>
|
||||
+proto : <skip: qr! (?: //.*?\n | \s+ | /\*.*?\*/\s* )* !xs>
|
||||
## list of top level declarations.
|
||||
## Skip empty declarations and ";".
|
||||
(message | extend | enum | import | package | option | service | syntax | ";")(s) /\Z/
|
||||
@ -3,7 +3,7 @@
|
||||
(http://pypi.python.org/pypi/setuptools/), which represents a large
|
||||
number of Python packages nowadays. */
|
||||
|
||||
{ python, setuptools, wrapPython, lib, offlineDistutils, setuptoolsSite }:
|
||||
{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
|
||||
|
||||
{ name, namePrefix ? "python-"
|
||||
|
||||
@ -48,16 +48,14 @@ python.stdenv.mkDerivation (attrs // {
|
||||
|
||||
name = namePrefix + name;
|
||||
|
||||
# checkPhase after installPhase to run tests on installed packages
|
||||
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";
|
||||
|
||||
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
|
||||
|
||||
# setuptoolsSite is responsible for loading pth files
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ setuptoolsSite ];
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
|
||||
|
||||
buildInputStrings = map toString buildInputs;
|
||||
|
||||
pythonPath = [ setuptools] ++ pythonPath;
|
||||
pythonPath = [ setuptools ] ++ pythonPath;
|
||||
|
||||
preConfigure = ''
|
||||
PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
|
||||
@ -83,9 +81,7 @@ python.stdenv.mkDerivation (attrs // {
|
||||
# Remove any site.py files generated by easy_install as these
|
||||
# cause collisions. If pth files are to be processed a
|
||||
# corresponding site.py needs to be included in the PYTHONPATH.
|
||||
#
|
||||
# leave them until we have a better solution: see #209
|
||||
#rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
|
||||
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
|
||||
|
||||
${postInstall}
|
||||
'';
|
||||
@ -94,15 +90,6 @@ python.stdenv.mkDerivation (attrs // {
|
||||
''
|
||||
wrapPythonPrograms
|
||||
|
||||
# If a user installs a Python package, she probably also wants its
|
||||
# dependencies in the user environment (since Python modules don't
|
||||
# have something like an RPATH, so the only way to find the
|
||||
# dependencies is to have them in the PYTHONPATH variable).
|
||||
if test -e $out/nix-support/propagated-build-inputs; then
|
||||
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
|
||||
fi
|
||||
|
||||
createBuildInputsPth build-inputs "$buildInputStrings"
|
||||
for inputsfile in propagated-build-inputs propagated-build-native-inputs; do
|
||||
if test -e $out/nix-support/$inputsfile; then
|
||||
createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
|
||||
|
||||
@ -51,6 +51,9 @@ createBuildInputsPth() {
|
||||
local inputs="$2"
|
||||
if [ foo"$inputs" != foo ]; then
|
||||
for x in $inputs; do
|
||||
if $(echo -n $x |grep -q python-recursive-pth-loader); then
|
||||
continue
|
||||
fi
|
||||
if test -d "$x"/lib/@libPrefix@/site-packages; then
|
||||
echo $x/lib/@libPrefix@/site-packages \
|
||||
>> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, python, pkgconfig, cairo, x11}:
|
||||
{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pycairo-1.8.8";
|
||||
@ -7,5 +7,5 @@ stdenv.mkDerivation {
|
||||
sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig";
|
||||
};
|
||||
|
||||
buildInputs = [python pkgconfig cairo x11];
|
||||
buildInputs = [ python pkgconfig cairo x11 ];
|
||||
}
|
||||
|
||||
@ -12,16 +12,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ python pkgconfig glib ];
|
||||
|
||||
# in a "normal" setup, pygobject and pygtk are installed into the
|
||||
# same site-packages: we need a pth file for both. pygtk.py would be
|
||||
# used to select a specific version, in our setup it should have no
|
||||
# effect, but we leave it in case somebody expects and calls it.
|
||||
postInstall = ''
|
||||
# All python code is installed into a "gtk-2.0" sub-directory. That
|
||||
# sub-directory may be useful on systems which share several library
|
||||
# versions in the same prefix, i.e. /usr/local, but on Nix that directory
|
||||
# is useless. Furthermore, its existence makes it very hard to guess a
|
||||
# proper $PYTHONPATH that allows "import gtk" to succeed.
|
||||
cd $(toPythonPath $out)/gtk-2.0
|
||||
for n in *; do
|
||||
ln -s "gtk-2.0/$n" "../$n"
|
||||
done
|
||||
mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, makeWrapper, python, pkgconfig, glib, gtk, pygobject, pycairo
|
||||
, libglade ? null }:
|
||||
{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
|
||||
, buildPythonPackage, libglade ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildPythonPackage rec {
|
||||
name = "pygtk-2.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
@ -10,26 +10,35 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ makeWrapper python pkgconfig glib gtk ]
|
||||
[ pkgconfig glib gtk ]
|
||||
++ stdenv.lib.optional (libglade != null) libglade;
|
||||
|
||||
propagatedBuildInputs = [ pygobject pycairo ];
|
||||
|
||||
installCommand = "make install";
|
||||
checkPhase = stdenv.lib.optionalString (libglade == null)
|
||||
''
|
||||
sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
|
||||
tests/common.py
|
||||
sed -i -e "s/, glade$//" \
|
||||
-e "s/.*testGlade.*//" \
|
||||
-e "s/.*(glade.*//" \
|
||||
tests/test_api.py
|
||||
'' + ''
|
||||
sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
|
||||
-e "s/sys.path.insert(0, buildDir)//" \
|
||||
tests/common.py
|
||||
make check
|
||||
'';
|
||||
# XXX: TypeError: Unsupported type: <class 'gtk._gtk.WindowType'>
|
||||
# The check phase was not executed in the previous
|
||||
# non-buildPythonPackage setup - not sure why not.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/pygtk-codegen-2.0
|
||||
ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
|
||||
|
||||
# All python code is installed into a "gtk-2.0" sub-directory. That
|
||||
# sub-directory may be useful on systems which share several library
|
||||
# versions in the same prefix, i.e. /usr/local, but on Nix that directory
|
||||
# is useless. Furthermore, its existence makes it very hard to guess a
|
||||
# proper $PYTHONPATH that allows "import gtk" to succeed.
|
||||
cd $(toPythonPath $out)/gtk-2.0
|
||||
for n in *; do
|
||||
ln -s "gtk-2.0/$n" "../$n"
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/pygtk-demo --prefix PYTHONPATH ":" \
|
||||
$(toPythonPath "${pygobject} ${pycairo} $out")
|
||||
ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/${pygobject.name}.pth \
|
||||
$out/lib/${python.libPrefix}/site-packages/${name}.pth
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, python, wrapPython }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "setuptools-" + version;
|
||||
name = "python-setuptools-" + version;
|
||||
|
||||
version = "0.6c11";
|
||||
|
||||
|
||||
@ -1,29 +1,32 @@
|
||||
Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`.
|
||||
|
||||
|
||||
--- virtualenv-1.6.4/virtualenv.py 2012-05-20 00:40:38.070649647 +0200
|
||||
+++ virtualenv-1.6.4/virtualenv.py 2012-05-20 00:45:10.596242604 +0200
|
||||
@@ -951,13 +951,7 @@
|
||||
--- virtualenv-1.8.4/virtualenv.py 2013-01-16 23:43:37.583615220 +0100
|
||||
+++ virtualenv-1.8.4/virtualenv.py 2013-01-16 23:44:47.885973431 +0100
|
||||
@@ -1135,17 +1135,7 @@
|
||||
|
||||
|
||||
def change_prefix(filename, dst_prefix):
|
||||
- prefixes = [sys.prefix]
|
||||
-
|
||||
- if sys.platform == "darwin":
|
||||
- if is_darwin:
|
||||
- prefixes.extend((
|
||||
- os.path.join("/Library/Python", sys.version[:3], "site-packages"),
|
||||
- os.path.join(sys.prefix, "Extras", "lib", "python"),
|
||||
- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages")))
|
||||
- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"),
|
||||
- # Python 2.6 no-frameworks
|
||||
- os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"),
|
||||
- # System Python 2.7 on OSX Mountain Lion
|
||||
- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages")))
|
||||
+ prefixes = ["/nix/store", sys.prefix]
|
||||
|
||||
if hasattr(sys, 'real_prefix'):
|
||||
prefixes.append(sys.real_prefix)
|
||||
@@ -968,6 +962,8 @@
|
||||
_, relpath = filename.split(src_prefix, 1)
|
||||
assert relpath[0] == os.sep
|
||||
relpath = relpath[1:]
|
||||
+ if src_prefix == "/nix/store":
|
||||
+ relpath = "/".join(relpath.split("/")[1:])
|
||||
@@ -1162,6 +1152,8 @@
|
||||
if src_prefix != os.sep: # sys.prefix == "/"
|
||||
assert relpath[0] == os.sep
|
||||
relpath = relpath[1:]
|
||||
+ if src_prefix == "/nix/store":
|
||||
+ relpath = "/".join(relpath.split("/")[1:])
|
||||
return join(dst_prefix, relpath)
|
||||
assert False, "Filename %s does not start with any of these prefixes: %s" % \
|
||||
(filename, prefixes)
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, mesa, openal}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "minecraft-1.3.1";
|
||||
name = "minecraft-1.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar";
|
||||
sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj";
|
||||
sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49";
|
||||
};
|
||||
|
||||
phases = "installPhase";
|
||||
|
||||
@ -36,6 +36,6 @@ stdenv.mkDerivation {
|
||||
homepage = http://www.naev.org;
|
||||
license = "GPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://torcs.sourceforge.net/;
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Squad-based tactical strategy game in the tradition of X-Com";
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -82,6 +82,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.urbanterror.net;
|
||||
license = [ "unfree-redistributable" ];
|
||||
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
#platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,8 +64,7 @@ rec {
|
||||
raskin
|
||||
jcumming
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
#platforms = a.lib.platforms.linux;
|
||||
license = a.lib.licenses.gpl2Plus;
|
||||
};
|
||||
passthru = {
|
||||
|
||||
@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
|
||||
patchelf
|
||||
unzip
|
||||
];
|
||||
|
||||
|
||||
inherit kernel glibc /* glibc only used for setting interpreter */;
|
||||
|
||||
|
||||
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
|
||||
[ "${xorg.libXrandr}/lib"
|
||||
"${xorg.libXrender}/lib"
|
||||
@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
|
||||
inherit mesa; # only required to build examples
|
||||
|
||||
meta = {
|
||||
description = "ati drivers";
|
||||
description = "ATI drivers";
|
||||
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
|
||||
license = "unfree";
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
#platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
# moved assertions here because the name is evaluated when the NixOS manual is generated
|
||||
|
||||
@ -33,6 +33,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
passthru = { inherit patch; };
|
||||
|
||||
meta = {
|
||||
description = "Another Unionfs implementation for Linux (third generation)";
|
||||
homepage = http://aufs.sourceforge.net/;
|
||||
|
||||
@ -6,7 +6,7 @@ stdenv.mkDerivation {
|
||||
name = "cpufrequtils-008";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz";
|
||||
url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz;
|
||||
md5 = "52d3e09e47ffef634833f7fab168eccf";
|
||||
};
|
||||
|
||||
|
||||
@ -230,7 +230,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.0.58";
|
||||
version = "3.0.59";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
|
||||
@ -238,7 +238,7 @@ import ./generic.nix (
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
|
||||
sha256 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10";
|
||||
sha256 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -237,7 +237,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.2.36";
|
||||
version = "3.2.37";
|
||||
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 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn";
|
||||
sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -239,7 +239,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.4.25";
|
||||
version = "3.4.26";
|
||||
testing = false;
|
||||
|
||||
preConfigure = ''
|
||||
@ -248,7 +248,7 @@ import ./generic.nix (
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6";
|
||||
sha256 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -245,7 +245,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
testing = false;
|
||||
|
||||
preConfigure = ''
|
||||
@ -254,7 +254,7 @@ import ./generic.nix (
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04";
|
||||
sha256 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
|
||||
url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
|
||||
sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
|
||||
})
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "linux-pam-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2;
|
||||
url = http://www.linux-pam.org/library/Linux-PAM-1.1.1.tar.bz2;
|
||||
sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0";
|
||||
};
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "powertop-2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
|
||||
sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x";
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
stdenv.mkDerivation {
|
||||
name = "spl-0.6.0-rc13-${kernel.version}";
|
||||
src = fetchurl {
|
||||
url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz;
|
||||
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz;
|
||||
sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b";
|
||||
};
|
||||
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v86d-0.1.10-${kernel.version}";
|
||||
name = "v86d-${version}-${kernel.version}";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";
|
||||
url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2";
|
||||
sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
|
||||
};
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
||||
name = "zfs-0.6.0-rc13-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz;
|
||||
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz;
|
||||
sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv";
|
||||
};
|
||||
|
||||
|
||||
@ -1,39 +1,85 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, alsaSupport ? true, alsaLib
|
||||
, flacSupport ? true, flac, vorbisSupport ? true, libvorbis
|
||||
, madSupport ? true, libmad, id3tagSupport ? true, libid3tag
|
||||
, mikmodSupport ? true, libmikmod, cueSupport ? true, libcue
|
||||
{ stdenv, fetchurl, pkgconfig, glib, systemd
|
||||
, alsaSupport ? true, alsaLib
|
||||
, flacSupport ? true, flac
|
||||
, vorbisSupport ? true, libvorbis
|
||||
, madSupport ? true, libmad
|
||||
, id3tagSupport ? true, libid3tag
|
||||
, mikmodSupport ? true, libmikmod
|
||||
, shoutSupport ? true, libshout
|
||||
, sqliteSupport ? true, sqlite
|
||||
, curlSupport ? true, curl
|
||||
, soupSupport ? true, libsoup
|
||||
, audiofileSupport ? true, audiofile
|
||||
, bzip2Support ? true, bzip2
|
||||
, ffadoSupport ? true, ffado
|
||||
, ffmpegSupport ? true, ffmpeg
|
||||
, fluidsynthSupport ? true, fluidsynth
|
||||
, zipSupport ? true, zziplib
|
||||
, samplerateSupport ? true, libsamplerate
|
||||
, mmsSupport ? true, libmms
|
||||
, mpg123Support ? true, mpg123
|
||||
, aacSupport ? true, faad2
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
opt = stdenv.lib.optional;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpd-0.16.8";
|
||||
|
||||
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "mpd-0.17.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
|
||||
sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17";
|
||||
sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib ]
|
||||
buildInputs = [ pkgconfig glib systemd ]
|
||||
++ opt alsaSupport alsaLib
|
||||
++ opt flacSupport flac
|
||||
++ opt vorbisSupport libvorbis
|
||||
++ opt madSupport libmad
|
||||
++ opt id3tagSupport libid3tag
|
||||
++ opt mikmodSupport libmikmod
|
||||
++ opt cueSupport libcue
|
||||
++ opt shoutSupport libshout;
|
||||
++ opt shoutSupport libshout
|
||||
++ opt sqliteSupport sqlite
|
||||
++ opt curlSupport curl
|
||||
++ opt soupSupport libsoup
|
||||
++ opt bzip2Support bzip2
|
||||
++ opt audiofileSupport audiofile
|
||||
++ opt ffadoSupport ffado
|
||||
++ opt ffmpegSupport ffmpeg
|
||||
++ opt fluidsynthSupport fluidsynth
|
||||
++ opt samplerateSupport libsamplerate
|
||||
++ opt mmsSupport libmms
|
||||
++ opt mpg123Support mpg123
|
||||
++ opt aacSupport faad2
|
||||
++ opt zipSupport zziplib;
|
||||
|
||||
configureFlags = ''
|
||||
${if alsaSupport then "--enable-alsa" else "--disable-alsa"}
|
||||
${if flacSupport then "--enable-flac" else "--disable-flac"}
|
||||
${if vorbisSupport then "--enable-vorbis" else "--disable-vorbis"}
|
||||
${if madSupport then "--enable-mad" else "--disable-mad"}
|
||||
${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"}
|
||||
${if id3tagSupport then "--enable-id3" else "--disable-id3"}
|
||||
${if cueSupport then "--enable-cue" else "--disable-cue"}
|
||||
${if shoutSupport then "--enable-shout" else "--disable-shout"}
|
||||
'';
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
(mkFlag alsaSupport "alsa")
|
||||
(mkFlag flacSupport "flac")
|
||||
(mkFlag vorbisSupport "vorbis")
|
||||
(mkFlag vorbisSupport "vorbis-encoder")
|
||||
(mkFlag madSupport "mad")
|
||||
(mkFlag mikmodSupport "mikmod")
|
||||
(mkFlag id3tagSupport "id3")
|
||||
(mkFlag shoutSupport "shout")
|
||||
(mkFlag sqliteSupport "sqlite")
|
||||
(mkFlag curlSupport "curl")
|
||||
(mkFlag soupSupport "soup")
|
||||
(mkFlag audiofileSupport "audiofile")
|
||||
(mkFlag bzip2Support "bzip2")
|
||||
(mkFlag ffadoSupport "ffado")
|
||||
(mkFlag ffmpegSupport "ffmpeg")
|
||||
(mkFlag fluidsynthSupport "fluidsynth")
|
||||
(mkFlag zipSupport "zzip")
|
||||
(mkFlag samplerateSupport "lsr")
|
||||
(mkFlag mmsSupport "mms")
|
||||
(mkFlag mpg123Support "mpg123")
|
||||
(mkFlag aacSupport "aac")
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = ''
|
||||
${if shoutSupport then "-lshout" else ""}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
# system, e.g., cygwin and mingw builds on i686-cygwin. Most people
|
||||
# can ignore it.
|
||||
|
||||
{system, stdenvType ? system, allPackages ? import ../.., platform}:
|
||||
{ system, stdenvType ? system, allPackages ? import ../.., platform, config }:
|
||||
|
||||
assert system != "i686-cygwin" -> system == stdenvType;
|
||||
|
||||
@ -24,7 +24,7 @@ rec {
|
||||
# be used with care, since many Nix packages will not build properly
|
||||
# with it (e.g., because they require GNU Make).
|
||||
stdenvNative = (import ./native {
|
||||
inherit system allPackages;
|
||||
inherit system allPackages config;
|
||||
}).stdenv;
|
||||
|
||||
stdenvNativePkgs = allPackages {
|
||||
@ -35,13 +35,14 @@ rec {
|
||||
|
||||
# The Nix build environment.
|
||||
stdenvNix = import ./nix {
|
||||
inherit config;
|
||||
stdenv = stdenvNative;
|
||||
pkgs = stdenvNativePkgs;
|
||||
};
|
||||
|
||||
|
||||
# Linux standard environment.
|
||||
stdenvLinux = (import ./linux {inherit system allPackages platform;}).stdenvLinux;
|
||||
stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux;
|
||||
|
||||
|
||||
# MinGW/MSYS standard environment.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
|
||||
, extraAttrs ? {}, overrides ? (pkgs: {})
|
||||
, extraAttrs ? {}, overrides ? (pkgs: {}), config
|
||||
|
||||
, # The `fetchurl' to use for downloading curl and its dependencies
|
||||
# (see all-packages.nix).
|
||||
@ -10,7 +10,7 @@ let
|
||||
|
||||
lib = import ../../lib;
|
||||
|
||||
disallowUnfree = builtins.getEnv "HYDRA_DISALLOW_UNFREE" == "1";
|
||||
allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";
|
||||
|
||||
stdenvGenerator = setupScript: rec {
|
||||
|
||||
@ -41,7 +41,7 @@ let
|
||||
# Add a utility function to produce derivations that use this
|
||||
# stdenv and its shell.
|
||||
mkDerivation = attrs:
|
||||
if disallowUnfree && attrs.meta.license or "" == "unfree" then
|
||||
if !allowUnfree && attrs.meta.license or "" == "unfree" then
|
||||
throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
|
||||
else
|
||||
(derivation (
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# The function defaults are for easy testing.
|
||||
{ system ? builtins.currentSystem
|
||||
, allPackages ? import ../../top-level/all-packages.nix
|
||||
, platform ? null }:
|
||||
, platform ? null, config }:
|
||||
|
||||
rec {
|
||||
|
||||
@ -81,7 +81,7 @@ rec {
|
||||
{gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}:
|
||||
|
||||
import ../generic {
|
||||
inherit system;
|
||||
inherit system config;
|
||||
name = "stdenv-linux-boot";
|
||||
preHook =
|
||||
''
|
||||
@ -261,7 +261,7 @@ rec {
|
||||
# dependency (`nix-store -qR') on bootstrapTools or the
|
||||
# first binutils built.
|
||||
stdenvLinux = import ../generic rec {
|
||||
inherit system;
|
||||
inherit system config;
|
||||
|
||||
preHook = commonPreHook;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ system, allPackages ? import ../../.. }:
|
||||
{ system, allPackages ? import ../../.., config }:
|
||||
|
||||
rec {
|
||||
|
||||
@ -98,7 +98,7 @@ rec {
|
||||
|
||||
fetchurlBoot = fetchurl;
|
||||
|
||||
inherit system shell gcc overrides;
|
||||
inherit system shell gcc overrides config;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ stdenv, pkgs }:
|
||||
{ stdenv, pkgs, config }:
|
||||
|
||||
import ../generic rec {
|
||||
inherit config;
|
||||
|
||||
preHook =
|
||||
''
|
||||
export NIX_ENFORCE_PURITY=1
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "reiserfsprogs-3.6.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2";
|
||||
url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
|
||||
sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
|
||||
};
|
||||
|
||||
|
||||
@ -2,15 +2,15 @@ a :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
|
||||
version = a.lib.attrByPath ["version"] "1.0" a;
|
||||
version = "1.1.0";
|
||||
buildInputs = with a; [
|
||||
cmake imagemagick patchelf
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.0.tar.bz2";
|
||||
sha256 = "bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e";
|
||||
url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
|
||||
sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
|
||||
};
|
||||
|
||||
inherit buildInputs;
|
||||
|
||||
8
pkgs/tools/graphics/cuneiform/default.upstream
Normal file
8
pkgs/tools/graphics/cuneiform/default.upstream
Normal file
@ -0,0 +1,8 @@
|
||||
url https://launchpad.net/cuneiform-linux/+download
|
||||
|
||||
do_overwrite () {
|
||||
ensure_hash
|
||||
set_var_value version "$CURRENT_VERSION"
|
||||
set_var_value sha256 "$CURRENT_HASH"
|
||||
set_var_value ' url' "$CURRENT_URL"
|
||||
}
|
||||
19
pkgs/tools/graphics/jbig2enc/default.nix
Normal file
19
pkgs/tools/graphics/jbig2enc/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation {
|
||||
name = "jbig2enc-0.28";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz;
|
||||
sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ];
|
||||
|
||||
# This is necessary, because the resulting library has
|
||||
# /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib
|
||||
# in its rpath, which means that patchelf --shrink-rpath removes
|
||||
# the /nix/store one. By cleaning up before fixup, we ensure that
|
||||
# the /tmp/nix-build-jbig2enc/src/.libs directory is gone.
|
||||
preFixup = ''
|
||||
make clean
|
||||
'';
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, gzip, popt}:
|
||||
{ stdenv, fetchurl, gzip, popt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "logrotate-3.7.8";
|
||||
name = "logrotate-3.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz;
|
||||
sha256 = "1p9nqmznqvzn03saw3jxa8xwsdqym8jr778rwig8kk786343vai1";
|
||||
url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz";
|
||||
sha256 = "0xqrz8xzs2c1vx8l5h9lp2ciwwifj7y52xsppb1vrvbi254vyxh7";
|
||||
};
|
||||
|
||||
# Logrotate wants to access the 'mail' program; to be done.
|
||||
@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ popt ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://fedorahosted.org/releases/l/o/logrotate/";
|
||||
homepage = https://fedorahosted.org/releases/l/o/logrotate/;
|
||||
description = "Rotates and compresses system logs";
|
||||
license = "GPLv2+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
maintainers = [ stdenv.lib.maintainers.viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -196,7 +196,7 @@ let
|
||||
|
||||
|
||||
allStdenvs = import ../stdenv {
|
||||
inherit system stdenvType platform;
|
||||
inherit system stdenvType platform config;
|
||||
allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
|
||||
};
|
||||
|
||||
@ -419,9 +419,9 @@ let
|
||||
inherit pkgs;
|
||||
pkgs_i686 = pkgsi686Linux;
|
||||
};
|
||||
|
||||
|
||||
xcodeenv = callPackage ../development/mobile/xcodeenv { };
|
||||
|
||||
|
||||
titaniumenv = import ../development/mobile/titaniumenv {
|
||||
inherit pkgs;
|
||||
pkgs_i686 = pkgsi686Linux;
|
||||
@ -1318,6 +1318,8 @@ let
|
||||
|
||||
pdfjam = callPackage ../tools/typesetting/pdfjam { };
|
||||
|
||||
jbig2enc = callPackage ../tools/graphics/jbig2enc { };
|
||||
|
||||
pdfread = callPackage ../tools/graphics/pdfread { };
|
||||
|
||||
briss = callPackage ../tools/graphics/briss { };
|
||||
@ -2834,25 +2836,23 @@ let
|
||||
|
||||
pure = callPackage ../development/interpreters/pure {};
|
||||
|
||||
python = python27;
|
||||
python3 = python32;
|
||||
|
||||
python26 = callPackage ../development/interpreters/python/2.6 { };
|
||||
|
||||
python27 = callPackage ../development/interpreters/python/2.7 { };
|
||||
|
||||
python32 = callPackage ../development/interpreters/python/3.2 { };
|
||||
|
||||
pythonFull = python27Full;
|
||||
python = python27;
|
||||
python26 = callPackage ../development/interpreters/python/2.6 { };
|
||||
python27 = callPackage ../development/interpreters/python/2.7 { };
|
||||
|
||||
pythonFull = python27Full;
|
||||
python26Full = callPackage ../development/interpreters/python/wrapper.nix {
|
||||
extraLibs = lib.attrValues python26.modules;
|
||||
python = python26;
|
||||
inherit (python26Packages) recursivePthLoader;
|
||||
};
|
||||
|
||||
python27Full = callPackage ../development/interpreters/python/wrapper.nix {
|
||||
extraLibs = lib.attrValues python27.modules;
|
||||
python = python27;
|
||||
inherit (python27Packages) recursivePthLoader;
|
||||
};
|
||||
|
||||
pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };
|
||||
@ -5291,6 +5291,10 @@ let
|
||||
|
||||
pythonPackages = python27Packages;
|
||||
|
||||
# `nix-env -i python-nose` installs for 2.7, the default python.
|
||||
# Therefore we do not recurse into attributes here, in contrast to
|
||||
# python27Packages. `nix-env -iA python26Packages.nose` works
|
||||
# regardless.
|
||||
python26Packages = import ./python-packages.nix {
|
||||
inherit pkgs;
|
||||
python = python26;
|
||||
@ -5307,13 +5311,13 @@ let
|
||||
|
||||
numeric = callPackage ../development/python-modules/numeric { };
|
||||
|
||||
pil = python27Packages.pil;
|
||||
pil = pythonPackages.pil;
|
||||
|
||||
psyco = callPackage ../development/python-modules/psyco { };
|
||||
|
||||
pycairo = callPackage ../development/python-modules/pycairo { };
|
||||
pycairo = pythonPackages.pycairo;
|
||||
|
||||
pycrypto = python27Packages.pycrypto;
|
||||
pycrypto = pythonPackages.pycrypto;
|
||||
|
||||
pycups = callPackage ../development/python-modules/pycups { };
|
||||
|
||||
@ -5321,13 +5325,11 @@ let
|
||||
|
||||
pygame = callPackage ../development/python-modules/pygame { };
|
||||
|
||||
pygobject = callPackage ../development/python-modules/pygobject { };
|
||||
pygobject = pythonPackages.pygobject;
|
||||
|
||||
pygtk = callPackage ../development/python-modules/pygtk { };
|
||||
pygtk = pythonPackages.pygtk;
|
||||
|
||||
pyGtkGlade = callPackage ../development/python-modules/pygtk {
|
||||
inherit (gnome) libglade;
|
||||
};
|
||||
pyGtkGlade = pythonPackages.pyGtkGlade;
|
||||
|
||||
pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) {
|
||||
inherit python openssl;
|
||||
|
||||
@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
HTTP = self.HTTP_4000_2_6; # 7.6 ok
|
||||
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
|
||||
mtl = self.mtl_2_1_2; # 7.6 ok
|
||||
network = self.network_2_4_0_1; # 7.6 ok
|
||||
network = self.network_2_4_1_0; # 7.6 ok
|
||||
OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok
|
||||
parallel = self.parallel_3_2_0_3; # 7.6 ok
|
||||
parsec = self.parsec_3_1_3; # 7.6 ok
|
||||
@ -582,6 +582,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
|
||||
|
||||
cipherRc4 = callPackage ../development/libraries/haskell/cipher-rc4 {};
|
||||
|
||||
classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {};
|
||||
|
||||
classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {};
|
||||
@ -634,8 +636,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
|
||||
|
||||
cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {};
|
||||
|
||||
cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {};
|
||||
|
||||
cryptoPubkey = callPackage ../development/libraries/haskell/crypto-pubkey {};
|
||||
|
||||
cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {};
|
||||
|
||||
cuda = callPackage ../development/libraries/haskell/cuda {
|
||||
@ -913,7 +919,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {};
|
||||
|
||||
hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
|
||||
hashable_1_2_0_3 = callPackage ../development/libraries/haskell/hashable/1.2.0.3.nix {};
|
||||
hashable_1_2_0_5 = callPackage ../development/libraries/haskell/hashable/1.2.0.5.nix {};
|
||||
hashable = self.hashable_1_1_2_5;
|
||||
|
||||
hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
|
||||
@ -1260,8 +1266,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
|
||||
network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
|
||||
network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
|
||||
network_2_4_0_1 = callPackage ../development/libraries/haskell/network/2.4.0.1.nix {};
|
||||
network = self.network_2_4_0_1;
|
||||
network_2_4_1_0 = callPackage ../development/libraries/haskell/network/2.4.1.0.nix {};
|
||||
network = self.network_2_4_1_0;
|
||||
|
||||
networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
|
||||
|
||||
|
||||
@ -2039,6 +2039,21 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
GoogleProtocolBuffers = buildPerlPackage rec {
|
||||
name = "Google-ProtocolBuffers-0.08";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/G/GA/GARIEV/${name}.tar.gz";
|
||||
sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3";
|
||||
};
|
||||
propagatedBuildInputs = [ ClassAccessor ParseRecDescent ];
|
||||
patches =
|
||||
[ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ];
|
||||
meta = {
|
||||
description = "Simple interface to Google Protocol Buffers";
|
||||
license = "perl";
|
||||
};
|
||||
};
|
||||
|
||||
Graph = buildPerlPackage rec {
|
||||
name = "Graph-0.94";
|
||||
src = fetchurl {
|
||||
|
||||
@ -3,22 +3,28 @@
|
||||
let pythonPackages = python.modules // rec {
|
||||
|
||||
inherit python;
|
||||
|
||||
inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
|
||||
|
||||
# helpers
|
||||
|
||||
buildPythonPackage = import ../development/python-modules/generic {
|
||||
inherit (pkgs) lib;
|
||||
inherit python wrapPython setuptools setuptoolsSite offlineDistutils;
|
||||
inherit python wrapPython setuptools recursivePthLoader offlineDistutils;
|
||||
};
|
||||
|
||||
wrapPython = pkgs.makeSetupHook
|
||||
{ deps = pkgs.makeWrapper;
|
||||
substitutions.libPrefix = python.libPrefix;
|
||||
}
|
||||
../development/python-modules/generic/wrap.sh;
|
||||
|
||||
# specials
|
||||
|
||||
recursivePthLoader = import ../development/python-modules/recursive-pth-loader {
|
||||
inherit (pkgs) stdenv;
|
||||
inherit python;
|
||||
};
|
||||
|
||||
|
||||
setuptools = import ../development/python-modules/setuptools {
|
||||
inherit (pkgs) stdenv fetchurl;
|
||||
inherit python wrapPython;
|
||||
@ -34,6 +40,8 @@ let pythonPackages = python.modules // rec {
|
||||
inherit python;
|
||||
};
|
||||
|
||||
# packages defined elsewhere
|
||||
|
||||
ipython = import ../shells/ipython {
|
||||
inherit (pkgs) stdenv fetchurl;
|
||||
inherit buildPythonPackage pythonPackages;
|
||||
@ -44,17 +52,37 @@ let pythonPackages = python.modules // rec {
|
||||
inherit python buildPythonPackage;
|
||||
};
|
||||
|
||||
pycairo = import ../development/python-modules/pycairo {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
|
||||
inherit python;
|
||||
};
|
||||
|
||||
pycrypto = import ../development/python-modules/pycrypto {
|
||||
inherit (pkgs) fetchurl stdenv gmp;
|
||||
inherit python buildPythonPackage;
|
||||
};
|
||||
|
||||
wrapPython = pkgs.makeSetupHook
|
||||
{ deps = pkgs.makeWrapper;
|
||||
substitutions.libPrefix = python.libPrefix;
|
||||
}
|
||||
../development/python-modules/generic/wrap.sh;
|
||||
pygobject = import ../development/python-modules/pygobject {
|
||||
inherit (pkgs) stdenv fetchurl pkgconfig glib;
|
||||
inherit python;
|
||||
};
|
||||
|
||||
pygtk = import ../development/python-modules/pygtk {
|
||||
inherit (pkgs) fetchurl stdenv pkgconfig glib gtk;
|
||||
inherit python buildPythonPackage pygobject pycairo;
|
||||
};
|
||||
|
||||
# XXX: how can we get an override here?
|
||||
#pyGtkGlade = pygtk.override {
|
||||
# inherit (pkgs.gnome) libglade;
|
||||
#};
|
||||
pyGtkGlade = import ../development/python-modules/pygtk {
|
||||
inherit (pkgs) fetchurl stdenv pkgconfig glib gtk;
|
||||
inherit (pkgs.gnome) libglade;
|
||||
inherit python buildPythonPackage pygobject pycairo;
|
||||
};
|
||||
|
||||
# packages defined here
|
||||
|
||||
afew = buildPythonPackage rec {
|
||||
rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199";
|
||||
@ -324,6 +352,22 @@ let pythonPackages = python.modules // rec {
|
||||
# });
|
||||
|
||||
|
||||
buildout = buildPythonPackage rec {
|
||||
name = "buildout-${version}";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz";
|
||||
md5 = "4e3b521600e475c56a0a66459a5fc7bb";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://www.buildout.org/;
|
||||
description = "A software build and configuration system";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
carrot = buildPythonPackage rec {
|
||||
name = "carrot-0.10.7";
|
||||
|
||||
@ -458,6 +502,16 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
cssselect = buildPythonPackage rec {
|
||||
name = "cssselect-0.7.1";
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz";
|
||||
md5 = "c6c5e9a2e7ca226ce03f6f67a771379c";
|
||||
};
|
||||
# AttributeError: 'module' object has no attribute 'tests'
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
cssutils = buildPythonPackage (rec {
|
||||
name = "cssutils-0.9.9";
|
||||
|
||||
@ -1217,6 +1271,23 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
manuel = buildPythonPackage rec {
|
||||
name = "manuel-${version}";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
|
||||
md5 = "53d6a6905301a20f6095e41d11968fff";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six zope_testing ];
|
||||
|
||||
meta = {
|
||||
description = "A documentation builder";
|
||||
homepage = http://pypi.python.org/pypi/manuel;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
markdown = buildPythonPackage rec {
|
||||
version = "2.0.3";
|
||||
@ -1330,6 +1401,26 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
|
||||
|
||||
mrbob = buildPythonPackage rec {
|
||||
name = "mrbob-${version}";
|
||||
version = "0.1a6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip";
|
||||
md5 = "361c8ac7a31953ab94a95cf34d9a0b2b";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.unzip ];
|
||||
|
||||
propagatedBuildInputs = [ argparse jinja2 ];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/iElectric/mr.bob.git;
|
||||
description = "A tool to generate code skeletons from templates";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
mutagen = buildPythonPackage (rec {
|
||||
name = "mutagen-1.20";
|
||||
|
||||
@ -1800,6 +1891,21 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
|
||||
|
||||
psutil = buildPythonPackage rec {
|
||||
name = "psutil-0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://psutil.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "0vqarv63jqzghr4fi1fqdbvg847fq2gqdj8dzc3x59f9b36a8rfn";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Process and system utilization information interface for python";
|
||||
homepage = http://code.google.com/p/psutil/;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
psycopg2 = buildPythonPackage rec {
|
||||
name = "psycopg2-2.0.13";
|
||||
|
||||
@ -2171,6 +2277,16 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
|
||||
|
||||
pyquery = buildPythonPackage rec {
|
||||
name = "pyquery-1.2.4";
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz";
|
||||
md5 = "268f08258738d21bc1920d7522f2a63b";
|
||||
};
|
||||
buildInputs = [ cssselect lxml ];
|
||||
};
|
||||
|
||||
|
||||
pyreport = buildPythonPackage (rec {
|
||||
name = "pyreport-0.3.4c";
|
||||
|
||||
@ -2811,6 +2927,24 @@ let pythonPackages = python.modules // rec {
|
||||
});
|
||||
|
||||
|
||||
subunit = buildPythonPackage rec {
|
||||
name = "subunit-${version}";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz";
|
||||
sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ testtools ];
|
||||
|
||||
meta = {
|
||||
description = "A streaming protocol for test results";
|
||||
homepage = https://launchpad.net/subunit;
|
||||
license = pkgs.lib.licenses.asl20;
|
||||
};
|
||||
};
|
||||
|
||||
# XXX: ValueError: ZIP does not support timestamps before 1980
|
||||
# svneverever = buildPythonPackage rec {
|
||||
# name = "svneverever-778489a8";
|
||||
@ -2872,6 +3006,23 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
|
||||
|
||||
testtools = buildPythonPackage rec {
|
||||
name = "testtools-${version}";
|
||||
version = "0.9.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz";
|
||||
sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A set of extensions to the Python standard library's unit testing framework";
|
||||
homepage = http://pypi.python.org/pypi/testtools;
|
||||
license = pkgs.lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
trac = buildPythonPackage {
|
||||
name = "trac-0.12.2";
|
||||
|
||||
@ -2894,6 +3045,26 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
transaction = buildPythonPackage rec {
|
||||
name = "transaction-${version}";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
|
||||
md5 = "b7c2ff135939f605a8c54e1c13cd5d66";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zopeInterface ];
|
||||
|
||||
meta = {
|
||||
description = "Transaction management";
|
||||
homepage = http://pypi.python.org/pypi/transaction;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
turses = buildPythonPackage (rec {
|
||||
name = "turses-0.2.9";
|
||||
|
||||
@ -3028,10 +3199,10 @@ let pythonPackages = python.modules // rec {
|
||||
});
|
||||
|
||||
virtualenv = buildPythonPackage rec {
|
||||
name = "virtualenv-1.6.4";
|
||||
name = "virtualenv-1.8.4";
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
|
||||
md5 = "1072b66d53c24e019a8f1304ac9d9fc5";
|
||||
md5 = "1c7e56a7f895b2e71558f96e365ee7a7";
|
||||
};
|
||||
|
||||
patches = [ ../development/python-modules/virtualenv-change-prefix.patch ];
|
||||
@ -3212,6 +3383,62 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
zconfig = buildPythonPackage rec {
|
||||
name = "zconfig-${version}";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz";
|
||||
md5 = "2c5f73c216140a705be3d9c44b988722";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_testrunner ];
|
||||
|
||||
meta = {
|
||||
description = "Structured Configuration Library";
|
||||
homepage = http://pypi.python.org/pypi/ZConfig;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zc_lockfile = buildPythonPackage rec {
|
||||
name = "zc_lockfile-${version}";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-${version}.tar.gz";
|
||||
md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Inter-process locks";
|
||||
homepage = http://www.python.org/pypi/zc.lockfile;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zdaemon = buildPythonPackage rec {
|
||||
name = "zdaemon-${version}";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
|
||||
md5 = "975f770544bb4352c5cf32fec22e63c9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zconfig ];
|
||||
|
||||
meta = {
|
||||
description = "A daemon process control library and tools for Unix-based systems";
|
||||
homepage = http://pypi.python.org/pypi/zdaemon;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zfec = buildPythonPackage (rec {
|
||||
name = "zfec-1.4.7";
|
||||
|
||||
@ -3241,6 +3468,102 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
zodb3 = buildPythonPackage rec {
|
||||
name = "zodb3-${version}";
|
||||
version = "3.10.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz";
|
||||
md5 = "6f180c6897a1820948fee2a6290503cd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zopeInterface zope_event ];
|
||||
|
||||
meta = {
|
||||
description = "An object-oriented database for Python";
|
||||
homepage = http://pypi.python.org/pypi/ZODB3;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_event = buildPythonPackage rec {
|
||||
name = "zope_event-${version}";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-${version}.tar.gz";
|
||||
md5 = "e08dd299d428d77a1cfcbfe841b81872";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "An event publishing system";
|
||||
homepage = http://pypi.python.org/pypi/zope.event;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_exceptions = buildPythonPackage rec {
|
||||
name = "zopeexceptions-${version}";
|
||||
version = "4.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-${version}.tar.gz";
|
||||
md5 = "c95569fcb444ae541777de7ae5297492";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zopeInterface ];
|
||||
|
||||
meta = {
|
||||
description = "Exception interfaces and implementations";
|
||||
homepage = http://pypi.python.org/pypi/zope.exceptions;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_testing = buildPythonPackage rec {
|
||||
name = "zope_testing-${version}";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-${version}.tar.gz";
|
||||
md5 = "2e3829841090d6adff718b8b73c87b6b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zopeInterface zope_exceptions ];
|
||||
|
||||
meta = {
|
||||
description = "Zope testing helpers";
|
||||
homepage = http://pypi.python.org/pypi/zope.testing;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_testrunner = buildPythonPackage rec {
|
||||
name = "zope_testrunner-${version}";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/z/zope.testrunner/zope.testrunner-${version}.zip";
|
||||
md5 = "cd648fc865a79aa0950e73342836dd4c";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.unzip ];
|
||||
|
||||
propagatedBuildInputs = [ subunit zopeInterface zope_exceptions zope_testing ];
|
||||
|
||||
meta = {
|
||||
description = "A flexible test runner with layer support";
|
||||
homepage = http://pypi.python.org/pypi/zope.testrunner;
|
||||
license = "ZPL";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zopeInterface = buildPythonPackage {
|
||||
name = "zope-interface-3.6.1";
|
||||
src = fetchurl {
|
||||
|
||||
@ -1,7 +1,11 @@
|
||||
rec {
|
||||
allPackages = import ./all-packages.nix;
|
||||
|
||||
pkgs = allPackages {};
|
||||
# Ensure that we don't build packages marked as unfree.
|
||||
allPackages = args: import ./all-packages.nix (args // {
|
||||
config.allowUnfree = false;
|
||||
});
|
||||
|
||||
pkgs = allPackages { };
|
||||
|
||||
/* !!! Hack: poor man's memoisation function. Necessary for prevent
|
||||
Nixpkgs from being evaluated again and again for every
|
||||
|
||||
2015
pkgs/top-level/release-python.nix
Normal file
2015
pkgs/top-level/release-python.nix
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user