Commit Graph

2229 Commits

Author SHA1 Message Date
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
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
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