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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-06-30 23:58:07 -07:00
parent 857efa12fb ddf15bc78a
commit 612f0bdd67
71 changed files with 1388 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/pyqt/5.x.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, python, pkgconfig, qt5, sip, pythonDBus, lndir, makeWrapper }:
let
version = "5.3";
version = "5.4.2";
in stdenv.mkDerivation {
name = "PyQt-${version}";
@@ -15,10 +15,13 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz";
sha256 = "0xc1cc68fi989rfybibimhhi3mqn3b93n0p3jdqznzabgilcb1m2";
sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac";
};
buildInputs = [ python pkgconfig makeWrapper lndir qt5 ];
buildInputs = [
python pkgconfig makeWrapper lndir
qt5.base qt5.svg qt5.webkit
];
propagatedBuildInputs = [ sip ];

4
pkgs/development/python-modules/sip/4.16.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, isPyPy }:
if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
name = "sip-4.16.4";
name = "sip-4.16.6";
src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
sha256 = "1xapklcz5ndilax0gr2h1fqzhdzh7yvxfb3y0rxfcag1qlzl9nnf";
sha256 = "0lj5f581dkwswlwpg7lbicqf940dvrp8vjbkhmyywd99ynxb4zcc";
};
configurePhase = ''