diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-03 18:01:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-03 18:01:12 +0000 |
commit | 904ed45698338365f086c22ab5af167adf8bee9a (patch) | |
tree | c2e2038f011203ccb13897674bc611d7603757c6 /pkgs/development | |
parent | 503c981111ad40ad81ee2ebf7368554062d665cd (diff) | |
parent | 4f08634a1878229b5b9c17d2a0225a34fcc504a1 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
10 files changed, 36 insertions, 303 deletions
diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index d1c950c4aeb30..a89c6dabe3912 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -244,7 +244,12 @@ let inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; + else ( + # libcxx >= 13 does not build on gcc9 + if stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10" + then pkgs.gcc10Stdenv + else stdenv + ); }; libcxxabi = let diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 90eaa4331f9f5..f446251fd328c 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -28,18 +28,8 @@ let # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch "0.40" = ./disable-graphviz-0.40.12.patch; - # NOTE: the openembedded-core project doesn't have a patch for 0.44.1 - # We've reverted the addition of the "--disable-valadoc" option - # and then applied the following patch. - # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch - "0.44" = ./disable-graphviz-0.44.3.patch; - - "0.46" = ./disable-graphviz-0.46.1.patch; - "0.48" = ./disable-graphviz-0.46.1.patch; - "0.50" = ./disable-graphviz-0.46.1.patch; - "0.52" = ./disable-graphviz-0.46.1.patch; "0.54" = ./disable-graphviz-0.46.1.patch; @@ -113,24 +103,14 @@ in rec { sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7"; }; - vala_0_46 = generic { - version = "0.46.13"; - sha256 = "0d7l4vh2xra3q75kw3sy2d9bn5p6s3g3r7j37bdn6ir8l3wp2ivs"; - }; - vala_0_48 = generic { - version = "0.48.19"; - sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; - }; - - vala_0_50 = generic { - version = "0.50.10"; - sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; + version = "0.48.20"; + sha256 = "sha256-RrHIF/dIUfvMOV/E+eoRlQLPh7kzPMllbhzczAvTN24="; }; vala_0_52 = generic { - version = "0.52.7"; - sha256 = "sha256-C7WptPbRdUmewKWAJK3ANapRcAgPUzwo2cNY0aMsU2o="; + version = "0.52.8"; + sha256 = "sha256-d3t9HLVnFewyJUXQEw5/9Y2eem0b2WtuKX6eYOgRh5M="; }; vala_0_54 = generic { diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch b/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch deleted file mode 100644 index fc971c26492b1..0000000000000 --- a/pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index f70234759..b3d6c3833 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,19 +13,9 @@ SUBDIRS = \ - doc \ - gobject-introspection \ - vapigen \ -- $(NULL) -- --if ENABLE_VALADOC --SUBDIRS += \ - libvaladoc \ - valadoc \ - $(NULL) --endif -- --DISTCHECK_CONFIGURE_FLAGS = \ -- --enable-valadoc \ -- --enable-unversioned \ -- $(NULL) - - if ENABLE_UNVERSIONED - aclocaldir = $(datadir)/aclocal -diff --git a/configure.ac b/configure.ac -index 504db13aa..622397747 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -157,10 +157,11 @@ AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - - AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check) --AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) --if test x$enable_valadoc = xyes; then -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then - PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) - AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" - cgraph_tmp_LIBADD="$LIBADD" - cgraph_tmp_CFLAGS="$CFLAGS" - LIBADD="$LIBADD $LIBGVC_LIBS" -@@ -198,8 +199,8 @@ if test x$enable_valadoc = xyes; then - LIBADD="$cgraph_tmp_LIBADD" - CFLAGS="$cgraph_tmp_CFLAGS" - fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") --AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) - AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index d2684a0e0..b343c7c10 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -6,16 +6,11 @@ SUBDIRS = \ - - dist_man_MANS = \ - valac.1 \ -+ valadoc.1 \ - vala-gen-introspect.1 \ - vapigen.1 \ - $(NULL) - --if ENABLE_VALADOC --dist_man_MANS += \ -- valadoc.1 \ -- $(NULL) --endif -- - EXTRA_DIST = \ - valac.h2m \ - valadoc.h2m \ -@@ -24,11 +19,7 @@ EXTRA_DIST = \ - $(NULL) - - if HAVE_HELP2MAN --if ENABLE_VALADOC - manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 --else --manpages: valac.1 vala-gen-introspect.1 vapigen.1 --endif - @rm $^ - $(MAKE) $(AM_MAKEFLAGS) $^ - -@@ -37,13 +28,11 @@ valac.1: - --include $(srcdir)/valac.h2m \ - --libtool --no-info \ - --output=$@ --if ENABLE_VALADOC - valadoc.1: - $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ - --include $(srcdir)/valadoc.h2m \ - --libtool --no-info \ - --output=$@ --endif - vala-gen-introspect.1: - $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ - --include $(srcdir)/vala-gen-introspect.h2m \ -@@ -60,15 +49,12 @@ endif - if ENABLE_UNVERSIONED - install-data-hook: - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 --if ENABLE_VALADOC - cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1 --endif - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 - cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 - endif - - --if ENABLE_VALADOC - COMMON_VALADOCFLAGS = \ - --force \ - --verbose \ -@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen - @touch $@ - - internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc --endif - - clean-local: - rm -rf $(builddir)/internal-apis -diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am -index 7456fb836..107338e91 100644 ---- a/libvaladoc/Makefile.am -+++ b/libvaladoc/Makefile.am -@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala -index 46578c28f..f6ce7097c 100644 ---- a/libvaladoc/html/basicdoclet.vala -+++ b/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala -index 5aa4afdea..e79b0b8f5 100644 ---- a/libvaladoc/html/htmlmarkupwriter.vala -+++ b/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public unowned MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public unowned MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index 506a626e7c869..187e2cf908e21 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation { patchShebangs utils/ ''; + strictDeps = true; + buildInputs = [ # IPA and signing gnutls - openssl boost # gstreamer integration @@ -46,6 +47,8 @@ stdenv.mkDerivation { # lttng tracing lttng-ust + + gtest ]; nativeBuildInputs = [ @@ -57,9 +60,9 @@ stdenv.mkDerivation { python3Packages.pyyaml python3Packages.ply python3Packages.sphinx - gtest graphviz doxygen + openssl ]; mesonFlags = [ "-Dv4l2=true" "-Dqcam=disabled" ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index c60122ff18021..f1152da2d1d47 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.5.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d"; + sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index da3c36f6ce04f..3df049c1cec60 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "18.20.0"; + version = "20.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "v${version}"; - sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1"; + sha256 = "sha256-zZb5jEQEluY1dfa7UegW+P7MV86ESqOey7kkC74ETlM="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 425d79219c8d0..835641001034b 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -10,14 +10,14 @@ in buildGoModule rec { pname = "faas-cli"; # When updating version change rev. - version = "0.13.15"; - rev = "b562392b12a78a11bcff9c6fca5a47146ea2ba0a"; + version = "0.14.1"; + rev = "d94600d2d2be52a66e0a15c219634f3bcac27318"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "15kjxn0p8nz8147vsm9q5q6wr2w5ssybvn247kynj2n7139iva2f"; + sha256 = "132m9kv7a4vv65n8y3sq1drks6n1pci9fhvq0s637imf2vxccxqr"; }; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 7c7549e3844c2..8a36c52e7ae31 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.10.0"; + version = "13.0.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "13s8v9s2f284fnh47xdyc75gq2i9pndl39q8v4wl7v7lwri2hv8r"; + sha256 = "4da976f3d114e4ba6ba06cbe660ce1393230f4519c4df15b90bc1840f00e4195"; }; passthru = { diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 040109da3adbd..d508b9f73d0af 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY="; + sha256 = "sha256-082rFxC/p68X8g58I7Q7Of70ymq7VsLhkQpcqVx0u/A="; }; - cargoSha256 = "sha256-/0pxEQFhovPRI4Knv5xq6+PHRuGN6+tF8CdK5X30LKI="; + cargoSha256 = "sha256-1yTH5FvalzBD13FXh/X1jmZhVyWU3thrjNSsrHUfBNE="; nativeBuildInputs = [ pkg-config ]; @@ -24,6 +24,12 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@localhost.localnet ''; + # Exclude some tests that don't work in sandbox: + # - favorites_default_to_git_if_not_defined: requires network access to github.com + # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant. + checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ] + ++ lib.optionals stdenv.isDarwin [ "--skip git::should_canonicalize" ]; + meta = with lib; { description = "cargo, make me a project"; homepage = "https://github.com/ashleygwilliams/cargo-generate"; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index a59a124317b94..d5652c82ec7ff 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-wipe"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mihai-dinculescu"; repo = "cargo-wipe"; rev = "v${version}"; - sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ="; + sha256 = "sha256-AlmXq2jbU8mQ23Q64a8QiKXwiWkIfr98vAoq7FLImhA="; }; - cargoSha256 = "sha256-EoXgsWg1Rh7C+fIqvefkLdck4Yj3kox2ZAU3kn6nH8Q="; + cargoSha256 = "sha256-vsN4cM4Q9LX1ZgAA5x7PupOTh0IcjI65xzuCPjy8YOs="; passthru = { updateScript = nix-update-script { |