Commit Graph

403 Commits

Author SHA1 Message Date
Vladimír Čunát
13add13388
Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
2020-06-10 20:00:44 +02:00
Maximilian Bosch
879202bf37
Merge pull request #89905 from r-ryantm/auto-update/cargo-watch
cargo-watch: 7.4.0 -> 7.4.1
2020-06-10 14:43:17 +02:00
Jan Tojnar
acb53e0698
Merge branch 'staging-next' into staging 2020-06-10 04:10:57 +02:00
R. RyanTM
264f85658e cargo-watch: 7.4.0 -> 7.4.1 2020-06-09 10:03:55 +00:00
Jörg Thalheim
d903f1166b
Merge pull request #89649 from oxalica/rust-analyzer 2020-06-08 17:38:10 +01:00
Frederik Rietdijk
8576d24b2a Merge staging-next into staging 2020-06-08 12:08:51 +02:00
Maximilian Bosch
0558bb9f64
cargo-make: 0.30.8 -> 0.31.0
https://github.com/sagiegurari/cargo-make/releases/tag/0.31.0
2020-06-07 17:09:35 +02:00
Frederik Rietdijk
d0532e79ae Merge staging-next into staging 2020-06-07 09:25:46 +02:00
Mario Rodas
c9ac490e86
Merge pull request #89698 from r-ryantm/auto-update/cargo-deny
cargo-deny: 0.6.7 -> 0.6.8
2020-06-06 18:04:51 -05:00
R. RyanTM
d2be94c36e cargo-deny: 0.6.7 -> 0.6.8 2020-06-06 21:01:31 +00:00
Mario Rodas
02dd680c3f
Merge pull request #89591 from r-ryantm/auto-update/cargo-watch
cargo-watch: 7.3.0 -> 7.4.0
2020-06-06 08:36:14 -05:00
oxalica
a3acf1572a
rust-analyzer: 2020-04-20 -> 2020-06-01 2020-06-06 21:18:58 +08:00
R. RyanTM
efdab4bc6c cargo-watch: 7.3.0 -> 7.4.0 2020-06-06 04:03:24 +00:00
R. RyanTM
93dd2e4f6e cargo-udeps: 0.1.11 -> 0.1.12 2020-06-06 03:56:15 +00:00
Vladimír Čunát
677e3960b5
Merge #82342: rustPlatform: increase build-speed of checkPhase
...for rust-packages (into staging)
2020-06-05 09:12:30 +02:00
Maximilian Bosch
45e53a7658
cargo-make: 0.30.7 -> 0.30.8
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.8
2020-05-27 15:03:28 +02:00
Maximilian Bosch
6b23cfe689
rustPlatform: add buildAndTestSubdir-argument
There are several tarballs (such as the `rust-lang/rust`-source) with a
`Cargo.toml` at root and several sub-packages (with their own Cargo.toml)
without using workspaces[1].

In such a case it's needed to move into a subdir to only build the
specified sub-package (e.g. `rustfmt` or `rsl`), however the artifacts
are at `/target` in the root-dir of the build environment. This breaks
the build since `buildRustPackage` searches for executables in `target`
(which is at the build-env's root) at the end of the `buildPhase`.

With the optional `buildAndTestSubdir`-argument, the builder moves into
the specified subdir using `pushd`/`popd` during `buildPhase` and
`checkPhase`.

Also moved the logic to find executables and libs to the end of the `buildPhase`
from a custom `postBuild`-hook to fix packages with custom `build`/`install`-procedures
such as `uutils-coreutils`.

[1] https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html
2020-05-13 01:47:17 +02:00
Maximilian Bosch
ee032804f8
cargo-make: 0.30.6 -> 0.30.7
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.7
2020-05-08 00:00:24 +02:00
Maximilian Bosch
01539e6f9a
cargo-deny: 0.6.6 -> 0.6.7
https://github.com/EmbarkStudios/cargo-deny/releases/tag/0.6.7
2020-05-06 23:50:37 +02:00
Andreas Rammhold
c275bdbafc
Merge pull request #86731 from r-ryantm/auto-update/rust-cbindgen
rust-cbindgen: 0.13.2 -> 0.14.2
2020-05-04 14:56:13 +02:00
R. RyanTM
d3531ea03d rust-cbindgen: 0.13.2 -> 0.14.2 2020-05-04 06:27:22 +00:00
Mario Rodas
1064426106
Merge pull request #86526 from r-ryantm/auto-update/cargo-udeps
cargo-udeps: 0.1.10 -> 0.1.11
2020-05-03 17:56:03 -05:00
Maximilian Bosch
e678dadd07
cargo-xbuild: 0.5.28 -> 0.5.29
https://github.com/rust-osdev/cargo-xbuild/releases/tag/v0.5.29
2020-05-03 19:07:00 +02:00
R. RyanTM
45f542970d cargo-udeps: 0.1.10 -> 0.1.11 2020-05-02 04:14:06 +00:00
Maximilian Bosch
23b619559d
Merge pull request #86388 from matthiasbeyer/add-cargo-deny
cargo-deny: init at 0.6.6
2020-04-30 23:57:26 +02:00
Matthias Beyer
731eecbacb cargo-deny: init at 0.6.6
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-04-30 11:58:45 +02:00
Maximilian Bosch
ee58c7a363
Merge pull request #82982 from cole-h/rust-cleanup
improve robustness of various Rust packages
2020-04-30 02:07:57 +02:00
Maximilian Bosch
2a77540f7f
cargo-make: 0.30.5 -> 0.30.6
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.6
2020-04-24 15:18:00 +02:00
xrelkd
94579ce01b cargo-expand: 0.5.0 -> 0.6.0 2020-04-24 09:40:43 +08:00
Jörg Thalheim
11019ea58f
Merge pull request #85243 from oxalica/rust-analyzer 2020-04-23 16:36:54 +01:00
oxalica
a82fe46ae1
rust-analyzer: 2020-04-06 -> 2020-04-20 2020-04-23 17:11:04 +08:00
xrelkd
fd580728d9 cargo-expand: 0.4.19 -> 0.5.0 2020-04-21 09:23:53 +08:00
Maximilian Bosch
b7c3c3f5cc
cargo-make: 0.30.4 -> 0.30.5
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.5
2020-04-15 22:35:46 +02:00
Jörg Thalheim
418b24b133
Merge pull request #77752 from oxalica/rust-analyzer
rust-analyzer: init at unstable-2020-03-09
2020-04-14 10:19:59 +01:00
Cole Helbling
0cc340e132
rustracerd: improve robustness of installPhase 2020-04-12 14:06:08 -07:00
oxalica
8318c36a4b
vscode-extensions.rust-analyzer: use global NPM packages to share dependencies 2020-04-11 16:01:12 +08:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
oxalica
f76a4950c5
rust-analyzer: 2020-03-16 -> 2020-04-06 2020-04-11 00:52:40 +08:00
oxalica
fc8d2f426f
rust-analyzer: change to nix-prefetch and fix version checking in update script 2020-04-11 00:52:09 +08:00
Daniël de Kok
759ac32d9a maturin: 0.7.9 -> 0.8.0
Changelog:

https://github.com/PyO3/maturin/blob/v0.8.0/Changelog.md#080---2020-04-03
2020-04-10 09:55:26 +02:00
Maximilian Bosch
4e7eeb5aa9
Merge pull request #84813 from r-ryantm/auto-update/cargo-bloat
cargo-bloat: 0.9.2 -> 0.9.3
2020-04-09 16:47:08 +02:00
R. RyanTM
fcd34e7e39 cargo-bloat: 0.9.2 -> 0.9.3 2020-04-09 13:43:55 +00:00
oxalica
e33256ef24
Merge remote-tracking branch 'channels/nixos-unstable' into rust-analyzer 2020-04-08 14:22:56 +08:00
Maximilian Bosch
564af64783
cargo-make: 0.30.2 -> 0.30.4
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.3
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.4
2020-04-07 13:20:03 +02:00
Florian Klink
1eae7fb887 Revert "Revert "rust-cbindgen: 0.13.1 -> 0.13.2""
This reverts commit 09dde57e93.

Apparently, the rust-cbindgen bump wasn't the cause for the firefox
build error reported in https://github.com/NixOS/nixpkgs/pull/83247
(we could reproduce the build error even after
09dde57e93 applied).

For some reason it must have succeeded on hydra, as it's in the cache,
tricking us in believing 76458f89f4 broke
it initially.

So the build seems flaky of some sort - we haven't yet determined
whether it's luck, compiling with the right CPUs or something else. :-/

There's still some investigation to be done
(https://github.com/NixOS/nixpkgs/issues/84283), but no need to keep an
ineffective revert around.
2020-04-04 23:22:09 +02:00
Maximilian Bosch
268f71cfd7
cargo-make: 0.30.1 -> 0.30.2
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.2
2020-04-04 15:46:41 +02:00
Florian Klink
09dde57e93 Revert "rust-cbindgen: 0.13.1 -> 0.13.2"
This reverts commit 76458f89f4.

It was causing the firefox build to fail. See
https://github.com/NixOS/nixpkgs/pull/83247 for the discussion.
2020-04-04 02:23:33 +02:00
Benjamin Hipple
ea8845487e
Merge pull request #83247 from r-ryantm/auto-update/rust-cbindgen
rust-cbindgen: 0.13.1 -> 0.13.2
2020-04-02 14:44:24 -04:00
R. RyanTM
7b07a07e37 cargo-expand: 0.4.18 -> 0.4.19 2020-04-01 09:21:57 +00:00
Daniël de Kok
d4152d0205 cargo-asm: 0.1.17 -> 2019-12-24
cargo-asm hasn't seen any new releases since 2018 (and even then
it was spotty). But there have been improvements since then, so
switch to dated releases that use a working git commit.
2020-03-29 14:11:07 +02:00