pythonPackages: use latest qt version instead of 5.14 #99956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

doronbehar merged 45 commits into NixOS:master from FRidh:qt

Oct 8, 2020

pkgs/applications/audio/carla/default.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
  
    stdenv.mkDerivation rec {

      pname = "carla";

      version = "2.1.1";

      version = "2.2.0";

      src = fetchFromGitHub {

        owner = "falkTX";

        repo = pname;

        rev = "v${version}";

        sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g";

        sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw=";

      };

      nativeBuildInputs = [

pkgs/applications/audio/friture/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,9 +32,8 @@ in py.buildPythonApplication rec { @@
         ./unlock_constraints.patch
       ];
-      postFixup = ''
-        wrapQtApp $out/bin/friture
-        wrapQtApp $out/bin/.friture-wrapped
+      preFixup = ''
+        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
       '';
       meta = with lib; {
@@ Expand Down @@

pkgs/applications/audio/puddletag/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,6 @@ python3Packages.buildPythonApplication rec { @@
         license = licenses.gpl3;
         maintainers = with maintainers; [ peterhoeg ];
         platforms = platforms.linux;
+        broken = true; # Needs Qt wrapping
       };
     }

pkgs/applications/backup/vorta/default.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -28,8 +28,8 @@ buildPythonApplication rec {
  
      # QT setup in tests broken.

      doCheck = false;

      postFixup = ''

        wrapQtApp $out/bin/vorta

      preFixup = ''

        makeWrapperArgs+=("''${qtWrapperArgs[@]}")

      '';

      meta = with lib; {

pkgs/applications/editors/retext/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -46,11 +46,13 @@ in python.pkgs.buildPythonApplication { @@
       propagatedBuildInputs = [ pythonEnv ];
       postInstall = ''
-        wrapQtApp "$out/bin/retext" \
-          --set ASPELL_CONF "dict-dir ${buildEnv {
+        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+        makeWrapperArgs+=(
+          "--set" "ASPELL_CONF" "dict-dir ${buildEnv {
             name = "aspell-all-dicts";
             paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
           }}"
+        )
       '';
       meta = with stdenv.lib; {
@@ Expand Down @@

pkgs/applications/gis/qgis/unwrapped.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -10,15 +10,15 @@ let
  
        [ qscintilla-qt5 gdal jinja2 numpy psycopg2

          chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];

    in mkDerivation rec {

      version = "3.10.9";

      version = "3.10.10";

      pname = "qgis";

      name = "${pname}-unwrapped-${version}";

      src = fetchFromGitHub {

        owner = "qgis";

        repo = "QGIS";

        rev = "final-${lib.replaceStrings ["."] ["_"] version}";

        sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6";

        sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0=";

      };

      passthru = {

pkgs/applications/graphics/cq-editor/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     , mkDerivationWith
     , python3Packages
     , fetchFromGitHub
+    , wrapQtAppsHook
     }:
     mkDerivationWith python3Packages.buildPythonApplication rec {
@@ Expand All / @@ -27,8 +28,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec { @@
         requests
       ];
-      postFixup = ''
-        wrapQtApp "$out/bin/cq-editor"
+      nativeBuildInputs = [ wrapQtAppsHook ];
+      preFixup = ''
+        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
       '';
       checkInputs = with python3Packages; [
@@ Expand Down @@

pkgs/applications/misc/dupeguru/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -40,15 +40,15 @@ python3Packages.buildPythonApplication rec { @@
       # Avoid double wrapping Python programs.
       dontWrapQtApps = true;
+      # TODO: A bug in python wrapper
+      # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
       preFixup = ''
-        # TODO: A bug in python wrapper
-        # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
         makeWrapperArgs="''${qtWrapperArgs[@]}"
       '';
+      # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
+      # so wrapPythonPrograms hook does not handle it automatically.
       postFixup = ''
-        # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
-        # so wrapPythonPrograms hook does not handle it automatically.
         wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
       '';
@@ Expand All / @@ -58,5 +58,6 @@ python3Packages.buildPythonApplication rec { @@
         license = licenses.bsd3;
         platforms = platforms.linux;
         maintainers = [ maintainers.novoxudonoser ];
+        broken = true; # mv: cannot stat '_block.cpython-38m*.so': No such file or directory
       };
     }

pkgs/applications/misc/electron-cash/default.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,13 +3,13 @@
  
    python3Packages.buildPythonApplication rec {

      pname = "electron-cash";

      version = "4.1.0";

      version = "4.1.1";

      src = fetchFromGitHub {

        owner = "Electron-Cash";

        repo = "Electron-Cash";

        rev = version;

        sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2";

        sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm";

      };

      propagatedBuildInputs = with python3Packages; [

    @@ -36,15 +36,6 @@ python3Packages.buildPythonApplication rec {
  
      nativeBuildInputs = [ wrapQtAppsHook ];

      patches = [

        # Patch a failed test, this can be removed in next version

        (fetchpatch {

          url =

            "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch";

          sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk";

        })

      ];

      postPatch = ''

        substituteInPlace contrib/requirements/requirements.txt \

          --replace "qdarkstyle==2.6.8" "qdarkstyle<3"

    @@ -70,9 +61,11 @@ python3Packages.buildPythonApplication rec {
  
      #   Electron Cash was unable to find the secp256k1 library on this system.

      #   Elliptic curve cryptography operations will be performed in slow

      #   Python-only mode.

      postFixup = ''

        wrapQtApp $out/bin/electron-cash \

          --prefix LD_LIBRARY_PATH : ${secp256k1}/lib

      preFixup = ''

        makeWrapperArgs+=("''${qtWrapperArgs[@]}")

        makeWrapperArgs+=(

          "--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib"

        )

      '';

      doInstallCheck = true;

pkgs/applications/misc/electrum/ltc.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -36,8 +36,8 @@ python3Packages.buildPythonApplication rec {
  
        sed -i '/Created: .*/d' gui/qt/icons_rc.py

      '';

      postFixup = ''

        wrapQtApp $out/bin/electrum-ltc

      preFixup = ''

        makeWrapperArgs+=("''${qtWrapperArgs[@]}")

      '';

      checkPhase = ''

pkgs/applications/misc/kdeconnect/default.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,7 @@
  
    { mkDerivation

    , lib

    , fetchurl

    , fetchpatch

    , extra-cmake-modules

    , kcmutils

    , kconfigwidgets

    @@ -13,25 +14,55 @@
  
    , libfakekey

    , libXtst

    , qtx11extras

    , qtmultimedia

    , qtgraphicaleffects

    , sshfs

    , makeWrapper

    , kwayland

    , kio

    , kpeoplevcard

    , kpeople

    , kirigami2

    , pulseaudio-qt

    }:

    mkDerivation rec {

      pname = "kdeconnect";

      version = "1.3.5";

      version = "20.08.1";

      src = fetchurl {

        url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz";

        sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5";

        url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz";

        sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf";

      };

      patches = [

        # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328

        (fetchpatch {

          url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff";

          sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac";

        })

      ];

      buildInputs = [

        libfakekey libXtst

        ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications

        qca-qt5 qtx11extras makeWrapper kwayland kio

        libfakekey

        libXtst

        qtmultimedia

        qtgraphicaleffects

        pulseaudio-qt

        kpeoplevcard

        kpeople

        kirigami2

        ki18n

        kiconthemes

        kcmutils

        kconfigwidgets

        kdbusaddons

        knotifications

        qca-qt5

        qtx11extras

        makeWrapper

        kwayland

        kio

      ];

      nativeBuildInputs = [ extra-cmake-modules kdoctools ];

pkgs/applications/networking/flent/default.nix

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,10 +25,8 @@ buildPythonApplication rec { @@
         xvfb-run -s '-screen 0 800x600x24' ./test-runner
       '';
-      postInstall = ''
-        for program in $out/bin/*; do
-          wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH
-        done
+      preFixup = ''
+        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
       '';
       meta = with stdenv.lib; {
@@ Expand Down @@

pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
+    { stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }:
     buildPythonApplication rec {
       pname = "git-annex-metadata-gui";
@@ Expand All / @@ -15,6 +15,12 @@ buildPythonApplication rec { @@
         substituteInPlace setup.py --replace "'PyQt5', " ""
       '';
+      nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+      preFixup = ''
+        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+      '';
       propagatedBuildInputs = [ pyqt5 git-annex-adapter ];
       meta = with stdenv.lib; {
@@ Expand Down @@

pkgs/development/libraries/kpeoplevcard/default.nix

-Original file line number
+Diff line change
@@ -0,0 +1,40 @@
+    { mkDerivation
+    , lib
+    , fetchurl
+    , cmake
+    , extra-cmake-modules
+    , pkg-config
+    , kcoreaddons
+    , kpeople
+    , kcontacts
+    }:
+    mkDerivation rec {
+      pname = "kpeoplevcard";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+        sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd";
+      };
+      buildInputs = [
+        kcoreaddons
+        kpeople
+        kcontacts
+      ];
+      nativeBuildInputs = [
+        pkg-config
+        cmake
+        extra-cmake-modules
+      ];
+      meta = with lib; {
+        description = "Pulseaudio bindings for Qt";
+        homepage    = "KPeople VCard Support";
+        license     = with licenses; [ lgpl2 ];
+        maintainers = with maintainers; [ doronbehar ];
+      };
+    }

pkgs/development/libraries/pulseaudio-qt/default.nix

-Original file line number
+Diff line change
@@ -0,0 +1,35 @@
+    { mkDerivation
+    , lib
+    , fetchurl
+    , cmake
+    , extra-cmake-modules
+    , pkg-config
+    , pulseaudio
+    }:
+    mkDerivation rec {
+      pname = "pulseaudio-qt";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz";
+        sha256 = "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099";
+      };
+      buildInputs = [
+        pulseaudio
+      ];
+      nativeBuildInputs = [
+        pkg-config
+        cmake
+        extra-cmake-modules
+      ];
+      meta = with lib; {
+        description = "Pulseaudio bindings for Qt";
+        homepage    = "https://invent.kde.org/libraries/pulseaudio-qt";
+        license     = with licenses; [ lgpl2 ];
+        maintainers = with maintainers; [ doronbehar ];
+      };
+    }

pkgs/development/libraries/qscintilla/default.nix

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,17 +6,17 @@
  
    let

      pname = "qscintilla-qt${if withQt5 then "5" else "4"}";

      version = "2.11.2";

      version = "2.11.5";

    in stdenv.mkDerivation rec {

      inherit pname version;

      src = fetchurl {

        url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz";

        sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2";

        url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";

        sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs=";

      };

      sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5";

      sourceRoot = "QScintilla-${version}/Qt4Qt5";

      buildInputs = [ (if withQt5 then qtbase else qt4) ];

    @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
  
          background colours and multiple fonts.

        '';

        homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";

        license = with licenses; [ gpl2 gpl3 ]; # and commercial

        license = with licenses; [ gpl3 ]; # and commercial

        maintainers = with maintainers; [ peterhoeg ];

        platforms = platforms.unix;

      };

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

pythonPackages: use latest qt version instead of 5.14 #99956

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!