nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-12-01 18:55:44 +01:00
parent d7bf92b8cf b7f504812b
commit 6662f5be2d
69 changed files with 307 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "aiorpcx";
version = "0.18.3";
version = "0.18.4";
src = fetchPypi {
inherit version;
pname = "aiorpcX";
sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp";
sha256 = "0jpvrkan6w8bpq017m8si7r9hb1pyw3ip4vr1fl2pmi8ngzc1jdy";
};
propagatedBuildInputs = [ attrs ];

12
pkgs/development/python-modules/apsw/default.nix
View File

@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "apsw";
version = "3.29.0-r1";
version = "3.30.1-r1";
disabled = isPyPy;
@@ -11,19 +11,11 @@ buildPythonPackage rec {
owner = "rogerbinns";
repo = "apsw";
rev = version;
sha256 = "1p3sgmk9qwd0a634lirva44qgpyq0a74r9d70wxb6hsa52yjj9xb";
sha256 = "1zp38gj44bmzfxxpvgd7nixkp8vs2fpl839ag8vrh9z70dax22f0";
};
buildInputs = [ sqlite ];
patches = [
# Fixes a test failure with sqlite 3.30, see https://github.com/rogerbinns/apsw/issues/275
(fetchpatch {
url = "https://github.com/rogerbinns/apsw/commit/13df0b57bff59542978abf7c0a440c9274e3aac3.diff";
sha256 = "1wi1mfis2mr21389wdnvq44phg0bpm5vpwmxhvrj211vwfm0q7dv";
})
];
meta = with stdenv.lib; {
description = "A Python wrapper for the SQLite embedded relational database engine";
homepage = https://github.com/rogerbinns/apsw;

11
pkgs/development/python-modules/buildbot/default.nix
View File

@@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "2.5.0";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "06dza7kggybz8nf3i1skkadwrq9s0nkpqjfahifysaag3j3b5rp4";
sha256 = "13ddpcbndb22zlg9gjsf2pbgad45g1w5cg4a3z83085fkgnib7sr";
};
propagatedBuildInputs = [
@@ -74,13 +74,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
# Work around https://github.com/glyph/automat/issues/117
(fetchpatch {
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/buildbot-automat-117.diff?h=packages/buildbot&id=7904292340f98578adfe783a09e9eb4c5b1d4632";
name = "buildbot-automat-117.diff";
stripLen = 1;
sha256 = "0rng6f8nvghkihajz9m925rdp9q3c395bj4wc7r2s1minv613hba";
})
];
postPatch = ''

4
pkgs/development/python-modules/buildbot/pkg.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
version = "2.5.0";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "1my9a791y6hsazzqs3f3svl6zw28x3qwj0a0vxffybqdij650nvw";
sha256 = "1g87pddsyas1r0f6z29047cwnz7ds4925f6n9g7b0pkj3k73ci06";
};
postPatch = ''

10
pkgs/development/python-modules/buildbot/plugins.nix
View File

@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0awy96pb9s9g0nrmlrvqf5zi878z6mvj653inf9sm89x601a6lp1";
sha256 = "00k5dbcwzqlyk4lcp5qh1q8xbrxmg9gzqs7vl2r6f3wxi4ydb5nw";
};
# Remove unneccessary circular dependency on buildbot
@@ -36,7 +36,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0bp7bbq6rq1kdg3pf8plcpc4amam0pks5dlmyqj6bn29skfa5h1j";
sha256 = "0ai334y779jwqabrn2yjma41pw0a9k1qy7v68qbjd22n4my227ma";
};
buildInputs = [ buildbot-pkg ];
@@ -58,7 +58,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1mxxkqzh4a6574n2lk2ndi77d9g93hjpkwsqizj911n6ibsn4qw3";
sha256 = "1j450hwvg729mivzijbrx8ngalx56qvrx8mwwgy8arfwpnyfkr9l";
};
buildInputs = [ buildbot-pkg ];
@@ -80,7 +80,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1fkrd5crbgqgp8mr8qgfy559f59ys6hrspddzk3fwg5hrsckkjwr";
sha256 = "19w8is5s7d7l60mlchh1zd9nidpkswi8fivfa36b97plibn0jgw1";
};
buildInputs = [ buildbot-pkg ];
@@ -102,7 +102,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0cvbizcc92df08xcs8w6ah51yfilxz7sx9g8bbdrvw6m586ziczb";
sha256 = "1zl7y08rkw7bya6cli44msvcdgirsyfg3kxpf2z82vwgc6bwi785";
};
buildInputs = [ buildbot-pkg ];

4
pkgs/development/python-modules/buildbot/worker.nix
View File

@@ -3,11 +3,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
version = "2.5.0";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "05c8q6ykharry4lv47imh6agq55fxar8a9ldwx46clb480qwyc43";
sha256 = "1kpj85x8xflrccvy840v9bl3q1j63rk9kahj1qirbai1fxwvzbik";
};
propagatedBuildInputs = [ twisted future ];

3
pkgs/development/python-modules/matrix-nio/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, git,
attrs, future, peewee, h11, h2, atomicwrites, pycryptodome, sphinx, Logbook, jsonschema,
python-olm, unpaddedbase64, aiohttp }:
python-olm, unpaddedbase64, aiohttp, cachetools }:
buildPythonPackage rec {
pname = "nio";
@@ -36,6 +36,7 @@ buildPythonPackage rec {
python-olm
unpaddedbase64
aiohttp
cachetools
];
doCheck = false;

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

@@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } :
buildPythonPackage rec {
pname = "OWSLib";
version = "0.18.0";
version = "0.19.0";
src = fetchPypi {
inherit pname version;
sha256 = "018p2ypmpbbcgl0hp92s0vig1wirh41lj0wy62aafn5050pmqr7m";
sha256 = "0rdhymayyc6w1izlv1bf2wgx2dfxbp4k1vll5s1364isw60rjj8x";
};
buildInputs = [ pytest ];

46
pkgs/development/python-modules/pykde4/default.nix
View File

@@ -1,46 +0,0 @@
{ pyqt4, openssl_1_0_2
, stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
let
kdelibs = callPackage ./kdelibs.nix {
openssl = openssl_1_0_2;
};
sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
};
});
pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
propagatedBuildInputs = [ sip4_19_3 ];
});
in stdenv.mkDerivation rec {
version = "4.14.3";
pname = "pykde4";
src = fetchurl {
url = "mirror://kde/stable/${version}/src/${pname}-${version}.tar.xz";
sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
};
patches = [ ./dlfcn.patch ];
buildInputs = [
kdelibs
];
nativeBuildInputs = [ cmake automoc4 ];
propagatedBuildInputs = [ pyqt4_fixed ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
platforms = platforms.linux;
hydraPlatforms = platforms.none;
description = "Python bindings for KDE";
license = with licenses; [ gpl2 lgpl2 ];
homepage = https://api.kde.org/pykde-4.3-api/;
maintainers = with maintainers; [ gnidorah ];
};
}

13
pkgs/development/python-modules/pykde4/dlfcn.patch
View File

@@ -1,13 +0,0 @@
--- __init__.py.orig 2017-11-02 09:06:48.998054459 +0300
+++ ./__init__.py 2017-11-02 09:24:28.089072752 +0300
@@ -1,4 +1,8 @@
-import sys,DLFCN
+import sys
+try:
+ import DLFCN
+except ImportError:
+ import os as DLFCN
# This is needed to ensure that dynamic_cast and RTTI works inside kdelibs.
sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL)
\ No newline at end of file

48
pkgs/development/python-modules/pykde4/kdelibs.nix
View File

@@ -1,48 +0,0 @@
{
stdenv, fetchurl, fetchpatch,
automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
attica, docbook_xml_dtd_42, docbook_xsl, giflib,
libdbusmenu_qt, libjpeg, phonon, qt4, openssl
}:
stdenv.mkDerivation rec {
version = "4.14.38";
pname = "kdelibs";
src = fetchurl {
url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
};
patches = [
# https://phabricator.kde.org/D22989
(fetchpatch {
url = "https://cgit.kde.org/kdelibs.git/patch/?id=2c3762feddf7e66cf6b64d9058f625a715694a00";
sha256 = "1wbzywh8lcc66n6y3pxs18h7cwkq6g216faz27san33jpl8ra1i9";
name = "CVE-2019-14744.patch";
})
];
enableParallelBuilding = true;
nativeBuildInputs = [
automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
];
buildInputs = [
attica giflib libdbusmenu_qt libjpeg openssl
];
propagatedBuildInputs = [ qt4 phonon ];
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
"-DKJS_FORCE_DISABLE_PCRE=true"
"-DWITH_SOLID_UDISKS2=OFF"
];
meta = with stdenv.lib; {
platforms = platforms.linux;
hydraPlatforms = platforms.none;
homepage = http://www.kde.org;
license = with licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = with maintainers; [ gnidorah ];
};
}