Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 666be18aa32d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 880de7a9bc1e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 27, 2018

  1. pythonPackages.sip: make sip-module name overridable 

    The author of sip wants it to be a private dependency of other packages by
making it importable under different names.
    @orivej
    orivej committed Dec 27, 2018
    Copy the full SHA
    bf1a563 View commit details

  2. pythonPackages.pyqt5: import sip as PyQt5.sip 

    pyqt5 5.11 has switched from sip to PyQt5.sip.
    @orivej
    orivej committed Dec 27, 2018
    Copy the full SHA
    4ec84c2 View commit details

  3. Merge pull request #52956 from orivej/sip-module 

    pythonPackages.sip: make sip-module name overridable
    @orivej-nixos
    orivej-nixos authored Dec 27, 2018
    Copy the full SHA
    880de7a View commit details
Showing with 10 additions and 8 deletions.
  1. +6 −4 pkgs/development/python-modules/pyqt/5.x.nix
  2. +4 −4 pkgs/development/python-modules/sip/default.nix
10 changes: 6 additions & 4 deletions pkgs/development/python-modules/pyqt/5.x.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,9 @@ let
pname = "PyQt";
version = "5.11.3";

inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34;
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;

sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; };

in buildPythonPackage {
pname = pname;
@@ -32,10 +34,10 @@ in buildPythonPackage {

nativeBuildInputs = [ pkgconfig qmake lndir ];

buildInputs = [ dbus ];
buildInputs = [ dbus sip ];

propagatedBuildInputs = [
sip qtbase qtsvg qtwebkit qtwebengine
qtbase qtsvg qtwebkit qtwebengine
] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;

configurePhase = ''
@@ -65,7 +67,7 @@ in buildPythonPackage {
'';

postInstall = ''
ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/sip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:

buildPythonPackage rec {
pname = "sip";
pname = sip-module;
version = "4.19.13";
format = "other";

disabled = isPyPy;

src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz";
url = "mirror://sourceforge/pyqt/sip/sip-${version}/sip-${version}.tar.gz";
sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3";
};

configurePhase = ''
${python.executable} ./configure.py \
--sip-module PyQt5.sip \
--sip-module ${sip-module} \
-d $out/lib/${python.libPrefix}/site-packages \
-b $out/bin -e $out/include
'';