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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-19 09:00:36 +01:00
parent db0211c6bc 911d1853ca
commit 9ab61ab8e2
225 changed files with 2499 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/ase/default.nix
View File

@@ -1,5 +1,5 @@
{ lib
, fetchurl
, fetchPypi
, buildPythonPackage
, numpy
, scipy
@@ -10,12 +10,12 @@
}:
buildPythonPackage rec {
version = "3.16.2";
pname = "ase";
version = "3.17.0";
src = fetchurl {
url = "https://gitlab.com/${pname}/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "171j3f4a261cfnqjq98px5fldxql65i3jgf60wc945xvh0mbc8ds";
src = fetchPypi {
inherit pname version;
sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
};
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
@@ -27,10 +27,10 @@ buildPythonPackage rec {
# tests just hang most likely due to something with subprocesses and cli
doCheck = false;
meta = {
meta = with lib; {
description = "Atomic Simulation Environment";
homepage = https://wiki.fysik.dtu.dk/ase/;
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ costrouc ];
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ costrouc ];
};
}

4
pkgs/development/python-modules/boto3/default.nix
View File

@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.9.36";
version = "1.9.62"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "2a9f3809b480803c1b1f28a19c554f1e1ceafd8db994a4236a0843b999ee6c56";
sha256 = "0rf3ik4bqr0qab2648rcaahycr2sih257ngz8brizyfln0lk1sg9";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.12.48";
version = "1.12.62"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "7140e51ab0a7aa3b7fa9cf5fefa663e0cd097098fcbd51b12ff8884c8d967754";
sha256 = "0zgq3cldrh1x65s3vy1mhp1h5nnsdxw7ig1v0di7p8yns3iazsv7";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/cmdtest/default.nix
View File

@@ -9,13 +9,13 @@
}:
buildPythonPackage rec {
name = "cmdtest-${version}";
version = "0.18";
pname = "cmdtest";
version = "0.32";
disabled = isPy3k || isPyPy;
src = fetchurl {
url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz";
sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn";
sha256 = "0scc47h1nkmbm5zlvk9bsnsg64kb9r4xadchdinf4f1mph9qpgn6";
};
propagatedBuildInputs = [ cliapp ttystatus markdown ];

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

@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }:
buildPythonPackage rec {
pname = "CommonMark";
pname = "commonmark";
version = "0.8.1";
src = fetchPypi {

4
pkgs/development/python-modules/eyed3/default.nix
View File

@@ -14,13 +14,13 @@
}:
buildPythonPackage rec {
version = "0.8.7";
version = "0.8.8";
pname = "eyeD3";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "1fzqy6hkg73xvpapdjrdzr3r0fsamnplvjfl7dz7rzgzx2r4x4pg";
sha256 = "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq";
};
# https://github.com/nicfit/eyeD3/pull/284

4
pkgs/development/python-modules/fonttools/default.nix
View File

@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "fonttools";
version = "3.32.0";
version = "3.33.0";
src = fetchPypi {
inherit pname version;
sha256 = "16cg5v50x905c0dr34wqk70b0n3mqzp41iir2rd73f31d1z9jndq";
sha256 = "196yl6m3fycrbsclcmg550821j18ga6dpghmk5nb1xi4j4yb62gq";
extension = "zip";
};

38
pkgs/development/python-modules/git-annex-adapter/default.nix
View File

@@ -4,16 +4,16 @@
buildPythonPackage rec {
pname = "git-annex-adapter";
version = "0.2.0";
version = "0.2.1";
disabled = !isPy3k;
# There is only a wheel on PyPI - build from source instead
# No tests in PyPI tarball
src = fetchFromGitHub {
owner = "alpernebbi";
repo = pname;
rev = "v${version}";
sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz";
sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097";
};
prePatch = ''
@@ -22,38 +22,6 @@ buildPythonPackage rec {
--replace "'git-annex'" "'${git-annex}/bin/git-annex'"
'';
patches = [
# fixes the "not-a-git-repo" testcase where recent git versions expect a slightly different error.
./not-a-git-repo-testcase.patch
# fixes the testcase which parses the output of `git-annex info` where several
# new lines are displayed that broke the test.
(fetchpatch {
url = "https://github.com/Ma27/git-annex-adapter/commit/39cb6da69c1aec3d57ea9f68c2dea5113ae1b764.patch";
sha256 = "0wyy2icqan3jpiw7dm50arfq3mgq4b5s3g91k82srap763r9hg5m";
})
# fixes the testcase which runs "git status" and complies with the
# slightly altered output.
(fetchpatch {
url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir";
})
# fix test broken due to renaming of repository version 6 to 7
(fetchpatch {
url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch;
sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7";
})
] ++ stdenv.lib.optionals stdenv.isDarwin [
# `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin:
# https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b
(fetchpatch {
url = "https://github.com/alpernebbi/git-annex-adapter/commit/0b60b4577528b309f6ac9d47b55a00dbda9850ea.patch";
sha256 = "0z608hpmyzv1mm01dxr7d6bi1hc77h4yafghkynmv99ijgnm1qk7";
})
];
checkInputs = [
utillinux # `rev` is needed in tests/test_process.py
];

13
pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch
View File

@@ -1,13 +0,0 @@
diff --git a/tests/test_process.py b/tests/test_process.py
index 493fc8f..feb1833 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase):
with self.assertRaises(subprocess.CalledProcessError) as cm:
runner('status', '-sb')
self.assertIn(
- "fatal: Not a git repository",
+ "fatal: not a git repository",
cm.exception.stderr,
)

4
pkgs/development/python-modules/libvirt/default.nix
View File

@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "libvirt";
version = "4.7.0";
version = "4.10.0";
src = assert version == libvirt.version; fetchgit {
url = git://libvirt.org/libvirt-python.git;
rev = "v${version}";
sha256 = "1zv3fgwmnkvqif0qsnvpx8hhb6bdfr2b4v55z3nh93bfg8s4rbm8";
sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf";
};
nativeBuildInputs = [ pkgconfig ];

8
pkgs/development/python-modules/osc/default.nix
View File

@@ -11,14 +11,14 @@
buildPythonPackage {
pname = "osc";
version = "0.162.0-55-gb730f88";
disabled = isPy3k;
version = "0.163.0-40-gb4b1ec7";
disabled = isPy3k; # urlgrabber doesn't support python-3.x
src = fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
rev = "b730f880cfe85a8547f569355a21706f27ebfa78";
sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh";
rev = "b4b1ec7b64d4f9bb42f140754519221b810e232c";
sha256 = "01z1b15x9vzhd7j94f6n3g50h5br7lwz86akgic0wpp41zv37jad";
};
buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper

47
pkgs/development/python-modules/pygmo/default.nix
View File

@@ -1,7 +1,6 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, cmake
, eigen
, nlopt
, ipopt
@@ -11,38 +10,44 @@
, cloudpickle
, ipyparallel
, numba
, python
}:
buildPythonPackage rec {
pname = "pygmo";
version = "2.8";
src = fetchFromGitHub {
owner = "esa";
repo = "pagmo2";
rev = "v${version}";
sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z";
};
buildInputs = [ cmake eigen nlopt ipopt boost pagmo2 ];
let
propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ];
preBuild = ''
cp -v -r $src/* .
cmake -DCMAKE_INSTALL_PREFIX=$out -DPAGMO_BUILD_TESTS=no -DCMAKE_SYSTEM_NAME=Linux -DPagmo_DIR=${pagmo2} -DPAGMO_BUILD_PYGMO=yes -DPAGMO_BUILD_PAGMO=no -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so -DPAGMO_WITH_IPOPT=yes -DIPOPT=${ipopt}
pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DPAGMO_BUILD_PYGMO=yes"
"-DPAGMO_BUILD_PAGMO=no"
"-DPagmo_DIR=${pagmo2}"
];
buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs;
postInstall = ''
mv wheel $out
'';
});
make install
mv $out/lib/python*/site-packages/pygmo wheel
in buildPythonPackage rec {
pname = "pygmo";
version = pagmo2WithPython.version;
inherit propagatedBuildInputs;
src = pagmo2WithPython;
preBuild = ''
mv ${python.sitePackages}/pygmo wheel
cd wheel
'';
# dont do tests
doCheck = false;
meta = {
meta = with lib; {
description = "Parallel optimisation for Python";
homepage = https://esa.github.io/pagmo2/;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ costrouc ];
license = licenses.gpl3Plus;
maintainers = [ maintainers.costrouc ];
};
}

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

@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "a6a0e7a5b4433bf4e6ddcbc5c5ff44170be7d84259d002b8e8d8fb4ee78af60f";
sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x";
};
checkInputs = [ nose ];

21
pkgs/development/python-modules/tlslite/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "tlslite";
version = "0.4.9";
src = fetchPypi {
inherit pname version;
sha256 = "9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d";
};
meta = with stdenv.lib; {
description = "A pure Python implementation of SSL and TLS";
homepage = https://pypi.python.org/pypi/tlslite;
license = licenses.bsd3;
};
}

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

@@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "f08cb229a96f14cc0b1d4b68cb7c111d1020ab8c3989b426d3aa39b82d6a3e3c";
sha256 = "0g1yd8nvhfdasckb929rijmj040x25ycns2b3l5wq53gm4lv537h";
};
meta = with stdenv.lib; {