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 | 117 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 36 |
5 files changed, 131 insertions, 53 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5eb7c2011832..ff4051310745 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -50,6 +50,8 @@ mapAliases ({ bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 + bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bluezFull = bluez; # Added 2019-12-03 bridge_utils = bridge-utils; # added 2015-02-20 @@ -281,6 +283,7 @@ mapAliases ({ matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 + mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 mysql-client = hiPrio mariadb.client; @@ -303,6 +306,7 @@ mapAliases ({ msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 mssys = ms-sys; # added 2015-12-13 + mpv-with-scripts = throw "Use wrapMpv for editing the environment of mpv"; # added 2012-05-22 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bd1772db838..bbac14b4852e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -173,6 +173,8 @@ in colorz = callPackage ../tools/misc/colorz { }; + comedilib = callPackage ../development/libraries/comedilib { }; + cpu-x = callPackage ../applications/misc/cpu-x { }; dhallToNix = callPackage ../build-support/dhall-to-nix.nix { @@ -1367,7 +1369,8 @@ in btfs = callPackage ../os-specific/linux/btfs { }; - buildah = callPackage ../development/tools/buildah { }; + buildah = callPackage ../development/tools/buildah/wrapper.nix { }; + buildah-unwrapped = callPackage ../development/tools/buildah { }; buildkit = callPackage ../development/tools/buildkit { }; @@ -1673,6 +1676,8 @@ in discount = callPackage ../tools/text/discount { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; + diskscan = callPackage ../tools/misc/diskscan { }; disorderfs = callPackage ../tools/filesystems/disorderfs { @@ -2152,6 +2157,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -3526,9 +3533,6 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; - fprintd-thinkpad = fprintd.override { - thinkpad = true; - }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -5264,7 +5268,9 @@ in monit = callPackage ../tools/system/monit { }; - monolith = callPackage ../tools/backup/monolith { }; + monolith = callPackage ../tools/backup/monolith { + inherit (darwin.apple_sdk.frameworks) Security; + }; moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl; @@ -6126,6 +6132,8 @@ in pubs = callPackage ../tools/misc/pubs {}; + pure-prompt = callPackage ../shells/zsh/pure-prompt { }; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; @@ -6656,7 +6664,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -6903,6 +6911,8 @@ in libxml2 = libxml2Python; }; + systembus-notify = callPackage ../applications/misc/systembus-notify { }; + stricat = callPackage ../tools/security/stricat { }; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; @@ -8072,6 +8082,8 @@ in bluespec = callPackage ../development/compilers/bluespec { }; + ciao = callPackage ../development/compilers/ciao { }; + colm = callPackage ../development/compilers/colm { }; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; @@ -8714,6 +8726,8 @@ in idris = idrisPackages.with-packages [ idrisPackages.base ] ; + idris2 = callPackage ../development/compilers/idris2 { }; + intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { }; intercal = callPackage ../development/compilers/intercal { }; @@ -11854,6 +11868,16 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + }); + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; glbinding = callPackage ../development/libraries/glbinding { }; @@ -12817,9 +12841,6 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; - libfprint-thinkpad = libfprint.override { - thinkpad = true; - }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -13305,6 +13326,8 @@ in libp11 = callPackage ../development/libraries/libp11 { }; + libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { }; + libpar2 = callPackage ../development/libraries/libpar2 { }; libpcap = callPackage ../development/libraries/libpcap { }; @@ -14983,6 +15006,14 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO OpenGL GLUT; + }; + + vtk_7 = callPackage ../development/libraries/vtk/7.x.nix { stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -15022,7 +15053,7 @@ in }); }; - vtkWithQt4 = vtk.override { qtLib = qt4; }; + vtkWithQt5 = vtk.override { qtLib = qt5; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; @@ -15577,6 +15608,8 @@ in dspam = callPackage ../servers/mail/dspam { }; + engelsystem = callPackage ../servers/web-apps/engelsystem { }; + etcd = callPackage ../servers/etcd { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; @@ -15987,6 +16020,8 @@ in mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { }; + azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; + miniflux = callPackage ../servers/miniflux { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -18374,6 +18409,8 @@ in tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; + tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; }; @@ -18715,11 +18752,6 @@ in baudline = callPackage ../applications/audio/baudline { }; - - bazaar = callPackage ../applications/version-management/bazaar { }; - - bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; - bb = callPackage ../applications/misc/bb { }; berry = callPackage ../applications/window-managers/berry { }; @@ -20572,7 +20604,9 @@ in linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = ocamlPackages.callPackage ../applications/misc/llpp { }; + llpp = callPackage ../applications/misc/llpp { + inherit (ocaml-ng.ocamlPackages_4_09) ocaml; + }; lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; @@ -20818,7 +20852,22 @@ in python = python3; }; - inherit (mopidyPackages) mopidy mopidy-gmusic mopidy-local-images mopidy-local-sqlite mopidy-spotify mopidy-moped mopidy-mopify mopidy-spotify-tunigo mopidy-youtube mopidy-soundcloud mopidy-musicbox-webclient mopidy-iris mopidy-mpd; + inherit (mopidyPackages) + mopidy + mopidy-gmusic + mopidy-iris + mopidy-local-images + mopidy-local-sqlite + mopidy-moped + mopidy-mopify + mopidy-mpd + mopidy-mpris + mopidy-musicbox-webclient + mopidy-somafm + mopidy-soundcloud + mopidy-spotify + mopidy-spotify-tunigo + mopidy-youtube; motif = callPackage ../development/libraries/motif { }; @@ -20878,12 +20927,14 @@ in libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); - mpv = callPackage ../applications/video/mpv { + mpv-unwrapped = callPackage ../applications/video/mpv { inherit lua; inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; - mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; + # Wraps without trigerring a rebuild + wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; + mpv = wrapMpv mpv-unwrapped {}; mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; @@ -22335,6 +22386,7 @@ in transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; + transmission-qt = transmission.override { enableQt = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; @@ -22393,6 +22445,7 @@ in unigine-valley = callPackage ../applications/graphics/unigine-valley { }; unison = callPackage ../applications/networking/sync/unison { + ocamlPackages = ocaml-ng.ocamlPackages_4_09; enableX11 = config.unison.enableX11 or true; }; @@ -23241,6 +23294,8 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + ergo = callPackage ../applications/blockchains/ergo { }; + exodus = callPackage ../applications/blockchains/exodus { }; freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; @@ -23426,7 +23481,8 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o { }; + cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; + cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; ckan = callPackage ../games/ckan { }; @@ -24033,6 +24089,8 @@ in t4kcommon = callPackage ../games/t4kcommon { }; + taisei = callPackage ../games/taisei { }; + tcl2048 = callPackage ../games/tcl2048 { }; the-powder-toy = callPackage ../games/the-powder-toy { @@ -24442,6 +24500,16 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + bpp-core = callPackage ../development/libraries/science/biology/bpp-core { }; + + bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { }; + + bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { }; + + bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { }; + + bppsuite = callPackage ../applications/science/biology/bppsuite { }; + cd-hit = callPackage ../applications/science/biology/cd-hit { }; cmtk = callPackage ../applications/science/biology/cmtk { }; @@ -24791,6 +24859,8 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; + xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; + ### SCIENCE/PROGRAMMING dafny = dotnetPackages.Dafny; @@ -24824,7 +24894,7 @@ in cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 @@ -25249,8 +25319,6 @@ in lhapdf = callPackage ../development/libraries/physics/lhapdf { }; - mcgrid = callPackage ../development/libraries/physics/mcgrid { }; - mela = callPackage ../development/libraries/physics/mela { }; nlojet = callPackage ../development/libraries/physics/nlojet { }; @@ -25258,13 +25326,14 @@ in pythia = callPackage ../development/libraries/physics/pythia { }; rivet = callPackage ../development/libraries/physics/rivet { + hepmc = hepmc2; imagemagick = graphicsmagick-imagemagick-compat; }; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { - python = python2; + python = python3; }; yoda-with-root = lowPrio (yoda.override { withRootSupport = true; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index d2b9eb52ec6c..dedef12e38ba 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }: +{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 }: let mkCoqPackages' = self: coq: @@ -100,15 +100,19 @@ in rec { version = "8.6.1"; }; coq_8_7 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.7.2"; }; coq_8_8 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.8.2"; }; coq_8_9 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.9.1"; }; coq_8_10 = callPackage ../applications/science/logic/coq { + ocamlPackages = ocamlPackages_4_09; version = "8.10.2"; }; coq_8_11 = callPackage ../applications/science/logic/coq { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 76082efda8f5..7db3335f6a1a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -16,6 +16,8 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; + afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { }; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; @@ -36,8 +38,6 @@ let astring = callPackage ../development/ocaml-modules/astring { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - atd = callPackage ../development/ocaml-modules/atd { }; atdgen = callPackage ../development/ocaml-modules/atdgen { }; @@ -185,6 +185,10 @@ let csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { }; + curly = callPackage ../development/ocaml-modules/curly { + inherit (pkgs) curl; + }; + curses = callPackage ../development/ocaml-modules/curses { }; custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; @@ -756,6 +760,10 @@ let tls = callPackage ../development/ocaml-modules/tls { }; + torch = callPackage ../development/ocaml-modules/torch { + inherit (pkgs.python3Packages) pytorch; + }; + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; @@ -1168,13 +1176,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; - async_kernel = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_kernel - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} - else async_kernel_p4; - async_rpc_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_rpc_kernel @@ -1221,5 +1222,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_10; - ocamlPackages = ocamlPackages_4_09; + ocamlPackages = ocamlPackages_4_10; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86339e361cb3..633f583025cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -799,6 +799,8 @@ in { hdf5 = pkgs.hdf5-mpi; }; + h5netcdf = callPackage ../development/python-modules/h5netcdf { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; habanero = callPackage ../development/python-modules/habanero { }; @@ -889,6 +891,8 @@ in { limitlessled = callPackage ../development/python-modules/limitlessled { }; + livelossplot = callPackage ../development/python-modules/livelossplot { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; logster = callPackage ../development/python-modules/logster { }; @@ -1503,6 +1507,8 @@ in { sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + skorch = callPackage ../development/python-modules/skorch { }; + slackclient = callPackage ../development/python-modules/slackclient { }; slicedimage = callPackage ../development/python-modules/slicedimage { }; @@ -3806,6 +3812,8 @@ in { cudaSupport = false; }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pythondialog = callPackage ../development/python-modules/pythondialog { }; python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; @@ -4265,6 +4273,8 @@ in { inherit (pkgs) kerberos; }; + lazy_import = callPackage ../development/python-modules/lazy_import { }; + lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; ldaptor = callPackage ../development/python-modules/ldaptor { }; @@ -5472,21 +5482,6 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; - pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec { - version = "3.13"; - src = oldAttrs.src.override { - inherit version; - sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; - }; - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - patches = singleton (pkgs.fetchpatch { - url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch"; - sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn"; - }); - # https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948 - doCheck = false; - }); - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; rasterio = callPackage ../development/python-modules/rasterio { @@ -5583,8 +5578,8 @@ in { retworkx = callPackage ../development/python-modules/retworkx { }; - rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override { - python2 = python; + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { + python3 = python; })); ripser = callPackage ../development/python-modules/ripser { }; @@ -7055,6 +7050,11 @@ in { pytoml = callPackage ../development/python-modules/pytoml { }; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; + }; + pypandoc = callPackage ../development/python-modules/pypandoc { }; yamllint = callPackage ../development/python-modules/yamllint { }; @@ -7091,7 +7091,7 @@ in { visitor = callPackage ../development/python-modules/visitor { }; - vtk = toPythonModule (pkgs.vtk.override { + vtk = toPythonModule (pkgs.vtk_7.override { inherit (self) python; enablePython = true; }); |