From 138eebe549f5ab0d4763fe560c47ca769f56ac28 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 20 Sep 2023 19:08:53 +0300 Subject: [PATCH] qscintilla: move to qt{5,6}Packages.nix Since it is a somewhat common library, with support for multiple qt versions, it is safer to put each version of it in libsForQt5 and qt6Packages attribute sets. Also, it is cleaner to put the darwin if-else inside the expression, in relation to https://github.com/NixOS/rfcs/pull/140 . --- pkgs/applications/audio/miniaudicle/default.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 15 +++++++-------- pkgs/development/libraries/qscintilla/default.nix | 9 ++++++++- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ------ pkgs/top-level/qt5-packages.nix | 2 ++ pkgs/top-level/qt6-packages.nix | 2 ++ 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 19054da5841c..f477e3ffa1f2 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , qmake , wrapQtAppsHook -, qscintilla-qt6 +, qt6Packages , bison , flex , which @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib libsndfile - qscintilla-qt6 + qt6Packages.qscintilla ] ++ lib.optional (audioBackend == "pulse") libpulseaudio ++ lib.optional (audioBackend == "jack") libjack2; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index c8441cbae1fb..9bb0a75b272a 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -50,8 +50,7 @@ , makeWrapper # - Build Octave Qt GUI: , enableQt ? false -, qt5 -, qscintilla +, libsForQt5 , libiconv , darwin }: @@ -132,9 +131,9 @@ in stdenv.mkDerivation (finalAttrs: { gnuplot python3 ] ++ lib.optionals enableQt [ - qt5.qtbase - qt5.qtsvg - qscintilla + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qscintilla ] ++ lib.optionals (enableJava) [ jdk ] ++ lib.optionals (!stdenv.isDarwin) [ @@ -149,9 +148,9 @@ in stdenv.mkDerivation (finalAttrs: { gfortran texinfo ] ++ lib.optionals enableQt [ - qt5.wrapQtAppsHook - qt5.qtscript - qt5.qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qtscript + libsForQt5.qttools ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 5a2b00c54e3e..394446feb017 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -6,9 +6,16 @@ , qtmacextras ? null , qmake , fixDarwinDylibNames +, darwin }: -stdenv.mkDerivation rec { +let + stdenv' = if stdenv.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv + ; +in stdenv'.mkDerivation rec { pname = "qscintilla-qt5"; version = "2.13.2"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85c66e4bbbbf..478a52365232 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1518,6 +1518,8 @@ mapAliases ({ qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 + qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 + qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qtscrobbler = throw "qtscrobbler has been removed, because it was unmaintained"; # Added 2022-05-26 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fd8b501860e..189beb438493 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12478,12 +12478,6 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - - qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { }; - qrcp = callPackage ../tools/networking/qrcp { }; qrscan = callPackage ../tools/misc/qrscan { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 93cb2c9a1372..73a52df278fa 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -221,6 +221,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea quazip = callPackage ../development/libraries/quazip { }; + qscintilla = callPackage ../development/libraries/qscintilla { }; + qwt = callPackage ../development/libraries/qwt/default.nix { }; qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index bc10fe2b99d6..8490d2a20186 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -36,6 +36,8 @@ in quazip = callPackage ../development/libraries/quazip { }; + qscintilla = callPackage ../development/libraries/qscintilla { }; + qxlsx = callPackage ../development/libraries/qxlsx { }; poppler = callPackage ../development/libraries/poppler {