aboutsummaryrefslogtreecommitdiff
path: root/nix/libstore/build.cc
blob: 461fcbc58477836053dfd91c82b0e239a38ebc67 (about) (plain)
blob size (118KB) exceeds display size limit (100KB).
cc49d7b745b74ea5c7'>gnu: protobuf: Update to 3.17.3....* gnu/packages/protobuf.scm (protobuf): Update to 3.17.3. [phases]{disable-broken-tests}: New phase. {move-static-libraries}: Remove trailing #t. Maxim Cournoyer 2021-06-23Merge branch 'master' into core-updates...Conflicts: gnu/packages/cups.scm gnu/packages/python-web.scm gnu/packages/web.scm guix/build/maven/pom.scm Tobias Geerinckx-Rice 2021-06-23gnu: Fix references to emacs-build-system's expand-load-path phase....* gnu/packages/emacs-xyz.scm (emacs-pdf-tools)[#:phases]: Use emacs-expand-load-path instead of emacs-add-source-to-load-path. * gnu/packages/erlang.scm (emacs-erlang)[#:phases]: Use expand-load-path instead of add-source-to-load-path. * gnu/packages/protobuf.scm (emacs-protobuf-mode)[#:phases]: Use expand-load-path instead of add-source-to-load-path. Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at> Carlo Zancanaro 2021-06-06Merge branch 'master' into core-updates... Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm Marius Bakke 2021-05-23gnu: Fix erroneous uses of 'package/inherit'....These packages use a different source/version from the inherited package, and thus should not inherit replacements. * gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record inheritance instead of PACKAGE/INHERIT. * gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4, rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23, rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1, rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3, rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17, rust-webpki-roots-0.14): Likewise. * gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise. * gnu/packages/guile.scm (guile-2.2.4): Likewise. * gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise. * gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6): Likewise. * gnu/packages/python-web.scm (python2-html2text): Likewise. * gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy, python2-urwid, python2-markdown, python2-fonttools): Likewise. * gnu/packages/racket.scm (racket): Likewise. * gnu/packages/sequoia.scm (sequoia4pEp): Likewise. Marius Bakke 2021-03-06Merge branch 'master' into core-updatesChristopher Baines 2021-02-23gnu: ruby-protobuf: Add missing input....* gnu/packages/protobuf.scm (ruby-protobuf)[propagated-inputs]: Add ruby-thread-safe. Efraim Flashner