public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into haskell-updates

Browse Source
This commit is contained in:
(cdep)illabout
2021-05-16 16:56:34 +09:00
parent d1de348fdc f2c015d33d
commit f75fe9394f
322 changed files with 9703 additions and 5289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+35 -15
View File
@@ -1473,7 +1473,9 @@ in
SDL = SDL_sixel;
};
gremlin-console = callPackage ../applications/misc/gremlin-console { };
gremlin-console = callPackage ../applications/misc/gremlin-console {
openjdk = openjdk11;
};
grex = callPackage ../tools/misc/grex {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -2012,6 +2014,8 @@ in
boost = pkgs.boost.override { python = python3; };
};
calendar-cli = callPackage ../tools/networking/calendar-cli { };
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };
@@ -5359,6 +5363,8 @@ in
gtkperf = callPackage ../development/tools/misc/gtkperf { };
gtk-frdp = callPackage ../development/libraries/gtk-frdp {};
gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
gtmess = callPackage ../applications/networking/instant-messengers/gtmess {
@@ -5861,6 +5867,8 @@ in
jq = callPackage ../development/tools/jq { };
jiq = callPackage ../development/tools/misc/jiq { };
jql = callPackage ../development/tools/jql { };
jo = callPackage ../development/tools/jo { };
@@ -9045,6 +9053,8 @@ in
tthsum = callPackage ../applications/misc/tthsum { };
ttp = with python3.pkgs; toPythonApplication ttp;
chaps = callPackage ../tools/security/chaps { };
trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
@@ -9708,6 +9718,8 @@ in
wpgtk = callPackage ../tools/X11/wpgtk { };
wrap = callPackage ../tools/text/wrap { };
wring = nodePackages.wring;
wrk = callPackage ../tools/networking/wrk { };
@@ -11867,14 +11879,14 @@ in
duktape = callPackage ../development/interpreters/duktape { };
evcxr = callPackage ../development/interpreters/evcxr {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
beam = callPackage ./beam-packages.nix { };
beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };
inherit (beam.interpreters)
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7
elixir_ls;
@@ -14955,7 +14967,9 @@ in
cairomm = callPackage ../development/libraries/cairomm { };
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { };
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
pango = callPackage ../development/libraries/pango {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
@@ -19314,9 +19328,7 @@ in
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus = callPackage ../servers/monitoring/prometheus {
buildGoPackage = buildGo115Package;
};
prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { };
@@ -19336,6 +19348,7 @@ in
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { };
prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { };
prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };
prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { };
@@ -22787,7 +22800,8 @@ in
dmrconfig = callPackage ../applications/radio/dmrconfig { };
dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
dmtx-utils = callPackage ../tools/graphics/dmtx-utils {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
inherit (callPackage ../applications/virtualization/docker {})
@@ -22889,7 +22903,9 @@ in
jdk = jdk11;
});
ecpdap = callPackage ../development/tools/ecpdap { };
ecpdap = callPackage ../development/tools/ecpdap {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
@@ -23167,7 +23183,7 @@ in
# A build without gui components and other utilites not needed for end user
# libraries
gnuradioMinimal = gnuradio.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio.unwrapped.override {
volk = volk.override {
# So it will not reference python
@@ -23197,7 +23213,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_8Minimal = gnuradio3_8.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_8.unwrapped.override {
volk = volk.override {
enableModTool = false;
@@ -23226,7 +23242,7 @@ in
# A build without gui components and other utilites not needed if gnuradio is
# used as a c++ library.
gnuradio3_7Minimal = gnuradio3_7.override {
wrap = false;
doWrap = false;
unwrapped = gnuradio3_7.unwrapped.override {
volk = volk.override {
enableModTool = false;
@@ -24103,7 +24119,7 @@ in
};
imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
ghostscript = null;
};
@@ -25961,7 +25977,7 @@ in
rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { };
rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { };
rsclock = callPackage ../applications/misc/rsclock { };
@@ -26768,6 +26784,8 @@ in
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
neovide = callPackage ../applications/editors/neovim/neovide { };
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
vis = callPackage ../applications/editors/vis {
@@ -28934,7 +28952,9 @@ in
bppsuite = callPackage ../applications/science/biology/bppsuite { };
cd-hit = callPackage ../applications/science/biology/cd-hit { };
cd-hit = callPackage ../applications/science/biology/cd-hit {
inherit (llvmPackages) openmp;
};
cmtk = callPackage ../applications/science/biology/cmtk { };
pkgs/top-level/beam-packages.nix
+16
View File
@@ -14,6 +14,21 @@ rec {
# Standard Erlang versions, using the generic builder.
# R24
erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
wxGTK = wxGTK30;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true;
autoconf = buildPackages.autoconf269;
inherit wxSupport;
};
erlangR24_odbc = erlangR24.override { odbcSupport = true; };
erlangR24_javac = erlangR24.override { javacSupport = true; };
erlangR24_odbc_javac = erlangR24.override {
javacSupport = true;
odbcSupport = true;
};
# R23
erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {
wxGTK = wxGTK30;
@@ -126,6 +141,7 @@ rec {
# Packages built with default Erlang version.
erlang = packagesWith interpreters.erlang;
erlangR24 = packagesWith interpreters.erlangR24;
erlangR23 = packagesWith interpreters.erlangR23;
erlangR22 = packagesWith interpreters.erlangR22;
erlangR21 = packagesWith interpreters.erlangR21;
pkgs/top-level/perl-packages.nix
+2
View File
@@ -21787,6 +21787,8 @@ let
url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz";
sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h";
};
# libbtparse.so: cannot open shared object file (aarch64 only)
patches = [ ../development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch ];
perlPreHook = "export LD=$CC";
perlPostHook = lib.optionalString stdenv.isDarwin ''
oldPath="$(pwd)/btparse/src/libbtparse.dylib"
pkgs/top-level/python-packages.nix
+19 -1
View File
@@ -409,7 +409,11 @@ in {
ansi2html = callPackage ../development/python-modules/ansi2html { };
ansible = callPackage ../development/python-modules/ansible { };
ansible = callPackage ../development/python-modules/ansible/legacy.nix { };
ansible-base = callPackage ../development/python-modules/ansible/base.nix { };
ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { };
ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
@@ -1475,6 +1479,8 @@ in {
colored = callPackage ../development/python-modules/colored { };
colored-traceback = callPackage ../development/python-modules/colored-traceback { };
coloredlogs = callPackage ../development/python-modules/coloredlogs { };
colorful = callPackage ../development/python-modules/colorful { };
@@ -2725,6 +2731,8 @@ in {
glasgow = callPackage ../development/python-modules/glasgow { };
glcontext = callPackage ../development/python-modules/glcontext { };
glob2 = callPackage ../development/python-modules/glob2 { };
globre = callPackage ../development/python-modules/globre { };
@@ -3579,6 +3587,8 @@ in {
jwcrypto = callPackage ../development/python-modules/jwcrypto { };
jxmlease = callPackage ../development/python-modules/jxmlease { };
k5test = callPackage ../development/python-modules/k5test {
inherit (pkgs) krb5Full findutils which;
};
@@ -5885,6 +5895,8 @@ in {
pynest2d = callPackage ../development/python-modules/pynest2d { };
pynetbox = callPackage ../development/python-modules/pynetbox { };
pynetdicom = callPackage ../development/python-modules/pynetdicom { };
pynisher = callPackage ../development/python-modules/pynisher { };
@@ -6881,6 +6893,8 @@ in {
pyx = callPackage ../development/python-modules/pyx { };
pyxb = callPackage ../development/python-modules/pyxb { };
pyxbe = callPackage ../development/python-modules/pyxbe { };
pyxdg = callPackage ../development/python-modules/pyxdg { };
@@ -8265,6 +8279,8 @@ in {
trytond = callPackage ../development/python-modules/trytond { };
ttp = callPackage ../development/python-modules/ttp { };
tunigo = callPackage ../development/python-modules/tunigo { };
tubeup = callPackage ../development/python-modules/tubeup { };
@@ -8858,6 +8874,8 @@ in {
yanc = callPackage ../development/python-modules/yanc { };
yangson = callPackage ../development/python-modules/yangson { };
yapf = callPackage ../development/python-modules/yapf { };
yappi = callPackage ../development/python-modules/yappi { };