diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-16 08:50:59 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-16 08:50:59 +0100 |
commit | 0c7143462b0a3671d99df394fd2542482899fdac (patch) | |
tree | 3144199675c77a52e36875212de710c00e263d47 /pkgs/top-level | |
parent | 40971eca7b98779b5471afcef0de139bf1822171 (diff) | |
parent | 9f2bc434ca71902a60e4a760575a96bec519bdc8 (diff) | |
download | nixlib-0c7143462b0a3671d99df394fd2542482899fdac.tar nixlib-0c7143462b0a3671d99df394fd2542482899fdac.tar.gz nixlib-0c7143462b0a3671d99df394fd2542482899fdac.tar.bz2 nixlib-0c7143462b0a3671d99df394fd2542482899fdac.tar.lz nixlib-0c7143462b0a3671d99df394fd2542482899fdac.tar.xz nixlib-0c7143462b0a3671d99df394fd2542482899fdac.tar.zst nixlib-0c7143462b0a3671d99df394fd2542482899fdac.zip |
Merge master into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 61 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 32 |
4 files changed, 106 insertions, 14 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b4991cf9791..dabbfcd6d49b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -384,7 +384,7 @@ mapAliases ({ ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby"; rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; - rxvt_unicode_with-plugins = rxvt-unicode; # added 2020-02-02 + rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 @@ -569,6 +569,9 @@ mapAliases ({ # added 2020-01-10 tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; + # added 2020-02-09 + dina-font-pcf = dina-font; + /* Cleanup before 20.09 */ llvm_4 = throw '' The LLVM versions 3.5, 3.9 and 4.0 have been removed in NixOS 20.03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 731c6009b547..81cf2c0220e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,7 +203,7 @@ in docker-ls = callPackage ../tools/misc/docker-ls { }; - docker-slim = callPackage ../build-support/docker-slim { }; + docker-slim = callPackage ../applications/virtualization/docker-slim { }; docker-sync = callPackage ../tools/misc/docker-sync { }; @@ -1139,6 +1139,8 @@ in bdf2psf = callPackage ../tools/misc/bdf2psf { }; + bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; + bcat = callPackage ../tools/text/bcat {}; bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; @@ -1322,6 +1324,7 @@ in bs-platform = callPackage ../development/compilers/bs-platform {}; c3d = callPackage ../applications/graphics/c3d { + stdenv = gcc8Stdenv; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -2261,8 +2264,12 @@ in bgs = callPackage ../tools/X11/bgs { }; + bibclean = callPackage ../tools/typesetting/bibclean { }; + biber = callPackage ../tools/typesetting/biber { }; + biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; + birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { }; @@ -2860,6 +2867,8 @@ in docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + docbookrx = callPackage ../tools/typesetting/docbookrx { }; + docear = callPackage ../applications/office/docear { }; dockbarx = callPackage ../applications/misc/dockbarx { }; @@ -2979,6 +2988,8 @@ in ssh = openssh; }; + kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { @@ -10521,6 +10532,8 @@ in rr = callPackage ../development/tools/analysis/rr { }; + samurai = callPackage ../development/tools/build-managers/samurai { }; + saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; sauce-connect = callPackage ../development/tools/sauce-connect { }; @@ -11474,7 +11487,9 @@ in libXpm = null; }; - gdal = callPackage ../development/libraries/gdal { }; + gdal = callPackage ../development/libraries/gdal { + pythonPackages = python3Packages; + }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; @@ -14458,6 +14473,8 @@ in tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; + tl-expected = callPackage ../development/libraries/tl-expected { }; + tnt = callPackage ../development/libraries/tnt { }; tntnet = callPackage ../development/libraries/tntnet { }; @@ -15370,6 +15387,8 @@ in miniHttpd = callPackage ../servers/http/mini-httpd {}; + mlflow-server = callPackage ../servers/mlflow-server { }; + mlmmj = callPackage ../servers/mail/mlmmj { }; moodle = callPackage ../servers/web-apps/moodle { }; @@ -17381,11 +17400,13 @@ in culmus = callPackage ../data/fonts/culmus { }; - clearlyU = callPackage ../data/fonts/clearlyU { }; + clearlyU = callPackage ../data/fonts/clearlyU + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; cm_unicode = callPackage ../data/fonts/cm-unicode {}; - creep = callPackage ../data/fonts/creep { }; + creep = callPackage ../data/fonts/creep + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; crimson = callPackage ../data/fonts/crimson {}; @@ -17397,9 +17418,8 @@ in paths = [ dejavu_fonts.out ]; }; - dina-font = callPackage ../data/fonts/dina { }; - - dina-font-pcf = callPackage ../data/fonts/dina-pcf { }; + dina-font = callPackage ../data/fonts/dina + { inherit (buildPackages.xorg) mkfontscale; }; dns-root-data = callPackage ../data/misc/dns-root-data { }; @@ -17483,7 +17503,8 @@ in encode-sans = callPackage ../data/fonts/encode-sans { }; - envypn-font = callPackage ../data/fonts/envypn-font { }; + envypn-font = callPackage ../data/fonts/envypn-font + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; envdir = callPackage ../tools/misc/envdir-go { }; @@ -17512,7 +17533,8 @@ in geolite-legacy = callPackage ../data/misc/geolite-legacy { }; - gohufont = callPackage ../data/fonts/gohufont { }; + gohufont = callPackage ../data/fonts/gohufont + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; @@ -17795,7 +17817,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - profont = callPackage ../data/fonts/profont { }; + profont = callPackage ../data/fonts/profont + { inherit (buildPackages.xorg) mkfontscale; }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -18153,6 +18176,8 @@ in argo = callPackage ../applications/networking/cluster/argo { }; + argocd = callPackage ../applications/networking/cluster/argocd { }; + ario = callPackage ../applications/audio/ario { }; arion = callPackage ../applications/virtualization/arion { }; @@ -19027,7 +19052,9 @@ in gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { + inherit (darwin) libiconv; + }; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; @@ -20798,6 +20825,8 @@ in paprefs = callPackage ../applications/audio/paprefs { }; + pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; @@ -21594,11 +21623,13 @@ in systemdSupport = true; }; - synergy = callPackage ../applications/misc/synergy { + synergy = libsForQt5.callPackage ../applications/misc/synergy { stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; }; + synergyWithoutGUI = synergy.override { withGUI = false; }; + tabbed = callPackage ../applications/window-managers/tabbed { # if you prefer a custom config, write the config.h in tabbed.config.h # and enable @@ -23185,7 +23216,10 @@ in openclonk = callPackage ../games/openclonk { }; - openjk = callPackage ../games/openjk { }; + openjk = callPackage ../games/openjk { + # segfaults when built with gcc9 + stdenv = gcc8Stdenv; + }; openmw = libsForQt5.callPackage ../games/openmw { }; @@ -25943,4 +25977,5 @@ in quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a34d1f8ee6a..562e96246bf0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9759,6 +9759,28 @@ let }; }; + LaTeXML = buildPerlPackage { + pname = "LaTeXML"; + version = "0.8.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; + sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; + }; + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent TextUnidecode URI XMLLibXML XMLLibXSLT shortenPerlShebang ]; + doCheck = false; # epub test fails + postInstall = '' + shortenPerlShebang $out/bin/latexml + shortenPerlShebang $out/bin/latexmlc + shortenPerlShebang $out/bin/latexmlfind + shortenPerlShebang $out/bin/latexmlmath + shortenPerlShebang $out/bin/latexmlpost + ''; + meta = { + description = "Transforms TeX and LaTeX into XML/HTML/MathML"; + license = stdenv.lib.licenses.free; + }; + }; + libapreq2 = buildPerlPackage { pname = "libapreq2"; version = "2.13"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04fd9e76192d..9dfa595f231b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -574,6 +574,8 @@ in { btchip = callPackage ../development/python-modules/btchip { }; + databricks-cli = callPackage ../development/python-modules/databricks-cli { }; + datatable = callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; @@ -1317,6 +1319,8 @@ in { pywebpush = callPackage ../development/python-modules/pywebpush { }; + pywick = callPackage ../development/python-modules/pywick { }; + pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); pyvcd = callPackage ../development/python-modules/pyvcd { }; @@ -1347,6 +1351,8 @@ in { salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + sanic-auth = callPackage ../development/python-modules/sanic-auth { }; + seekpath = callPackage ../development/python-modules/seekpath { }; selectors2 = callPackage ../development/python-modules/selectors2 { }; @@ -2439,6 +2445,8 @@ in { digital-ocean = callPackage ../development/python-modules/digitalocean { }; + digi-xbee = callPackage ../development/python-modules/digi-xbee { }; + leather = callPackage ../development/python-modules/leather { }; libais = callPackage ../development/python-modules/libais { }; @@ -2514,6 +2522,8 @@ in { discogs_client = callPackage ../development/python-modules/discogs_client { }; + dlx = callPackage ../development/python-modules/dlx { }; + dmenu-python = callPackage ../development/python-modules/dmenu { }; dnslib = callPackage ../development/python-modules/dnslib { }; @@ -2628,6 +2638,8 @@ in { fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; + filetype = callPackage ../development/python-modules/filetype { }; flammkuchen = callPackage ../development/python-modules/flammkuchen { }; @@ -2744,6 +2756,8 @@ in { hbmqtt = callPackage ../development/python-modules/hbmqtt { }; + hickle = callPackage ../development/python-modules/hickle { }; + hiro = callPackage ../development/python-modules/hiro {}; hglib = callPackage ../development/python-modules/hglib {}; @@ -2917,6 +2931,8 @@ in { mlrose = callPackage ../development/python-modules/mlrose { }; + mlflow = callPackage ../development/python-modules/mlflow { }; + mt-940 = callPackage ../development/python-modules/mt-940 { }; mwlib = callPackage ../development/python-modules/mwlib { }; @@ -3763,6 +3779,8 @@ in { google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + gorilla = callPackage ../development/python-modules/gorilla { }; + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport = true; inherit python; @@ -3861,6 +3879,8 @@ in { ifaddr = callPackage ../development/python-modules/ifaddr { }; + imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; + imageio = callPackage ../development/python-modules/imageio { }; imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; @@ -4152,6 +4172,8 @@ in { marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; + marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { }; + marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; manuel = callPackage ../development/python-modules/manuel { }; @@ -4969,6 +4991,8 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; + pysnow = callPackage ../development/python-modules/pysnow { }; + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; @@ -5244,6 +5268,8 @@ in { # alias for an older package which did not support Python 3 Quandl = callPackage ../development/python-modules/quandl { }; + querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { @@ -5760,6 +5786,8 @@ in { xxhash = callPackage ../development/python-modules/xxhash { }; + ydiff = callPackage ../development/python-modules/ydiff { }; + yoda = toPythonModule (pkgs.yoda.override { inherit python; }); @@ -6754,6 +6782,8 @@ in { inherit (pkgs) zstd pkgconfig; }; + zstandard = callPackage ../development/python-modules/zstandard { }; + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; incremental = callPackage ../development/python-modules/incremental { }; @@ -6944,6 +6974,8 @@ in { srptools = callPackage ../development/python-modules/srptools { }; + srp = callPackage ../development/python-modules/srp { }; + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; pyatv = callPackage ../development/python-modules/pyatv { }; |