diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 73 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 44 |
4 files changed, 107 insertions, 16 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68dfe49545a..3831db8d401 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -442,6 +442,7 @@ mapAliases ({ transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 @@ -475,6 +476,9 @@ mapAliases ({ xbmcPlugins = kodiPlugins; # added 2018-04-25 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 + xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" + + "and is broken. Working alternatives are libinput and synaptics."); + xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20 xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 youtubeDL = youtube-dl; # added 2014-10-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b435ab8b258..8881f0aa64d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1536,6 +1536,8 @@ in dante = callPackage ../servers/dante { }; + dasher = callPackage ../applications/accessibility/dasher { }; + datamash = callPackage ../tools/misc/datamash { }; datasette = with python3Packages; toPythonApplication datasette; @@ -1593,6 +1595,8 @@ in direnv = callPackage ../tools/misc/direnv { }; + h = callPackage ../tools/misc/h { }; + discount = callPackage ../tools/text/discount { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -1928,6 +1932,8 @@ in megasync = libsForQt5.callPackage ../applications/misc/megasync { }; + megacmd = callPackage ../applications/misc/megacmd { }; + meritous = callPackage ../games/meritous { }; opendune = callPackage ../games/opendune { }; @@ -2062,6 +2068,8 @@ in step-cli = callPackage ../tools/security/step-cli { }; + string-machine = callPackage ../applications/audio/string-machine { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; @@ -2125,6 +2133,7 @@ in czmq = null; rabbitmq-c = null; hiredis = null; + libmaxminddb = null; }; mar1d = callPackage ../games/mar1d { } ; @@ -2952,12 +2961,18 @@ in epubcheck = callPackage ../tools/text/epubcheck { }; + luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup { + ssh = openssh; + }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Security; }; + rar2fs = callPackage ../tools/filesystems/rar2fs { }; + s-tar = callPackage ../tools/archivers/s-tar {}; sonota = callPackage ../tools/misc/sonota { }; @@ -4540,7 +4555,9 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { }; + mcfly = callPackage ../tools/misc/mcfly { + inherit (darwin.apple_sdk.frameworks) Security; + }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -5129,6 +5146,8 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; + mutagen = callPackage ../tools/misc/mutagen { }; + mycli = callPackage ../tools/admin/mycli { }; mydumper = callPackage ../tools/backup/mydumper { }; @@ -6234,6 +6253,8 @@ in sahel-fonts = callPackage ../data/fonts/sahel-fonts { }; + saldl = callPackage ../tools/networking/saldl { }; + salt = callPackage ../tools/admin/salt {}; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; @@ -7574,6 +7595,8 @@ in zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; + zsh-bd = callPackage ../shells/zsh/zsh-bd { }; + zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; zsh-history = callPackage ../shells/zsh/zsh-history { }; @@ -8440,7 +8463,9 @@ in inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; - graalvm8-ee = callPackage ../development/compilers/graalvm/enterprise-edition.nix { }; + inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) + graalvm8-ee + graalvm11-ee; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; @@ -8762,7 +8787,7 @@ in buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; + buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }); cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-web = callPackage ../development/tools/cargo-web { @@ -9645,7 +9670,9 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible ansible_2_6 - ansible_2_7; + ansible_2_7 + ansible_2_8 + ansible_2_9; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; @@ -11196,6 +11223,8 @@ in dhex = callPackage ../applications/editors/dhex { }; + dnnl = callPackage ../development/libraries/dnnl { }; + double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -11459,6 +11488,8 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL; }; + gensio = callPackage ../development/libraries/gensio {}; + geoclue2 = callPackage ../development/libraries/geoclue {}; geocode-glib = callPackage ../development/libraries/geocode-glib {}; @@ -13272,6 +13303,8 @@ in matio = callPackage ../development/libraries/matio { }; + matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn; + mbedtls = callPackage ../development/libraries/mbedtls { }; mdds = callPackage ../development/libraries/mdds { }; @@ -16228,7 +16261,8 @@ in iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; - iputils = callPackage ../os-specific/linux/iputils { }; + iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); + # hiPrio for collisions with inetutils (ping and tftpd.8.gz) iptables = iptables-legacy; iptables-legacy = callPackage ../os-specific/linux/iptables { }; @@ -17139,7 +17173,7 @@ in ubootBananaPi ubootBananaPim3 ubootBananaPim64 - ubootBeagleboneBlack + ubootAmx335xEVM ubootClearfog ubootGuruplug ubootJetsonTK1 @@ -17226,10 +17260,6 @@ in xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; - xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { }; - - xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { }; - xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; @@ -18096,6 +18126,9 @@ in apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; + apngasm = callPackage ../applications/graphics/apngasm {}; + apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; + appeditor = callPackage ../applications/misc/appeditor { }; aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; @@ -19208,6 +19241,8 @@ in game-music-emu = callPackage ../applications/audio/game-music-emu { }; + gavrasm = callPackage ../development/compilers/gavrasm { }; + gcalcli = callPackage ../applications/misc/gcalcli { }; vcal = callPackage ../applications/misc/vcal { }; @@ -19698,6 +19733,8 @@ in imgcat = callPackage ../applications/graphics/imgcat { }; + imgp = python3Packages.callPackage ../applications/graphics/imgp { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -19889,7 +19926,7 @@ in kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { - go = buildPackages.go_1_12; + go = buildPackages.go_1_13; }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; @@ -20649,7 +20686,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -21267,6 +21304,8 @@ in setbfree = callPackage ../applications/audio/setbfree { }; + sfizz = callPackage ../applications/audio/sfizz { }; + sfxr = callPackage ../applications/audio/sfxr { }; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; @@ -21647,6 +21686,8 @@ in telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + teleprompter = callPackage ../applications/misc/teleprompter {}; + tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; }; @@ -23141,6 +23182,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nudoku = callPackage ../games/nudoku { }; + nxengine-evo = callPackage ../games/nxengine-evo { }; odamex = callPackage ../games/odamex { }; @@ -23877,6 +23920,8 @@ in niftyseg = callPackage ../applications/science/biology/niftyseg { }; + manta = callPackage ../applications/science/biology/manta { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; paml = callPackage ../applications/science/biology/paml { }; @@ -25211,6 +25256,8 @@ in redprl = callPackage ../applications/science/logic/redprl { }; + renderizer = pkgs.callPackage ../development/tools/renderizer {}; + retroarchBare = callPackage ../misc/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; @@ -25316,6 +25363,8 @@ in seafile-shared = callPackage ../misc/seafile-shared { }; + ser2net = callPackage ../servers/ser2net {}; + serviio = callPackage ../servers/serviio {}; selinux-python = callPackage ../os-specific/linux/selinux-python { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a1d2e8eb3b5..a6adfc95815 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -839,6 +839,8 @@ let sedlex = callPackage ../development/ocaml-modules/sedlex { }; + sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c14028bae9d..df480391e13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,6 +187,8 @@ in { argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2 poetry; }; + arviz = callPackage ../development/python-modules/arviz { }; asana = callPackage ../development/python-modules/asana { }; @@ -312,6 +314,8 @@ in { azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; + azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; @@ -562,6 +566,8 @@ in { dendropy = callPackage ../development/python-modules/dendropy { }; + denonavr = callPackage ../development/python-modules/denonavr { }; + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; btchip = callPackage ../development/python-modules/btchip { }; @@ -692,6 +698,8 @@ in { geoip2 = callPackage ../development/python-modules/geoip2 { }; + getmac = callPackage ../development/python-modules/getmac { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; gin-config = callPackage ../development/python-modules/gin-config { }; @@ -946,6 +954,8 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; + pyperf = callPackage ../development/python-modules/pyperf { }; pefile = callPackage ../development/python-modules/pefile { }; @@ -2111,6 +2121,10 @@ in { cookies = callPackage ../development/python-modules/cookies { }; + coreapi = callPackage ../development/python-modules/coreapi { }; + + coreschema = callPackage ../development/python-modules/coreschema { }; + coveralls = callPackage ../development/python-modules/coveralls { }; coverage = callPackage ../development/python-modules/coverage { }; @@ -2244,6 +2258,8 @@ in { python-ly = callPackage ../development/python-modules/python-ly {}; + pyhcl = callPackage ../development/python-modules/pyhcl { }; + pyhepmc = callPackage ../development/python-modules/pyhepmc { }; pytest = if isPy3k then self.pytest_5 else self.pytest_4; @@ -2438,6 +2454,16 @@ in { daphne = callPackage ../development/python-modules/daphne { }; + dash = callPackage ../development/python-modules/dash { }; + + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; + + dash-html-components = callPackage ../development/python-modules/dash-html-components { }; + + dash-renderer = callPackage ../development/python-modules/dash-renderer { }; + + dash-table = callPackage ../development/python-modules/dash-table { }; + dateparser = callPackage ../development/python-modules/dateparser { }; # Actual name of package @@ -2496,6 +2522,8 @@ in { urllib3 = callPackage ../development/python-modules/urllib3 {}; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; + dropbox = callPackage ../development/python-modules/dropbox {}; drms = callPackage ../development/python-modules/drms { }; @@ -2585,6 +2613,8 @@ in { fluent-logger = callPackage ../development/python-modules/fluent-logger {}; + flux-led = callPackage ../development/python-modules/flux-led { }; + python-forecastio = callPackage ../development/python-modules/python-forecastio { }; fpdf = callPackage ../development/python-modules/fpdf { }; @@ -2743,6 +2773,8 @@ in { itsdangerous = callPackage ../development/python-modules/itsdangerous { }; + itypes = callPackage ../development/python-modules/itypes { }; + iniparse = callPackage ../development/python-modules/iniparse { }; intreehooks = callPackage ../development/python-modules/intreehooks { }; @@ -2934,6 +2966,12 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + plexapi = callPackage ../development/python-modules/plexapi { }; + + plexauth = callPackage ../development/python-modules/plexauth { }; + + plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + plotly = callPackage ../development/python-modules/plotly { }; plyfile = callPackage ../development/python-modules/plyfile { }; @@ -3173,10 +3211,6 @@ in { gdal = self.gdal; }; - django_2_1 = callPackage ../development/python-modules/django/2_1.nix { - gdal = self.gdal; - }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; django_1_8 = callPackage ../development/python-modules/django/1_8.nix { }; @@ -3462,6 +3496,8 @@ in { flask-socketio = callPackage ../development/python-modules/flask-socketio { }; + flask-sockets = callPackage ../development/python-modules/flask-sockets { }; + flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; flask-swagger = callPackage ../development/python-modules/flask-swagger { }; |