Commit graph

2255 commits

Author SHA1 Message Date
Artturin ac01728725 cmake: add wrapQtAppsHook 2021-06-22 06:06:27 +03:00
R. RyanTM 818201e4b5 bazel-remote: 2.0.1 -> 2.1.0 2021-06-17 17:21:34 +02:00
Sandro df4ffccc5c
Merge pull request #126863 from alyssais/bear
bear: 3.0.9 -> 3.0.12
2021-06-16 03:33:22 +02:00
Sandro f7521e2abd
Merge pull request #126059 from timbertson/gup
gup: 0.7.0 -> 0.8.0
2021-06-15 16:50:11 +02:00
JesusMtnez 43d1855378
sbt: 1.5.3 -> 1.5.4 2021-06-15 06:12:50 +02:00
Alyssa Ross 5d08999385
bear: 3.0.9 -> 3.0.12
Fixes: https://github.com/NixOS/nixpkgs/pull/117413
2021-06-14 18:12:02 +00:00
Tim Cuthbertson 9012ed2a80
reuse version variable
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-11 21:49:20 +10:00
Alyssa Ross 4de8cbfb16 bmake.passthru.setupHook: set some defaults
These are all read from the environment by the default bmake
stdlib (e.g. <bsd.prog.mk>, <bsd.own.mk>).  Some of the default
values (like building cat pages instead of man pages, or stripping
binaries when installing) don't really make sense for Nixpkgs, so we
override them here for every build using bmake.

Eventually I'd like to unify the bmake setupHook and the NetBSD make
setupHook, but not today.
2021-06-09 12:44:43 +00:00
Sandro 26923b2f5c
Merge pull request #125337 from wentasah/cmake-more-docs 2021-06-09 14:32:22 +02:00
David 00ee61b3cc rebar3: add checkPhase 2021-06-09 12:14:12 +09:00
David ae2f75ef89 rebar3WithPlugins: add ability to ignore dependencies 2021-06-09 12:14:12 +09:00
Timothy Klim 8582f4cd83 sbt: 1.5.1 -> 1.5.3 2021-06-08 14:13:31 -04:00
Tim Cuthbertson e3cf1c63ef gup: 0.7.0 -> 0.8.0 2021-06-07 22:03:08 +10:00
Michal Sojka 498b5e578a cmake: Add man and info outputs
By default, the cmake derivation contains the documentation in .rst
format. This format is not well suited for interactive use. Therefore,
we add both man and info outputs and convert the documentation to
these formats using Sphinx.

These formats are enabled by default only in cmake versions for
interactive use (ncurses, Qt), because using Sphinx in the basic
version leads to circular dependency (infinite recursion). Namely,
Sphinx has imagemagick in its checkInputs and imagemagick has several
transitive dependencies, which have cmake in nativeBuildInputs.
2021-06-06 21:49:41 +02:00
Sandro 3bb27749ab
Merge pull request #123895 from dmivankov/bazel_4.1.0 2021-06-01 17:59:08 +02:00
Jörg Thalheim 4542b54abd
Merge pull request #125071 from sternenseemann/bmake
bmake: 20200902 -> 20210420
2021-06-01 08:11:16 +02:00
sternenseemann 10f8f08267 bmake: 20200902 -> 20210420
* Fix varmod-localtime test by setting TZ to an absolute path to the
  appropriate file in TZDIR. This avoids having an extra patch for musl
  which doesn't support TZDIR at all.
* Move tests into checkPhase by applying patch from alpine
* Fix build with musl by disabling deptgt-delete_on_error test (which I
  haven't debugged myself, just copied this from alpine) and fixing a
  test which fails due to differing output from strerror(3) between musl
  and glibc. Also we need to add a shebang to install-sh, otherwise it
  won't be executed in pkgsMusl.
2021-05-31 13:39:35 +02:00
Michael Weiss 3f3f5a0d5d
scons: Remove myself as maintainer
I'm not using it anymore but it would be great if we could find a new
maintainer as SCons is a build tool on which a few other packages
depend.
2021-05-30 15:22:55 +02:00
Andrew Childs 976ee287c8 bmake: fix build on darwin 2021-05-29 01:12:23 +02:00
David d706be982a rebar3: 3.16.0 -> 3.16.1 2021-05-24 15:33:02 -05:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Vladimír Čunát 7f651d15e2
Merge #122696: cmakeWithQt4Gui: drop 2021-05-22 16:10:27 +02:00
Dmitry Ivankov a15204fcc0 bazel_4: 4.0.0 -> 4.1.0
https://github.com/bazelbuild/bazel/releases/tag/4.1.0

other minor changes:
- grep for /bin/ rather than /bin for blanket substitute
- invoke {pre,post}{Build,Install} hooks
2021-05-22 09:51:22 +02:00
github-actions[bot] 901fb5e64e
Merge master into staging-next 2021-05-22 00:56:03 +00:00
David 454255ee58 rebar3: 3.15.1 -> 3.16.0 2021-05-22 06:19:50 +09:00
github-actions[bot] 929b12e7b5
Merge master into staging-next 2021-05-21 12:28:43 +00:00
David ac9b645021 rebar3: apply erlang/rebar3#2552 as patch 2021-05-21 17:24:45 +09:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Sandro a5a8ef13d3
Merge pull request #123157 from ehmry/tup
tup: 0.7.10 -> 0.7.11
2021-05-18 03:10:09 +02:00
Uri Baghin a975c80f91 bazel-remote: 1.0.0 -> 2.0.1 2021-05-17 23:21:53 +02:00
David aef59d8856 buildRebar3: use rebar3 bare compile 2021-05-18 05:40:58 +09:00
Sandro ca604582a1
Merge pull request #122960 from yogsototh/lein-2.9.6
leiningen: 2.9.5 -> 2.9.6
2021-05-17 19:03:30 +02:00
Jonathan Ringer c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
David 34ea3cd906 rebar3: add updateScript 2021-05-17 16:08:07 +09:00
Emery Hemingway 588e045629 tup: 0.7.10 -> 0.7.11 2021-05-15 22:24:01 +02:00
Yann Esposito (Yogsototh) 11104d664f
leiningen: 2.9.5 -> 2.9.6 2021-05-14 10:11:41 +02:00
Jan Tojnar 0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00
github-actions[bot] a8e5ac148b
Merge master into staging-next 2021-05-13 00:56:26 +00:00
Alexander Krimm 362bc6785a Fix conan build caused by failing pyjwt
Ignore a failing thest in the downgraded pyjwt dependency.
See #122461 for another instance of the same problem.
2021-05-12 23:01:52 +02:00
Alyssa Ross 02f013b8a4
cmakeWithQt4Gui: drop
Support for Qt 4 was removed in CMake 3.19.0:
https://cmake.org/cmake/help/latest/release/3.19.html#deprecated-and-removed-features
2021-05-12 11:31:12 +00:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
github-actions[bot] 49b8e6f7d4
Merge master into staging-next 2021-05-11 00:48:15 +00:00
David dcc075ce21 buildRebar3: use rebar3WithPlugins 2021-05-11 08:59:57 +09:00
David aaa16732ce rebar3: add rebar3WithPlugins 2021-05-11 08:59:57 +09:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
David b1f796eabe rebar3: 3.14.4 -> 3.15.1 2021-05-09 13:10:06 +09:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
github-actions[bot] 202eb5ddf5
Merge staging-next into staging 2021-05-05 18:24:02 +00:00
Bjørn Forsman 9ba09d80e1
conan: unbreak by downgrading pyjwt (#121802)
Pin pyjwt to 1.7.1 (the last of the 1.x series) to fix building conan:

  ERROR: Could not find a version that satisfies the requirement PyJWT<2.0.0,>=1.4.0 (from conan)

Ref. upstream issue https://github.com/conan-io/conan/issues/8876.
2021-05-05 15:52:56 +02:00