aboutsummaryrefslogtreecommitdiff
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix5
-rw-r--r--pkgs/top-level/all-packages.nix155
-rw-r--r--pkgs/top-level/ocaml-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix46
4 files changed, 161 insertions, 47 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 28b5614a80cb..8009208739a6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -189,6 +189,10 @@ mapAliases ({
gnuradio-limesdr = gr-limesdr; # added 2019-05-27
gnuradio-rds = gr-rds; # added 2019-05-27
gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27
+ # added 20-10-2020
+ gnuradio-with-packages = gnuradio3_7.override {
+ extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ];
+ };
gnustep-make = gnustep.make; # added 2016-7-6
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
@@ -365,6 +369,7 @@ mapAliases ({
openjpeg_2_1 = openjpeg_2; # added 2018-10-25
opensans-ttf = open-sans; # added 2018-12-04
openssh_with_kerberos = openssh; # added 2018-01-28
+ onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04
osquery = throw "osquery has been removed."; # added 2019-11-24
otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
owncloudclient = owncloud-client; # added 2016-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee84e482e99a..184632f49246 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -546,6 +546,8 @@ in
wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { };
+ wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; };
+
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh;
@@ -2374,6 +2376,8 @@ in
mapproxy = callPackage ../applications/misc/mapproxy { };
+ marl = callPackage ../development/libraries/marl {};
+
marlin-calc = callPackage ../tools/misc/marlin-calc {};
masscan = callPackage ../tools/security/masscan {
@@ -2478,8 +2482,6 @@ in
oneshot = callPackage ../tools/networking/oneshot { };
- onnxruntime = callPackage ../development/libraries/onnxruntime { };
-
xkbd = callPackage ../applications/misc/xkbd { };
libpsm2 = callPackage ../os-specific/linux/libpsm2 { };
@@ -3042,8 +3044,7 @@ in
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
- python = python2;
- inherit (python2Packages) gyp;
+ stdenv = clangStdenv;
protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
};
@@ -3546,7 +3547,9 @@ in
pax = callPackage ../tools/archivers/pax { };
- rage = callPackage ../tools/security/rage { };
+ rage = callPackage ../tools/security/rage {
+ inherit (darwin.apple_sdk.frameworks) Foundation Security;
+ };
rar2fs = callPackage ../tools/filesystems/rar2fs { };
@@ -12787,18 +12790,12 @@ in
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
# The following need to be fixed on Darwin
- frei0r = if stdenv.isDarwin then null else frei0r;
- game-music-emu = if stdenv.isDarwin then null else game-music-emu;
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;
- openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
- rav1e = if stdenv.isDarwin then null else rav1e;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
- x265 = if stdenv.isDarwin then null else x265;
- xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;
@@ -14321,7 +14318,18 @@ in
libjpeg_original = callPackage ../development/libraries/libjpeg { };
# also known as libturbojpeg
- libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
+ libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo (lib.optionalAttrs stdenv.isDarwin {
+ # cmake 3.19.1 has a bug. So far only noticed with this package.
+ # https://github.com/NixOS/nixpkgs/issues/105854
+ cmake = cmake.overrideAttrs(oldAttrs: {
+ patches = oldAttrs.patches ++ [
+ (fetchpatch {
+ url = "https://gitlab.kitware.com/cmake/cmake/-/commit/fcabf4a47e0c441ff80fad8f34e388b16738bd33.patch";
+ sha256 = "bVrjY8omtAEKe8G76hGtmO54LKJvhx3RTW6OF6Y7rsU=";
+ })
+ ];
+ });
+ });
libjpeg = libjpeg_turbo;
libjreen = callPackage ../development/libraries/libjreen { };
@@ -14410,6 +14418,8 @@ in
libndctl = callPackage ../development/libraries/libndctl { };
+ libnest2d = callPackage ../development/libraries/libnest2d { };
+
libnet = callPackage ../development/libraries/libnet { };
libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { };
@@ -15744,7 +15754,13 @@ in
qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };
- qradiolink = callPackage ../applications/radio/qradiolink { };
+ qradiolink = callPackage ../applications/radio/qradiolink {
+ # 3.8 support is not ready yet:
+ # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573
+ # The non minimal build is used because the 'qtgui' component is needed.
+ # gr-osmosdr is using the same gnuradio as of now.
+ gnuradio = gnuradio3_7-unwrapped;
+ };
qrupdate = callPackage ../development/libraries/qrupdate { };
@@ -16877,8 +16893,8 @@ in
clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse {
- # clickhouse doesn't build on llvm8.
- inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm;
+ # upstream requires llvm10 as of v20.11.4.13
+ inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm;
};
couchdb = callPackage ../servers/http/couchdb {
@@ -18399,6 +18415,8 @@ in
fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { };
+ gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { };
+
hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null;
@@ -21024,6 +21042,10 @@ in
gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
+ greenfoot = callPackage ../applications/editors/greenfoot/default.nix {
+ jdk = jetbrains.jdk;
+ };
+
gspeech = callPackage ../applications/audio/gspeech { };
icesl = callPackage ../applications/misc/icesl { };
@@ -21155,34 +21177,80 @@ in
gksu = callPackage ../applications/misc/gksu { };
- gnss-sdr = callPackage ../applications/radio/gnss-sdr { boost=boost166; };
+ gnss-sdr = callPackage ../applications/radio/gnss-sdr {
+ boost = boost166;
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gnuradio = callPackage ../applications/radio/gnuradio {
- inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
+ gnuradio-unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
- fftw = fftwFloat;
- qwt = qwt6_qt4;
+ python = python3;
};
-
- gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix {
- inherit (python2Packages) python;
- extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ]
- ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ];
+ # A build without gui components and other utilites not needed for end user
+ # libraries
+ gnuradioMinimal = gnuradio-unwrapped.override {
+ features = {
+ gnuradio-companion = false;
+ python-support = false;
+ gr-ctrlport = false;
+ examples = false;
+ gr-qtgui = false;
+ gr-utils = false;
+ gr-modtool = false;
+ sphinx = false;
+ doxygen = false;
+ };
+ };
+ gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
+ unwrapped = gnuradio-unwrapped;
+ };
+ gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix {
+ inherit (darwin.apple_sdk.frameworks) CoreAudio;
+ python = python2;
+ };
+ # A build without gui components and other utilites not needed if gnuradio is
+ # used as a c++ library.
+ gnuradio3_7Minimal = gnuradio3_7-unwrapped.override {
+ features = {
+ gnuradio-companion = false;
+ python-support = false;
+ gr-ctrlport = false;
+ gr-qtgui = false;
+ gr-utils = false;
+ sphinx = false;
+ doxygen = false;
+ gr-wxgui = false;
+ };
+ };
+ gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix {
+ unwrapped = gnuradio3_7-unwrapped;
};
grandorgue = callPackage ../applications/audio/grandorgue { };
- gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { };
+ gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { };
+ gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { };
+ gr-ais = callPackage ../applications/radio/gnuradio/ais.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { };
+ gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { };
+ gr-rds = callPackage ../applications/radio/gnuradio/rds.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
- gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { };
+ gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix {
+ gnuradio = gnuradio3_7-unwrapped;
+ };
goldendict = libsForQt514.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
@@ -21221,7 +21289,14 @@ in
gpx = callPackage ../applications/misc/gpx { };
- gqrx = libsForQt514.callPackage ../applications/radio/gqrx { };
+ gqrx = libsForQt514.callPackage ../applications/radio/gqrx {
+ gnuradio = gnuradio3_7Minimal;
+ # Use the same gnuradio for gr-osmosdr as well
+ gr-osmosdr = gr-osmosdr.override {
+ gnuradio = gnuradio3_7Minimal;
+ pythonSupport = false;
+ };
+ };
gpx-viewer = callPackage ../applications/misc/gpx-viewer { };
@@ -21987,7 +22062,9 @@ in
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
- inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { };
+ inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum {
+ gnuradio = gnuradioMinimal;
+ };
ion3 = callPackage ../applications/window-managers/ion-3 {
lua = lua5_1;
@@ -22670,6 +22747,9 @@ in
ympd = callPackage ../applications/audio/ympd { };
+ # a somewhat more maintained fork of ympd
+ mympd = callPackage ../applications/audio/mympd { };
+
nload = callPackage ../applications/networking/nload { };
normalize = callPackage ../applications/audio/normalize { };
@@ -22757,6 +22837,8 @@ in
pythonPackages = python3Packages;
};
+ n8n = callPackage ../applications/networking/n8n {};
+
neap = callPackage ../applications/misc/neap { };
neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
@@ -22820,9 +22902,7 @@ in
pig = callPackage ../applications/networking/cluster/pig { };
- pijul = callPackage ../applications/version-management/pijul {
- inherit (llvmPackages) clang libclang;
- };
+ pijul = callPackage ../applications/version-management/pijul { };
ping = callPackage ../applications/networking/ping { };
@@ -26233,6 +26313,7 @@ in
dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
+ easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { };
emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { };
freon = callPackage ../desktops/gnome-3/extensions/freon { };
gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
@@ -28276,7 +28357,7 @@ in
vttest = callPackage ../tools/misc/vttest { };
- wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { };
+ wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
wasmer = callPackage ../development/interpreters/wasmer { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 793b7b78b0e9..6fe157d2ea2b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -740,6 +740,8 @@ let
octavius = callPackage ../development/ocaml-modules/octavius { };
+ odate = callPackage ../development/ocaml-modules/odate { };
+
odoc = callPackage ../development/ocaml-modules/odoc { };
omd = callPackage ../development/ocaml-modules/omd { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa3a001a8210..08cb32a94080 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1215,6 +1215,10 @@ in {
click-threading = callPackage ../development/python-modules/click-threading { };
+ clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {};
+
+ clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {};
+
cliff = callPackage ../development/python-modules/cliff { };
clifford = callPackage ../development/python-modules/clifford { };
@@ -2270,7 +2274,10 @@ in {
freetype-py = callPackage ../development/python-modules/freetype-py { };
- freezegun = callPackage ../development/python-modules/freezegun { };
+ freezegun = if isPy27 then
+ callPackage ../development/python-modules/freezegun/0.3.nix { }
+ else
+ callPackage ../development/python-modules/freezegun { };
fritzconnection = callPackage ../development/python-modules/fritzconnection { };
@@ -3058,7 +3065,11 @@ in {
isodate = callPackage ../development/python-modules/isodate { };
- isort = callPackage ../development/python-modules/isort { };
+ isort = if isPy3k then
+ callPackage ../development/python-modules/isort { }
+ else
+ callPackage ../development/python-modules/isort/4.nix {
+ };
isoweek = callPackage ../development/python-modules/isoweek { };
@@ -3229,6 +3240,8 @@ in {
jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { };
+ jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { };
+
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; };
@@ -3781,6 +3794,8 @@ in {
mido = callPackage ../development/python-modules/mido { };
+ milc = callPackage ../development/python-modules/milc { };
+
milksnake = callPackage ../development/python-modules/milksnake { };
minidb = callPackage ../development/python-modules/minidb { };
@@ -4346,7 +4361,9 @@ in {
oyaml = callPackage ../development/python-modules/oyaml { };
- packaging = callPackage ../development/python-modules/packaging { };
+ packaging = if isPy3k
+ then callPackage ../development/python-modules/packaging { }
+ else callPackage ../development/python-modules/packaging/2.nix { };
packet-python = callPackage ../development/python-modules/packet-python { };
@@ -4851,6 +4868,8 @@ in {
py-air-control = callPackage ../development/python-modules/py-air-control { };
+ py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
+
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });
@@ -5004,6 +5023,8 @@ in {
pycurl = callPackage ../development/python-modules/pycurl { };
+ pycxx = callPackage ../development/python-modules/pycxx { };
+
pydantic = callPackage ../development/python-modules/pydantic { };
pydbus = callPackage ../development/python-modules/pydbus { };
@@ -5322,6 +5343,8 @@ in {
pync = callPackage ../development/python-modules/pync { };
+ pynest2d = callPackage ../development/python-modules/pynest2d { };
+
pynisher = callPackage ../development/python-modules/pynisher { };
pynmea2 = callPackage ../development/python-modules/pynmea2 { };
@@ -5621,7 +5644,9 @@ in {
pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
- pysvn = callPackage ../development/python-modules/pysvn { };
+ pysvn = callPackage ../development/python-modules/pysvn {
+ inherit (pkgs) bash subversion apr aprutil expat neon openssl;
+ };
pytabix = callPackage ../development/python-modules/pytabix { };
@@ -5636,7 +5661,7 @@ in {
pytesseract = callPackage ../development/python-modules/pytesseract { };
# pytest>=6 is too new for most packages
- pytest = if isPy3k then self.pytest_5 else self.pytest_4;
+ pytest = if isPy3k then self.pytest_6 else self.pytest_4;
pytest_4 = callPackage
../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle
@@ -5804,11 +5829,10 @@ in {
pytest-watch = callPackage ../development/python-modules/pytest-watch { };
- pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { };
-
- pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { };
-
- pytest_xdist = self.pytest_xdist_1;
+ pytest_xdist = if isPy27 then
+ callPackage ../development/python-modules/pytest-xdist/1.nix { }
+ else
+ callPackage ../development/python-modules/pytest-xdist { };
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
@@ -6227,6 +6251,8 @@ in {
rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { };
+ re-assert = callPackage ../development/python-modules/re-assert { };
+
readchar = callPackage ../development/python-modules/readchar { };
readme = callPackage ../development/python-modules/readme { };
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:21:22 +0000