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: 4f3f06d070f1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 878bfaa6bf44
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 1, 2020

  1. pysideApiextractor: refactor to use python3 

    Also took the opportunity to split it to multiple outputs

(cherry picked from commit 2cd5cf624ae19fd7633a22ea3a3f7986dfb611af)
    @freezeboy
    freezeboy committed Nov 1, 2020
    Copy the full SHA
    c6b754a View commit details

  2. pysideGeneratorrunner: refactor to use python3

    @freezeboy
    freezeboy committed Nov 1, 2020
    Copy the full SHA
    335d21d View commit details

  3. python3Packages.pysideShiboken: refactor to use multiple outputs

    @freezeboy
    freezeboy committed Nov 1, 2020
    Copy the full SHA
    a3e20b8 View commit details

  4. python3Packages.pysideTools: refactor to use multiple outputs

    @freezeboy
    freezeboy committed Nov 1, 2020
    Copy the full SHA
    5a03f8b View commit details

  5. python3Packages.pyside: refactor to use multiple outputs

    @freezeboy
    freezeboy committed Nov 1, 2020
    Copy the full SHA
    b6a2387 View commit details

  6. Merge pull request #102356 from freezeboy/refactor-pyside-apiextractor 

    python3Packages.pyside,python3Packages.pysideTools,python3Packages.pysideShiboken,pysideApiExtractor,pysideGeneratorrunner: remove dependencies to python2
    @FRidh
    FRidh authored Nov 1, 2020
    Copy the full SHA
    878bfaa View commit details
13 changes: 10 additions & 3 deletions pkgs/development/python-modules/pyside/apiextractor.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }:
{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:

# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let
pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
in stdenv.mkDerivation {
name = "pyside-apiextractor-0.10.10";

@@ -13,7 +13,14 @@ in stdenv.mkDerivation {

enableParallelBuilding = true;

buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ];
outputs = [ "out" "dev" ];

preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';

nativeBuildInputs = [ cmake pythonEnv ];
buildInputs = [ qt4 libxml2 libxslt ];

meta = {
description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/pyside/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,12 @@ buildPythonPackage rec {

enableParallelBuilding = true;

outputs = [ "out" "dev" ];

preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';

nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];

buildInputs = [ mesa libGL ];
13 changes: 10 additions & 3 deletions pkgs/development/python-modules/pyside/generatorrunner.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }:
{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:

# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let
pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
pname = "pyside-generatorrunner";
version = "0.6.16";
in stdenv.mkDerivation {
@@ -15,7 +15,14 @@ in stdenv.mkDerivation {

enableParallelBuilding = true;

buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ];
outputs = [ "out" "dev" ];

preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';

nativeBuildInputs = [ cmake pythonEnv ];
buildInputs = [ pysideApiextractor qt4 ];

meta = {
description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/pyside/shiboken.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,10 @@ buildPythonPackage rec {

buildInputs = [ python libxml2 libxslt ];

outputs = [ "out" "dev" ];

preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
echo "preConfigure: Fixing shiboken_generator install target."
substituteInPlace generator/CMakeLists.txt --replace \
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/pyside/tools.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,12 @@ buildPythonPackage rec {
sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
};

outputs = [ "out" "dev" ];

preConfigure = ''
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
'';

nativeBuildInputs = [ cmake ];

buildInputs = [ qt4 ];