summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix18
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd6514615d1d..7f69d035573f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3792,7 +3792,7 @@ in
volctl = callPackage ../tools/audio/volctl { };
- vorta = python3Packages.callPackage ../applications/backup/vorta { };
+ vorta = libsForQt5.callPackage ../applications/backup/vorta { };
utahfs = callPackage ../applications/networking/utahfs { };
@@ -5954,7 +5954,8 @@ in
inherit (callPackages ../development/libraries/libwebsockets { })
libwebsockets_3_1
libwebsockets_3_2
- libwebsockets_4_0;
+ libwebsockets_4_0
+ libwebsockets_4_1;
libwebsockets = libwebsockets_3_2;
licensee = callPackage ../tools/package-management/licensee { };
@@ -11858,7 +11859,7 @@ in
cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {};
- cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { };
+ cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { };
clpm = callPackage ../development/tools/clpm {};
@@ -13337,6 +13338,8 @@ in
cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
+ cxxopts = callPackage ../development/libraries/cxxopts { };
+
cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { };
cypress = callPackage ../development/web/cypress { };
@@ -13690,7 +13693,7 @@ in
gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
- gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { };
+ gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { };
gdcm = callPackage ../development/libraries/gdcm { };
@@ -14023,6 +14026,11 @@ in
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
+ gtk4 = callPackage ../development/libraries/gtk/4.x.nix {
+ inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
+ };
+
+
# On darwin gtk uses cocoa by default instead of x11.
gtk3-x11 = gtk3.override {
cairo = cairo.override { x11Support = true; };
@@ -15835,6 +15843,8 @@ in
nika-fonts = callPackage ../data/fonts/nika-fonts { };
+ nikto = callPackage ../tools/networking/nikto { };
+
nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
nntp-proxy = callPackage ../applications/networking/nntp-proxy { };