diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 110 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 10 |
4 files changed, 81 insertions, 51 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7c70c043d58..c8f4cdde0da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -865,6 +865,7 @@ mapAliases ({ mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = mame; # Added 2019-10-30 + metal = throw "metal has been removed due to lack of maintainers"; mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e66b718e696..18c82f113e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2652,6 +2652,8 @@ with pkgs; sshchecker = callPackage ../tools/security/sshchecker { }; + sshs = callPackage ../development/tools/sshs { }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -4246,6 +4248,7 @@ with pkgs; noti = callPackage ../tools/misc/noti { inherit (darwin.apple_sdk.frameworks) Cocoa; + buildGoPackage = buildGo117Package; }; notify = callPackage ../tools/misc/notify { }; @@ -14249,7 +14252,6 @@ with pkgs; coursier = coursier.override { jre = jdk8; }; }; - metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -19670,6 +19672,10 @@ with pkgs; libuinputplus = callPackage ../development/libraries/libuinputplus { }; + libuiohook = callPackage ../development/libraries/libuiohook { + inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices Carbon; + }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; @@ -20525,6 +20531,8 @@ with pkgs; protobuf = protobuf3_19; + protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; + protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; @@ -27684,6 +27692,8 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; + streamdeck-ui = libsForQt5.callPackage ../applications/misc/streamdeck-ui { }; + super-productivity = callPackage ../applications/office/super-productivity { electron = electron_17; }; @@ -27838,66 +27848,64 @@ with pkgs; fiji = callPackage ../applications/graphics/fiji { }; imagemagick6_light = imagemagick6.override { - bzip2 = null; - zlib = null; - libX11 = null; - libXext = null; - libXt = null; - fontconfig = null; - freetype = null; - ghostscript = null; - libjpeg = null; - djvulibre = null; - lcms2 = null; - openexr = null; - libpng = null; - liblqr1 = null; - librsvg = null; - libtiff = null; - libxml2 = null; - openjpeg = null; - libwebp = null; - libheif = null; - libde265 = null; + bzip2Support = false; + zlibSupport = false; + libX11Support = false; + libXtSupport = false; + fontconfigSupport = false; + freetypeSupport = false; + ghostscriptSupport = false; + libjpegSupport = false; + djvulibreSupport = false; + lcms2Support = false; + openexrSupport = false; + libpngSupport = false; + liblqr1Support = false; + librsvgSupport = false; + libtiffSupport = false; + libxml2Support = false; + openjpegSupport = false; + libwebpSupport = false; + libheifSupport = false; + libde265Support = false; }; imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; - ghostscript = null; }; - imagemagick6Big = imagemagick6.override { inherit ghostscript; }; + imagemagick6Big = imagemagick6.override { + ghostscriptSupport = true; + }; imagemagick_light = lowPrio (imagemagick.override { - bzip2 = null; - zlib = null; - libX11 = null; - libXext = null; - libXt = null; - fontconfig = null; - freetype = null; - ghostscript = null; - libjpeg = null; - djvulibre = null; - lcms2 = null; - openexr = null; - libjxl = null; - libpng = null; - liblqr1 = null; - librsvg = null; - libtiff = null; - libxml2 = null; - openjpeg = null; - libwebp = null; - libheif = null; + bzip2Support = false; + zlibSupport = false; + libX11Support = false; + libXtSupport = false; + fontconfigSupport = false; + freetypeSupport = false; + libjpegSupport = false; + djvulibreSupport = false; + lcms2Support = false; + openexrSupport = false; + libjxlSupport = false; + libpngSupport = false; + liblqr1Support = false; + librsvgSupport = false; + libtiffSupport = false; + libxml2Support = false; + openjpegSupport = false; + libwebpSupport = false; + libheifSupport = false; }); - imagemagick = lowPrio (imagemagickBig.override { - ghostscript = null; + imagemagick = lowPrio (callPackage ../applications/graphics/ImageMagick { + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }); - imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; + imagemagickBig = lowPrio (imagemagick.override { + ghostscriptSupport = true; }); imagination = callPackage ../applications/video/imagination { }; @@ -31113,6 +31121,8 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webex = callPackage ../applications/networking/instant-messengers/webex {}; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; webssh = with python3Packages; toPythonApplication webssh; @@ -34079,6 +34089,8 @@ with pkgs; jflap = callPackage ../applications/science/engineering/jflap { }; + strictdoc = python3.pkgs.callPackage ../applications/science/engineering/strictdoc { }; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 55817beb5c8..d794592461f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1533,14 +1533,21 @@ let # Jane Street janePackage = - if lib.versionOlder "4.08" ocaml.version + if lib.versionOlder "4.10.2" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {} + else if lib.versionOlder "4.08" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} else if lib.versionOlder "4.07" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = - if lib.versionOlder "4.08" ocaml.version + if lib.versionOlder "4.10.2" ocaml.version + then import ../development/ocaml-modules/janestreet/0.15.nix { + inherit self; + inherit (pkgs) fetchpatch lib openssl patdiff zstd; + } + else if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; inherit (pkgs) fetchpatch lib openssl zstd; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff5c109d671..223b190b43e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2156,6 +2156,8 @@ in { datatable = callPackage ../development/python-modules/datatable { }; + datauri = callPackage ../development/python-modules/datauri { }; + dateparser = callPackage ../development/python-modules/dateparser { }; dateutils = callPackage ../development/python-modules/dateutils { }; @@ -9239,6 +9241,8 @@ in { reproject = callPackage ../development/python-modules/reproject { }; + reqif = callPackage ../development/python-modules/reqif { }; + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; requests-cache = callPackage ../development/python-modules/requests-cache { }; @@ -10248,6 +10252,8 @@ in { stravalib = callPackage ../development/python-modules/stravalib { }; + streamdeck = callPackage ../development/python-modules/streamdeck { }; + streaming-form-data = callPackage ../development/python-modules/streaming-form-data { }; streamlabswater = callPackage ../development/python-modules/streamlabswater { }; @@ -10504,6 +10510,8 @@ in { tesserocr = callPackage ../development/python-modules/tesserocr { }; + testcontainers = callPackage ../development/python-modules/testcontainers { }; + testfixtures = callPackage ../development/python-modules/testfixtures { }; textfsm = callPackage ../development/python-modules/textfsm { }; @@ -10538,6 +10546,8 @@ in { textwrap3 = callPackage ../development/python-modules/textwrap3 { }; + textx = callPackage ../development/python-modules/textx { }; + tflearn = callPackage ../development/python-modules/tflearn { }; tgcrypto = callPackage ../development/python-modules/tgcrypto { }; |