Commit Graph

2312 Commits

Author SHA1 Message Date
github-actions[bot]
1bce4703aa
Merge staging-next into staging 2021-06-28 18:12:05 +00:00
Jörg Thalheim
41902c2f7d
Merge pull request #120501 from Mic92/gnumake
gnumake: use sh instead of /bin/sh by default
2021-06-28 07:19:00 +01:00
R. RyanTM
ada25b1a98 bear: 3.0.12 -> 3.0.13 2021-06-27 14:52:45 +00:00
R. RyanTM
db961ec5bc bazel-remote: 2.1.0 -> 2.1.1 2021-06-24 05:12:00 +00:00
Sandro
3d544b4d5b
Merge pull request #127713 from musfay/qbs-1.19.1
qbs: 1.18.0 -> 1.19.1
2021-06-22 15:08:34 +02:00
Artturin
ac01728725 cmake: add wrapQtAppsHook 2021-06-22 06:06:27 +03:00
Mustafa Çalışkan
5beb11788a qbs: 1.18.0 -> 1.19.1 2021-06-21 21:58:25 +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
github-actions[bot]
4cbb35eba8
Merge staging-next into staging 2021-05-04 18:21:27 +00:00
scalavision
9b5a84f8ac
mill: 0.9.5 -> 0.9.6 (#121712) 2021-05-04 12:40:08 -04:00
John Ericson
17305d2df0
Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
2021-04-30 11:28:08 -04:00
Sandro
833cd36d44
Merge pull request #120723 from jlesquembre/maven
maven: 3.6.3 -> 3.8.1
2021-04-30 14:01:40 +02:00
Andrew Childs
7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
Tim Steinbach
e9350a7d9c
sbt-extras: 2021-04-06 → 2021-04-26 2021-04-28 14:39:10 +00:00
José Luis Lafuente
5bf7ee0a7b
maven: 3.6.3 -> 3.8.1 2021-04-27 15:19:20 +02:00
JesusMtnez
32f7980afb sbt: 1.5.0 -> 1.5.1 2021-04-26 10:16:00 -04:00
Jonathan Ringer
ad521d005b
buck: use jdk8 2021-04-24 11:25:35 -07:00
Jörg Thalheim
ed37276827
gnumake: use sh instead of /bin/sh by default 2021-04-24 11:00:55 +02:00
Sandro
7f9965695f
Merge pull request #119247 from jonringer/bump-buck
buck: 2019.10.17.01 -> 2021.01.12.01
2021-04-22 03:36:17 +02:00
Sandro
2df2e5f330
Merge pull request #118269 from midchildan/feat/fuse/add-darwin 2021-04-22 03:27:36 +02:00
SCOTT-HAMILTON
5bc2962319
remake: 4.1 -> 4.3 (#119737)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-21 03:18:35 +02:00
Alyssa Ross
53b88f966e bmake: add setupHook
With this change,

    nativeBuildInputs = [ bmake ];

will cause bmake to be used instead of GNU make, but with the usual
stdenv API.  Packages using bmake will no longer need to implement
their own {build,check,dist}Phase.
2021-04-16 12:56:48 +00:00
Lorenz Leutgeb
da62033a9a gradle: 7-rc-2 -> 7, bumping latest 6.8.3 -> 7 2021-04-13 19:31:01 +02:00
Jonathan Ringer
8da4120a90
buck: 2019.10.17.01 -> 2021.01.12.01 2021-04-12 11:15:06 -07:00
Sandro
2be7176ab3
Merge pull request #107977 from corngood/msbuild 2021-04-12 20:09:16 +02:00
Mario Rodas
ec2e4b2d74 bazel-buildtools: 3.5.0 -> 4.0.1 2021-04-11 04:20:00 +00:00
github-actions[bot]
c99b6f5343
Merge master into staging-next 2021-04-09 00:16:01 +00:00
Sandro
a5f6343808
Merge pull request #118702 from aanderse/conan
conan: 1.27.0 -> 1.35.0
2021-04-08 22:43:24 +02:00
github-actions[bot]
bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
Lorenz Leutgeb
2bc413b970
gradle: Add 7-rc-2, leave latest pointing at 6.8 (#117462) 2021-04-08 09:24:12 +02:00
github-actions[bot]
0ba1008684
Merge master into staging-next 2021-04-08 06:05:39 +00:00
Sandro
49cfaef0c3
Merge pull request #118596 from dlesl/update-rebar3
rebar3: 3.14.2 -> 3.14.4
2021-04-08 02:33:19 +02:00
github-actions[bot]
8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00
Tim Steinbach
5452be4bc6
sbt-extras: 2021-03-29 → 2021-04-06 2021-04-07 18:00:26 +00:00
Aaron Andersen
17c66529f6 conan: 1.27.0 -> 1.35.0 2021-04-06 22:40:32 -04:00
Jan Tojnar
c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
JesusMtnez
413e9561f8 sbt: 1.4.9 -> 1.5.0 2021-04-06 08:55:30 -04:00
David
63bfd8f88d rebar3: 3.14.2 -> 3.14.4 2021-04-05 15:23:10 +02:00
Sandro
7c932296e0
Merge pull request #116335 from SuperSandro2000/move-aliases.nix 2021-04-05 04:07:15 +02:00
github-actions[bot]
3e45982f7a
Merge master into staging-next 2021-04-04 12:06:01 +00:00
Robert Schütz
8b65ff2559
Merge pull request #115368 from dotlambda/angelfish-init
angelfish: init at 1.8.0
2021-04-04 12:35:03 +02:00
Sandro Jäckel
33a395f195
yacc: deprecate alias
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
github-actions[bot]
3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Frederik Rietdijk
d8ed6258b4 gup: use python3 2021-04-03 17:06:08 +02:00
midchildan
21f9e5aac2
tup: explain blocker for darwin build 2021-04-02 10:59:11 +09:00
Robert Schütz
27d9353047 corrosion: init at unstable-2021-02-23 2021-03-31 17:06:13 +02:00
github-actions[bot]
d466353dd5
Merge staging-next into staging 2021-03-30 12:06:28 +00:00
github-actions[bot]
c9e9ff786b
Merge master into staging-next 2021-03-30 12:06:24 +00:00
Tim Steinbach
6d6d8d66b8
sbt-extras: 2021-03-13 → 2021-03-29 2021-03-29 13:26:06 +00:00
Jan Tojnar
b3c854b60b
Merge branch 'staging-next' into staging 2021-03-26 07:53:44 +01:00
David McFarland
76d615532b msbuild: use roslyn from package 2021-03-25 16:11:58 -03:00
github-actions[bot]
7c9222212f
Merge master into staging-next 2021-03-25 18:14:01 +00:00