Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
Frederik Rietdijk
commit
b0c30f436e
|
|
@ -82,14 +82,13 @@ in
|
|||
};
|
||||
|
||||
resolverName = mkOption {
|
||||
default = "dnscrypt.eu-nl";
|
||||
default = "random";
|
||||
example = "dnscrypt.eu-nl";
|
||||
type = types.nullOr types.str;
|
||||
description = ''
|
||||
The name of the DNSCrypt resolver to use, taken from
|
||||
<filename>${resolverList}</filename>. The default
|
||||
resolver is located in Holland, supports DNS security
|
||||
extensions, and <emphasis>claims</emphasis> to not
|
||||
keep logs.
|
||||
<filename>${resolverList}</filename>. The default is to
|
||||
pick a random non-logging resolver that supports DNSSEC.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -172,6 +172,7 @@ in
|
|||
};
|
||||
preStart = ''
|
||||
mkdir -p /etc/tinc/${network}/hosts
|
||||
chown tinc.${network} /etc/tinc/${network}/hosts
|
||||
|
||||
# Determine how we should generate our keys
|
||||
if type tinc >/dev/null 2>&1; then
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ in rec {
|
|||
|
||||
preview = mkStudio rec {
|
||||
pname = "android-studio-preview";
|
||||
version = "3.0.0.8"; # This is actually "Android Studio 3.0 Canary 9"
|
||||
build = "171.4220116";
|
||||
sha256Hash = "02aw1m65wb5cgjq1dxm86c5m6p8b41kgjcgsl5d0h93fb4clf64b";
|
||||
version = "3.0.0.9"; # This is actually "Android Studio 3.0 Beta 1"
|
||||
build = "171.4243858";
|
||||
sha256Hash = "137jd4146srjigyzcfds8pf7b185q1qdkb0zp2yqc8g6bv4ccb22";
|
||||
|
||||
meta = stable.meta // {
|
||||
description = "The Official IDE for Android (preview version)";
|
||||
|
|
|
|||
|
|
@ -1,39 +1,28 @@
|
|||
{stdenv, fetchurl, writeScript, pkgconfig, cmake, qt4, seafile-shared, ccnet, makeWrapper}:
|
||||
{ stdenv, fetchurl, writeScript, pkgconfig, cmake, qtbase, qttools
|
||||
, seafile-shared, ccnet, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
version = "5.0.7";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.1.0";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
src = fetchurl
|
||||
{
|
||||
src = fetchurl {
|
||||
url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
|
||||
sha256 = "ae6975bc1adf45d09cf9f6332ceac7cf285f8191f6cf50c6291ed45f8cf4ffa5";
|
||||
sha256 = "16rn6b9ayaccgwx8hs3yh1wb395pp8ffh8may8a8bpcc4gdry7bd";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
|
||||
|
||||
builder = writeScript "${name}-builder.sh" ''
|
||||
source $stdenv/setup
|
||||
|
||||
tar xvfz $src
|
||||
cd seafile-client-*
|
||||
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_PREFIX="$out" .
|
||||
make -j1
|
||||
|
||||
make install
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
buildInputs = [ qtbase qttools seafile-shared ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/seafile-applet \
|
||||
--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}
|
||||
'';
|
||||
'';
|
||||
|
||||
meta =
|
||||
{
|
||||
homepage = https://github.com/haiwen/seafile-clients;
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/haiwen/seafile-client;
|
||||
description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.calrama ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.calrama ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lkl-2017-06-27";
|
||||
rev = "0d91d102b046eec535a6d67df9829b80b24e9ce9";
|
||||
name = "lkl-2017-08-09";
|
||||
rev = "083cdeece0577635d523244dcf0da86074e23e4e";
|
||||
|
||||
outputs = [ "dev" "lib" "out" ];
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
inherit rev;
|
||||
owner = "lkl";
|
||||
repo = "linux";
|
||||
sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas";
|
||||
sha256 = "1fyh0p54jgsqywswj40zbw64jbqx2w10wax1k3j2szzlhjrv9x1a";
|
||||
};
|
||||
|
||||
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, writeText, nss, python3
|
||||
{ stdenv, fetchurl, writeText, nss, python
|
||||
, blacklist ? []
|
||||
, includeEmail ? false
|
||||
}:
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = nss.src;
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
nativeBuildInputs = [ python ];
|
||||
|
||||
configurePhase = ''
|
||||
ln -s nss/lib/ckfw/builtins/certdata.txt
|
||||
|
|
@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
|
|||
${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)}
|
||||
EOF
|
||||
|
||||
cp ${certdata2pem} certdata2pem.py
|
||||
cat ${certdata2pem} > certdata2pem.py
|
||||
patch -p1 < ${./fix-unicode-ca-names.patch}
|
||||
${optionalString includeEmail ''
|
||||
# Disable CAs used for mail signing
|
||||
substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] '''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
--- a/certdata2pem.py 2017-08-01 23:10:00.000000000 +0300
|
||||
+++ b/certdata2pem.py 2017-08-01 23:08:21.131297636 +0300
|
||||
@@ -88,7 +88,7 @@
|
||||
\# Read blacklist.
|
||||
blacklist = []
|
||||
if os.path.exists('blacklist.txt'):
|
||||
- for line in open('blacklist.txt', 'r'):
|
||||
+ for line in io.open('blacklist.txt', 'r', encoding='utf-8'):
|
||||
line = line.strip()
|
||||
if line.startswith('#') or len(line) == 0:
|
||||
continue
|
||||
@@ -101,7 +101,7 @@
|
||||
if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
|
||||
continue
|
||||
if obj['CKA_LABEL'] in blacklist:
|
||||
- print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'])
|
||||
+ print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8'))
|
||||
elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
trust[obj['CKA_LABEL']] = True
|
||||
elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
# If enabled GHC will be build with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
, enableIntegerSimple ? false, gmp
|
||||
, version ? "8.3.20170808"
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -12,8 +13,7 @@ let
|
|||
|
||||
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
|
||||
|
||||
version = "8.1.20170106";
|
||||
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
|
||||
rev = "14457cf6a50f708eecece8f286f08687791d51f7";
|
||||
|
||||
commonPreConfigure = ''
|
||||
echo ${version} >VERSION
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
|
|||
src = fetchgit {
|
||||
url = "git://git.haskell.org/ghc.git";
|
||||
inherit rev;
|
||||
sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
|
||||
sha256 = "08vj9ca7rq7rv8pjfl14fg2lg9d6zisrwlq6bi5vzr006816dy8y";
|
||||
};
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv.mkDerivation rec
|
||||
{
|
||||
version = "3.0.7";
|
||||
seafileVersion = "5.0.7";
|
||||
seafileVersion = "6.1.0";
|
||||
name = "libsearpc-${version}";
|
||||
|
||||
src = fetchurl
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "movit-${version}";
|
||||
version = "1.2.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://movit.sesse.net/${name}.tar.gz";
|
||||
sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf";
|
||||
sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ let
|
|||
# Might want to use `python2.withPackages(ps: [ps.numpy]);` here...
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "vigra-${version}";
|
||||
version = "1.10.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
|
||||
sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
|
||||
sha256 = "03i5wfscv83jb8vnwwhfmm8yfiniwkvk13myzhr1kbwbs9884wdj";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
{ stdenv, buildPythonPackage, fetchurl }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distorm3";
|
||||
version = "3.3.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/d/${pname}/${name}.zip";
|
||||
sha256 = "1bh9xdiz9mkf9lfffimfn3hgd0mh60y7wl1micgkxzpl7hnxrpd4";
|
||||
};
|
||||
|
||||
# no tests included
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Powerful Disassembler Library For x86/AMD64";
|
||||
homepage = https://github.com/gdabah/distorm;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
# Python deps
|
||||
, singledispatch
|
||||
, logutils
|
||||
, webtest
|
||||
, Mako
|
||||
, genshi
|
||||
, Kajiki
|
||||
, sqlalchemy
|
||||
, gunicorn
|
||||
, jinja2
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "pecan";
|
||||
version = "1.2.1";
|
||||
|
||||
patches = [
|
||||
./python36_test_fix.patch
|
||||
];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ikc32rd2hr8j2jxc0mllvdjvxydx3fwfp3z8sdxmkzdkixlb5cd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ singledispatch logutils ];
|
||||
buildInputs = [
|
||||
webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pecan";
|
||||
homepage = "http://github.com/pecan/pecan";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/pecan/tests/test_conf.py b/pecan/tests/test_conf.py
|
||||
index 0573d84..7c98e16 100644
|
||||
--- a/pecan/tests/test_conf.py
|
||||
+++ b/pecan/tests/test_conf.py
|
||||
@@ -157,7 +157,7 @@ class TestConf(PecanTestCase):
|
||||
|
||||
try:
|
||||
configuration.conf_from_file(f.name)
|
||||
- except (ValueError, SystemError) as e:
|
||||
+ except (ValueError, SystemError, ImportError) as e:
|
||||
assert 'relative import' in str(e)
|
||||
else:
|
||||
raise AssertionError(
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, zope_interface
|
||||
, mock
|
||||
}:
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "transaction";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1mab0r3grmgz9d97y8pynhg0r34v0am35vpxyvh7ff5sgmg3dg5r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface mock ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Transaction management";
|
||||
homepage = http://pypi.python.org/pypi/transaction;
|
||||
license = licenses.zpl20;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, zope_testrunner
|
||||
, transaction
|
||||
, six
|
||||
, wheel
|
||||
, zope_interface
|
||||
, zodbpickle
|
||||
, zconfig
|
||||
, persistent
|
||||
, zc_lockfile
|
||||
, BTrees
|
||||
, manuel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ZODB";
|
||||
version = "5.2.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1pya0inkkxaqmi14gp796cidf894nz64n603zk670jj9xz0wkhgc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
manuel
|
||||
transaction
|
||||
zope_testrunner
|
||||
six
|
||||
wheel
|
||||
zope_interface
|
||||
zodbpickle
|
||||
zconfig
|
||||
persistent
|
||||
zc_lockfile
|
||||
BTrees
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Zope Object Database: object database and persistence";
|
||||
homepage = http://pypi.python.org/pypi/ZODB;
|
||||
license = licenses.zpl21;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,6 @@
|
|||
, zope_exceptions
|
||||
, zope_testing
|
||||
, six
|
||||
, subunit
|
||||
}:
|
||||
|
||||
|
||||
|
|
@ -21,7 +20,7 @@ buildPythonPackage rec {
|
|||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit;
|
||||
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A flexible test runner with layer support";
|
||||
|
|
|
|||
|
|
@ -66,6 +66,13 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional (!pythonSupport) "--without-python"
|
||||
++ stdenv.lib.optional multitarget "--enable-targets=all";
|
||||
|
||||
preConfigure =
|
||||
# Not sure why this is causing problems, now that the stdenv
|
||||
# exports CPP=cpp the build fails with strange errors on darwin.
|
||||
stdenv.lib.optionalString stdenv.cc.isClang ''
|
||||
unset CPP
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
'' # Remove Info files already provided by Binutils and other packages.
|
||||
rm -v $out/share/info/bfd.info
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
version = "5.0.7";
|
||||
version = "6.1.0";
|
||||
name = "seafile-shared-${version}";
|
||||
|
||||
src = fetchurl
|
||||
{
|
||||
url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
|
||||
sha256 = "ec166c86a41e7ab3b1ae97a56326ab4a2b1ec38686486b956c3d153b8023c670";
|
||||
sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6";
|
||||
};
|
||||
|
||||
buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ];
|
||||
propagatedBuildInputs = [ ccnet curl ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
|
||||
sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "knot-resolver-${version}";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
|
||||
sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb";
|
||||
sha256 = "c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "check_ssl_cert-${version}";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
sha256 = "07g4dhwp1plzmlqazapn0s0hysmf3kk0pa2x0wns482xm1v1mr05";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/check_ssl_cert \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Nagios plugin to check the CA and validity of an X.509 certificate";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
{ stdenv, pythonPackages, fetchFromGitHub }:
|
||||
{ lib, pythonPackages, fetchFromGitHub }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "searx-${version}";
|
||||
version = "0.12.0";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciimoo";
|
||||
|
|
@ -25,10 +26,10 @@ pythonPackages.buildPythonApplication rec {
|
|||
pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/asciimoo/searx;
|
||||
description = "A privacy-respecting, hackable metasearch engine";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ matejc fpletz profpatsch ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,37 @@
|
|||
{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
|
||||
, p7zip, mtools, syslinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unetbootin-${version}";
|
||||
version = "613";
|
||||
version = "655";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
|
||||
sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unetbootin";
|
||||
repo = "unetbootin";
|
||||
rev = version;
|
||||
sha256 = "1gis75vy172k7lgh8bwgap74s259y9x1wg3rkqhhqncl2vv0w1py";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
sourceRoot = "${name}-src/src/unetbootin";
|
||||
|
||||
buildInputs = [ makeWrapper qt4 qmake4Hook ];
|
||||
buildInputs = [ qt4 ];
|
||||
nativeBuildInputs = [ makeWrapper qmake4Hook ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Lots of nice hard-coded paths...
|
||||
postUnpack = ''
|
||||
postPatch = ''
|
||||
substituteInPlace unetbootin.cpp \
|
||||
--replace /sbin/fdisk ${utillinux}/sbin/fdisk \
|
||||
--replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
|
||||
--replace /sbin/blkid ${utillinux}/sbin/blkid \
|
||||
--replace /bin/df ${coreutils}/bin/df \
|
||||
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
|
||||
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
|
||||
--replace /bin/df ${coreutils}/bin/df \
|
||||
--replace /sbin/blkid ${utillinux}/sbin/blkid \
|
||||
--replace /sbin/fdisk ${utillinux}/sbin/fdisk \
|
||||
--replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
|
||||
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
|
||||
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
|
||||
--replace /usr/share/syslinux ${syslinux}/share/syslinux
|
||||
|
||||
substituteInPlace main.cpp \
|
||||
--replace /usr/share/unetbootin $out/share/unetbootin
|
||||
|
||||
substituteInPlace unetbootin.desktop \
|
||||
--replace /usr/bin $out/bin
|
||||
'';
|
||||
|
|
@ -46,15 +52,15 @@ stdenv.mkDerivation rec {
|
|||
cp unetbootin.desktop $out/share/applications
|
||||
|
||||
wrapProgram $out/bin/unetbootin \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]} \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \
|
||||
--set QT_X11_NO_MITSHM 1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://unetbootin.sourceforge.net/;
|
||||
homepage = http://unetbootin.sourceforge.net/;
|
||||
description = "A tool to create bootable live USB drives from ISO images";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.ebzzry ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ebzzry ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@
|
|||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
version = "5.0.7";
|
||||
seafileVersion = "5.0.7";
|
||||
version = "6.1.0";
|
||||
seafileVersion = "6.1.0";
|
||||
name = "ccnet-${version}";
|
||||
|
||||
src = fetchurl
|
||||
{
|
||||
url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
|
||||
sha256 = "1e1c670a85619b174328a15925a050c7a8b323fecd13434992332f5c15e05de1";
|
||||
sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb";
|
||||
};
|
||||
|
||||
buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python ];
|
||||
propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -ie 's|/bin/bash|/bin/sh|g' ./autogen.sh
|
||||
sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, which, cctools }:
|
||||
|
||||
let
|
||||
generic = { version, sha256 }:
|
||||
|
|
@ -10,11 +10,14 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [] ++
|
||||
stdenv.lib.optionals stdenv.isDarwin [ which cctools ];
|
||||
|
||||
patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
|
||||
|
||||
doCheck = !stdenv.isFreeBSD;
|
||||
|
||||
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
|
||||
makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
|
||||
|
||||
meta = {
|
||||
homepage = http://miniupnp.free.fr/;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "volatility-2.4";
|
||||
version = "2.6";
|
||||
name = "volatility-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz";
|
||||
sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8";
|
||||
url = "http://downloads.volatilityfoundation.org/releases/${version}/${name}.zip";
|
||||
sha256 = "15cjrx31nnqa3bpjkv0x05j7f2sb7pq46a72zh7qg55zf86hawsv";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ pythonPackages.pycrypto ];
|
||||
propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://code.google.com/p/volatility;
|
||||
homepage = http://www.volatilityfoundation.org/;
|
||||
description = "Advanced memory forensics framework";
|
||||
maintainers = with maintainers; [ bosu ];
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
{ stdenv, pythonPackages, fetchurl, callPackage, nix, }:
|
||||
{ stdenv, pythonPackages, fetchurl, callPackage, nix }:
|
||||
|
||||
let
|
||||
external = callPackage ./requirements.nix {
|
||||
inherit pythonPackages;
|
||||
};
|
||||
in pythonPackages.buildPythonApplication rec{
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "vulnix";
|
||||
version = "1.2.2";
|
||||
|
|
@ -28,7 +24,7 @@ in pythonPackages.buildPythonApplication rec{
|
|||
lxml
|
||||
pyyaml
|
||||
requests
|
||||
external.zodb
|
||||
zodb
|
||||
]);
|
||||
|
||||
checkPhase = "py.test";
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
{ pythonPackages, fetchurl, stdenv }:
|
||||
|
||||
rec {
|
||||
zodb = pythonPackages.buildPythonPackage {
|
||||
name = "ZODB-5.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz";
|
||||
sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x";
|
||||
};
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
transaction
|
||||
] ++ (with pythonPackages; [
|
||||
six
|
||||
wheel
|
||||
zope_interface
|
||||
zodbpickle
|
||||
zconfig
|
||||
persistent
|
||||
zc_lockfile
|
||||
BTrees
|
||||
]);
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.zpl21;
|
||||
description = "Zope Object Database: object database and persistence";
|
||||
};
|
||||
};
|
||||
|
||||
transaction = pythonPackages.buildPythonPackage {
|
||||
name = "transaction-2.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
|
||||
sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
|
||||
};
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
zope_interface
|
||||
six
|
||||
wheel
|
||||
mock
|
||||
];
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.zpl21;
|
||||
description = "Transaction management for Python";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "monit-5.20.0";
|
||||
name = "monit-5.23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}dist/${name}.tar.gz";
|
||||
sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b";
|
||||
sha256 = "04v7sp2vc1q6h8c5j8h4izffn9d97cdj0k64m4ml00lw6wxgwffx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ buildRubyGem rec {
|
|||
inherit ruby;
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "gist";
|
||||
version = "4.5.0";
|
||||
sha256 = "0k9bgjdmnr14whmjx6c8d5ak1dpazirj96hk5ds69rl5d9issw0l";
|
||||
version = "4.6.1";
|
||||
sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3191,7 +3191,8 @@ with pkgs;
|
|||
|
||||
minissdpd = callPackage ../tools/networking/minissdpd { };
|
||||
|
||||
inherit (callPackage ../tools/networking/miniupnpc { })
|
||||
inherit (callPackage ../tools/networking/miniupnpc
|
||||
{ inherit (darwin) cctools; })
|
||||
miniupnpc_1 miniupnpc_2;
|
||||
miniupnpc = miniupnpc_1;
|
||||
|
||||
|
|
@ -11363,6 +11364,8 @@ with pkgs;
|
|||
munin = callPackage ../servers/monitoring/munin { };
|
||||
|
||||
nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
|
||||
|
||||
checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
|
||||
|
||||
neo4j = callPackage ../servers/nosql/neo4j { };
|
||||
|
||||
|
|
@ -15974,7 +15977,7 @@ with pkgs;
|
|||
inherit (gnome2) libart_lgpl;
|
||||
};
|
||||
|
||||
seafile-client = callPackage ../applications/networking/seafile-client { };
|
||||
seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
|
||||
|
||||
seeks = callPackage ../tools/networking/p2p/seeks {
|
||||
protobuf = protobuf2_5;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ in rec {
|
|||
selfPkgs = packages.ghc821;
|
||||
};
|
||||
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
|
||||
bootPkgs = packages.ghc7103;
|
||||
bootPkgs = packages.ghc802;
|
||||
inherit (bootPkgs) alex happy;
|
||||
inherit buildPlatform targetPlatform;
|
||||
selfPkgs = packages.ghcHEAD;
|
||||
|
|
|
|||
|
|
@ -163,6 +163,8 @@ in {
|
|||
|
||||
discordpy = callPackage ../development/python-modules/discordpy { };
|
||||
|
||||
distorm3 = callPackage ../development/python-modules/distorm3 { };
|
||||
|
||||
h5py = callPackage ../development/python-modules/h5py {
|
||||
hdf5 = pkgs.hdf5;
|
||||
};
|
||||
|
|
@ -356,7 +358,7 @@ in {
|
|||
# Requires network access
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with self; [ zodb3 aiohttp ]
|
||||
propagatedBuildInputs = with self; [ aiohttp ]
|
||||
++ optional (pythonOlder "3.5") typing;
|
||||
|
||||
meta = {
|
||||
|
|
@ -411,88 +413,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
almir = let
|
||||
sqlalchemy_0_8 = buildPythonPackage rec {
|
||||
name = "SQLAlchemy-0.8.7";
|
||||
disabled = isPy34 || isPy35;
|
||||
# doCheck = !isPyPy;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
|
||||
sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc";
|
||||
};
|
||||
|
||||
preConfigure = optionalString isPy3k ''
|
||||
python3 sa2to3.py --no-diffs -w lib test examples
|
||||
'';
|
||||
|
||||
buildInputs = with self; [ nose mock ]
|
||||
++ stdenv.lib.optional doCheck pysqlite;
|
||||
|
||||
checkPhase = ''
|
||||
${python.executable} sqla_nose.py
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.sqlalchemy.org/;
|
||||
description = "A Python SQL toolkit and Object Relational Mapper";
|
||||
};
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
name = "almir-0.1.8";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/a/almir/${name}.zip";
|
||||
sha256 = "5dc0b8a5071f3ff46cd2d92608f567ba446e4c733c063b17d89703caeb9868fe";
|
||||
};
|
||||
|
||||
buildInputs = with self; [
|
||||
pkgs.which
|
||||
self.coverage
|
||||
self.mock
|
||||
self.tissue
|
||||
self.unittest2
|
||||
self.webtest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
pkgs.makeWrapper
|
||||
pkgs.bacula
|
||||
self.colander
|
||||
self.deform
|
||||
self.deform_bootstrap
|
||||
self.docutils
|
||||
self.nose
|
||||
self.mysql_connector_repackaged
|
||||
self.pg8000
|
||||
self.pyramid
|
||||
self.pyramid_beaker
|
||||
self.pyramid_exclog
|
||||
self.pyramid_jinja2
|
||||
self.pyramid_tm
|
||||
self.pytz
|
||||
sqlalchemy_0_8
|
||||
self.transaction
|
||||
self.waitress
|
||||
self.webhelpers
|
||||
self.psycopg2
|
||||
(self.zope_sqlalchemy.override rec {propagatedBuildInputs = with self; [ sqlalchemy_0_8 transaction ];})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${pkgs.bacula}/bin/bconsole $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
platforms = platforms.all;
|
||||
# Two versions of sqlalchemy in closure
|
||||
broken = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
alot = buildPythonPackage rec {
|
||||
rev = "0.5.1";
|
||||
|
|
@ -8156,22 +8076,6 @@ in {
|
|||
};
|
||||
|
||||
|
||||
pyramid_tm = buildPythonPackage rec {
|
||||
name = "pyramid_tm-0.10";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/pyramid_tm/${name}.tar.gz";
|
||||
sha256 = "99528c54accf2bd5860d10634fe8972e8375b2d0f50ee08f208ed0484ffafc1d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ transaction pyramid ];
|
||||
meta = {
|
||||
maintainers = with maintainers; [ garbas domenkozar matejc ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
pyramid_multiauth = buildPythonPackage rec {
|
||||
name = "pyramid_multiauth-${version}";
|
||||
version = "0.8.0";
|
||||
|
|
@ -8465,21 +8369,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
hypatia = buildPythonPackage rec {
|
||||
name = "hypatia-0.3";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/h/hypatia/${name}.tar.gz";
|
||||
sha256 = "fb4d394eeac4b06ff2259cada6174aebbe77edd243ffd1deda320cb327f98bd9";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ zope_interface zodb ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_copy = buildPythonPackage rec {
|
||||
name = "zope.copy-4.0.2";
|
||||
|
|
@ -8578,41 +8467,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
pyramid_zodbconn = buildPythonPackage rec {
|
||||
name = "pyramid_zodbconn-0.7";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/pyramid_zodbconn/${name}.tar.gz";
|
||||
sha256 = "56cfdb6b13dc87b1c51c7abc1557c63960d6b858e14a2d4c9693c3f7877f5f63";
|
||||
};
|
||||
|
||||
# should be fixed in next release
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = with self; [ mock ];
|
||||
propagatedBuildInputs = with self; [ pyramid zodb zodburi ZEO ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
pyramid_mailer = buildPythonPackage rec {
|
||||
name = "pyramid_mailer-0.13";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/pyramid_mailer/${name}.tar.gz";
|
||||
sha256 = "4debfad05ee65a05ba6f43e2af913e6e30db75ba42254e4aa0291500c4caa1fc";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pyramid transaction ];
|
||||
propagatedBuildInputs = with self; [ repoze_sendmail ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
};
|
||||
|
||||
pyrtlsdr = buildPythonPackage rec {
|
||||
name = "pyrtlsdr-0.2.0";
|
||||
|
|
@ -8635,53 +8489,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
repoze_sendmail = buildPythonPackage rec {
|
||||
name = "repoze.sendmail-4.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/r/repoze.sendmail/${name}.tar.gz";
|
||||
sha256 = "51813730adc24728d5ce2609038f7bb81aa1632539d7a79045ef4aa6942eaba2";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ transaction ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zodburi = buildPythonPackage rec {
|
||||
name = "zodburi-2.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zodburi/${name}.tar.gz";
|
||||
sha256 = "c04b9beca032bb7b968a3464417596ba4607a927c5e65929860962ddba1cccc0";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ zodb mock ZEO ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
};
|
||||
|
||||
ZEO = self.buildPythonPackage rec {
|
||||
name = "ZEO-4.0.0";
|
||||
|
||||
propagatedBuildInputs = with self; [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ];
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/Z/ZEO/${name}.tar.gz";
|
||||
sha256 = "63555b6d2b5f98d215c4b5fdce004fb0475daa6efc8b70f39c77d646c12d7e51";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://pypi.python.org/pypi/ZEO;
|
||||
};
|
||||
};
|
||||
|
||||
random2 = self.buildPythonPackage rec {
|
||||
name = "random2-1.0.1";
|
||||
|
||||
|
|
@ -8912,18 +8719,6 @@ in {
|
|||
|
||||
};
|
||||
|
||||
zope_tales = buildPythonPackage rec {
|
||||
name = "zope.tales-4.0.2";
|
||||
|
||||
propagatedBuildInputs = with self; [ zope_interface six zope_testrunner ];
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.tales/${name}.zip";
|
||||
sha256 = "c0485f09c3f23c7a0ceddabcb02d4a40ebecf8f8f36c87fa9a02c415f96c969e";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_deprecation = buildPythonPackage rec {
|
||||
name = "zope.deprecation-4.1.2";
|
||||
|
||||
|
|
@ -15539,27 +15334,7 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
pecan = buildPythonPackage rec {
|
||||
name = "pecan-${version}";
|
||||
version = "1.0.3";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/pecan/${name}.tar.gz";
|
||||
sha256 = "04abmybab8jzbwgmrr0fcpcfhcvvkdsv9q135dss02wyk9q9jv4d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
singledispatch logutils
|
||||
];
|
||||
buildInputs = with self; [
|
||||
webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pecan";
|
||||
homepage = "http://github.com/pecan/pecan";
|
||||
};
|
||||
};
|
||||
pecan = callPackage ../development/python-modules/pecan { };
|
||||
|
||||
kaitaistruct = buildPythonPackage rec {
|
||||
name = "kaitaistruct-${version}";
|
||||
|
|
@ -23613,23 +23388,8 @@ in {
|
|||
};
|
||||
|
||||
|
||||
transaction = buildPythonPackage rec {
|
||||
name = "transaction-${version}";
|
||||
version = "1.4.3";
|
||||
transaction = callPackage ../development/python-modules/transaction { };
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/t/transaction/${name}.tar.gz";
|
||||
sha256 = "1b2304a886a85ad014f73d93346c14350fc214ae22a4f565f42f6761cfb9ecc5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ zope_interface ];
|
||||
|
||||
meta = {
|
||||
description = "Transaction management";
|
||||
homepage = http://pypi.python.org/pypi/transaction;
|
||||
license = licenses.zpl20;
|
||||
};
|
||||
};
|
||||
|
||||
transmissionrpc = buildPythonPackage rec {
|
||||
name = "transmissionrpc-${version}";
|
||||
|
|
@ -24891,53 +24651,7 @@ EOF
|
|||
};
|
||||
};
|
||||
|
||||
zodb3 = buildPythonPackage rec {
|
||||
name = "zodb3-${version}";
|
||||
version = "3.11.0";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/Z/ZODB3/ZODB3-${version}.tar.gz";
|
||||
sha256 = "b5767028e732c619f45c27189dd001e14ec155d7984807991fce751b35b4fcb0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ];
|
||||
|
||||
meta = {
|
||||
description = "An object-oriented database for Python";
|
||||
homepage = http://pypi.python.org/pypi/ZODB3;
|
||||
license = licenses.zpl20;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
|
||||
zodb = buildPythonPackage rec {
|
||||
name = "zodb-${version}";
|
||||
disabled = isPyPy;
|
||||
|
||||
version = "4.0.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/Z/ZODB/ZODB-${version}.tar.gz";
|
||||
sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ]
|
||||
++ optionals isPy3k [ zodbpickle ];
|
||||
|
||||
preCheck = if isPy3k then ''
|
||||
# test failure on py3.4
|
||||
rm src/ZODB/tests/testDB.py
|
||||
rm src/ZODB/tests/test_fsdump.py # Error with Python 3.6
|
||||
'' else "";
|
||||
|
||||
meta = {
|
||||
description = "An object-oriented database for Python";
|
||||
homepage = http://pypi.python.org/pypi/ZODB;
|
||||
license = licenses.zpl20;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
zodb = callPackage ../development/python-modules/zodb {};
|
||||
|
||||
zodbpickle = callPackage ../development/python-modules/zodbpickle {};
|
||||
|
||||
|
|
@ -25002,40 +24716,6 @@ EOF
|
|||
};
|
||||
|
||||
|
||||
zope_browser = buildPythonPackage rec {
|
||||
name = "zope.browser-2.0.2";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.browser/${name}.zip";
|
||||
sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ zope_interface ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
|
||||
zope_browserresource = buildPythonPackage rec {
|
||||
name = "zope.browserresource-4.0.1";
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
zope_component zope_configuration zope_contenttype zope_i18n
|
||||
zope_interface zope_location zope_publisher zope_schema zope_traversing
|
||||
];
|
||||
|
||||
# all tests fail
|
||||
doCheck = false;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.browserresource/zope.browserresource-4.0.1.zip";
|
||||
sha256 = "d580184562e7098950ae377b5b37fbb88becdaa2256ac2a6760b69a3e86a99b2";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
zope_component = buildPythonPackage rec {
|
||||
name = "zope.component-4.2.1";
|
||||
|
||||
|
|
@ -25078,29 +24758,6 @@ EOF
|
|||
};
|
||||
|
||||
|
||||
zope_container = buildPythonPackage rec {
|
||||
name = "zope.container-4.0.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.container/${name}.tar.gz";
|
||||
sha256 = "5c04e61b52fd04d8b7103476532f557c2278c86281aae30d44f88a5fbe888940";
|
||||
};
|
||||
|
||||
# a test is failing
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
zodb3 zope_broken zope_dottedname zope_publisher
|
||||
zope_filerepresentation zope_lifecycleevent zope_size
|
||||
zope_traversing
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_contenttype = buildPythonPackage rec {
|
||||
name = "zope.contenttype-4.0.1";
|
||||
|
||||
|
|
@ -25273,24 +24930,6 @@ EOF
|
|||
};
|
||||
|
||||
|
||||
zope_publisher = buildPythonPackage rec {
|
||||
name = "zope.publisher-3.12.6";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.publisher/${name}.tar.gz";
|
||||
sha256 = "d994d8eddfba504841492115032a9a7d86b1713ebc96d0ca16fbc6ee93168ba4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
zope_browser zope_contenttype zope_i18n zope_security
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_schema = buildPythonPackage rec {
|
||||
name = "zope.schema-4.4.2";
|
||||
|
||||
|
|
@ -25312,25 +24951,6 @@ EOF
|
|||
};
|
||||
|
||||
|
||||
zope_security = buildPythonPackage rec {
|
||||
name = "zope.security-4.0.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.security/${name}.tar.gz";
|
||||
sha256 = "8da30b03d5491464d59397e03b88192f31f587325ee6c6eb1ca596a1e487e2ec";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
zope_component zope_configuration zope_i18nmessageid zope_schema
|
||||
zope_proxy zope_testrunner
|
||||
];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_size = buildPythonPackage rec {
|
||||
name = "zope.size-3.5.0";
|
||||
|
||||
|
|
@ -25347,26 +24967,6 @@ EOF
|
|||
};
|
||||
|
||||
|
||||
zope_sqlalchemy = buildPythonPackage rec {
|
||||
name = "zope.sqlalchemy-0.7.6";
|
||||
|
||||
doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.sqlalchemy/${name}.zip";
|
||||
sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ zope_testing zope_interface ];
|
||||
propagatedBuildInputs = with self; [ sqlalchemy transaction ];
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ garbas domenkozar ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_testing = buildPythonPackage rec {
|
||||
name = "zope.testing-${version}";
|
||||
version = "4.6.1";
|
||||
|
|
@ -25391,24 +24991,6 @@ EOF
|
|||
|
||||
zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
|
||||
|
||||
zope_traversing = buildPythonPackage rec {
|
||||
name = "zope.traversing-4.0.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/z/zope.traversing/${name}.zip";
|
||||
sha256 = "79d38b92ec1d9a2467966ee954b792d83ac66f22e45e928113d4b5dc1f5e74eb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ zope_location zope_security zope_publisher transaction zope_tales ];
|
||||
|
||||
# circular dependency on zope_browserresource
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
zope_interface = callPackage ../development/python-modules/zope_interface { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue