Commit Graph

259 Commits

Author SHA1 Message Date
zimbatm
0af2c5891b rust: store the cargo-vendor config
cargo-vendor generates almost the right cargo config. Store it with the
vendored files and patch it on use.

This allows to re-use the generated config when using git dependencies.
2018-01-09 03:37:53 +01:00
zimbatm
c5456dbfec cargo: 0.22.0 -> 0.23.0 2018-01-09 03:37:53 +01:00
zimbatm
8559dd0474 rustc: 1.21.0 -> 1.22.1
* removed --enable-clang as it has disappeared
* removed old fixes that have been integrated in upstream
2018-01-09 03:37:53 +01:00
Daiderd Jordan
5a02143c20
Merge pull request #33010 from LnL7/cacert-hook
cacert: add hook that sets SSL_CERT_FILE
2018-01-07 09:55:15 +01:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Daiderd Jordan
fdaab47d58 rust: fix sandbox build on darwin 2018-01-05 19:06:08 +01:00
Daiderd Jordan
091c2b9f04
cacert: cleanup exporting SSL_CERT_FILE 2017-12-27 21:36:32 +01:00
Tuomas Tynkkynen
491e5d8649 rustc: Support aarch64 2017-12-02 14:46:33 +02:00
Daiderd Jordan
36818207e9 Merge branch 'master' into staging 2017-11-17 22:45:34 +01:00
Daiderd Jordan
399a22e984
Merge pull request #31175 from yrashk/rust-1.21
rust: 1.20.0 -> 1.21.0
2017-11-17 22:31:49 +01:00
Daiderd Jordan
ccf7310e2d
Merge pull request #31125 from LnL7/darwin-rust-bootstrap
rust-bootstrap: cleanup darwin expression
2017-11-17 22:31:32 +01:00
Orivej Desh
1161741351 Merge branch 'master' into staging
* master: (28 commits)
  go_1_9: skip flaky TestWaitGroupMisuse2
  erlangR18: fix patch hashes with fetchpatch
  xml2: replace dead links
  nixos/pam: fix docs about path to u2f_keys file
  cinelerra: add a note about parallel building
  msmtp: install docs and examples (#31769)
  kernel: Fix out-of-tree modules on aarch64
  nixos/tests/acme: update terms of service to fix test
  gixy: init at 0.1.8
  pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
  mono: init at 4.8
  wal-g: fix license so not to break evaluation
  wal-g: init at 0.1.2
  maintainers: add backuitist
  nixos/prometheus: Correct documentation for external_labels
  spidermonkey: replace broken links
  vagrant: removed custom rake gem
  vagrant: 2.0.0 -> 2.0.1
  nixos/prometheus: add external_labels option
  nixos/prometheus: add scrape_configs.honor_labels
  ...
2017-11-17 18:06:22 +00:00
Joerg Thalheim
79aee3b57d rustcSrc: remove unrelated files
This package is used to provide semantic completion in tools like racer
and is equivalent to rust-src in rustup. This commit gets rid of a
number of files not required for completion.
2017-11-15 21:51:29 +00:00
Daiderd Jordan
8a43659e15 rustc: fix sandbox build on darwin 2017-11-14 21:51:40 -05:00
John Ericson
4d4f94cde4 treewide: Depend on targetPackages.stdenv.cc.bintools instead of binutils directly
One should do this when needed executables at run time. It is more
honest and cross-friendly than refering to binutils directly, if one
neeeds the default binary tools for the target platform, rather than
binutils in particular.
2017-11-05 17:10:53 -05:00
Daiderd Jordan
cf9e6f3a18
cargo: fix darwin build 2017-11-05 11:33:42 +01:00
Yurii Rashkovskii
2805444f96 rust: 1.20.0 -> 1.21.0 2017-11-03 13:29:20 +07:00
Daiderd Jordan
c72b22c420
rust-bootstrap: cleanup darwin expressions 2017-11-01 15:51:40 +01:00
Vladimír Čunát
fe83d91157
rustc: disable a test failing on Hydra repeatedly
The problem doesn't happen for me locally, but on Hydra
we tend to experience more flakiness in networking tests.
2017-10-31 22:05:40 +01:00
Robin Gloster
bed5bb1f5e
fix eval
cc @zimbatm

(https://nix-cache.s3.amazonaws.com/log/iyn9cwk0kymi4mzva0dzpqwnzm3cg4a4-nixpkgs-tarball-18.03pre118395.891c3721ed.drv)
2017-10-23 15:12:39 +02:00
Daiderd Jordan
f1f7296885
cargo: fix darwin build 2017-10-23 10:24:17 +02:00
zimbatm
6bbce42fe7 cargo: 0.21.1 -> 0.22.0 2017-10-23 00:30:47 +01:00
Kevin Cox
5f8cf0048e rust: update cargo builder to fetch registry dynamically
The biggest benefit is that we no longer have to update the registry
package. This means that just about any cargo package can be built by
nix. No longer does `cargo update` need to be feared because it will
update to packages newer then what is available in nixpkgs.

Instead of fetching the cargo registry this bundles all the source code
into a "vendor/" folder.

This also uses the new --frozen and --locked flags which is nice.

Currently cargo-vendor only provides binaries for Linux and
macOS 64-bit. This can be solved by building it for the other
architectures and uploading it somewhere (like the NixOS cache).

This also has the downside that it requires a change to everyone's deps
hash. And if the old one is used because it was cached it will fail to
build as it will attempt to use the old version. For this reason the
attribute has been renamed to `cargoSha256`.

Authors:
* Kevin Cox <kevincox@kevincox.ca>
* Jörg Thalheim <Mic92@users.noreply.github.com>
* zimbatm <zimbatm@zimbatm.com>
2017-10-23 00:30:47 +01:00
zimbatm
d170c2cead cargo: use fetchFromGitHub 2017-10-23 00:30:46 +01:00
zimbatm
7bd191df6a rust: 1.17.0 -> 1.20.0
simplify the boostrap hashes a bit

build with bundled llvm:

the rust project has forked the llvm compiler to solve some
issues.
With pkgs.llvm the test suite fails.

See https://github.com/rust-lang/rust/pull/43026

And PR #30088
2017-10-23 00:30:46 +01:00
Maximilian Güntner
e30e201027 rust: unbreak building with bundled LLVM 2017-10-23 00:30:46 +01:00
zimbatm
1d6eaac764 rust: remove beta and nightly releases
nixpkgs is for stable software. If you want beta and nightly, use the
nixpkgs-mozilla overlay.
2017-10-23 00:30:46 +01:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Robin Gloster
40ed226507 treewide: mark a bunch of failing builds as broken
(cherry picked from commit 23fdbaa375)
[dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master]
2017-10-01 00:26:52 +03:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Frederik Rietdijk
6bbc3a0b24 Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD 2017-08-21 04:44:40 +02:00
Matthew Bauer
f2141a96e5 cargo: use https://crates.io for homepage 2017-08-17 15:04:39 -07:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Daiderd Jordan
147cd29fff
rustc: remove gdb dependency for darwin 2017-08-06 19:00:58 +02:00
Vladimír Čunát
ddf864f8aa
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
2017-06-30 18:16:58 +02:00
John Ericson
95c8277701 misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
Jörg Thalheim
a9ba1e101e rustNightlyBin: 2017-05-30 -> 2017-06-26 2017-06-26 15:18:55 +01:00
John Ericson
594d264205 cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
Graham Christensen
72ff321f9c
rustc: re-enable static_in_const
We saw this error when building main.rs:error: this needs a 'static lifetime or the static_in_const feature, see #35897
2017-06-16 07:09:40 -04:00
Graham Christensen
ba9c71b999
rustc.bootstrap: 1.17.0 -> 1.16.0
bootstrapping rust requires the prior version of rust according to #rust-internals

they theorize this could be causing the build problems on i686
2017-06-15 19:57:00 -04:00
Daiderd Jordan
3d601f6a8a
rustc: disable another gdb test 2017-06-11 15:11:46 +02:00
Daiderd Jordan
f6072d7b6e
rustc: disable lldb tests on darwin 2017-06-11 08:51:47 +02:00
Anders Papitto
1e0866e064 rust: 1.15.0 -> 1.17.0
Also updates beta, nightly, nightlyBin, and bootstrap compilers.
Also updates the registry.
Also consolidates logic between bootstrap and nightlyBin compilers.
Also contains some miscellaneous cleanups.
Also patches firefox to build with the newer cargo
2017-06-10 15:15:50 -07:00
Tuomas Tynkkynen
c90998d5cf Revert "rustc: don't build on i686"
This reverts commit 9f86136cef.

Rust is nowadays required for building Firefox, so the channel updates
are blocked on this.

(It also builds fine for me.)
2017-04-24 21:25:02 +03:00
Jörg Thalheim
af416aae81
cargo: remove unnecessary rm
Since cargo build became a rust package, postInstall hook was no longer
called. When the hook was reenabled in
cdd11368426380db545cad84c76e350e5e201adc, it revealed that scripts
leftover from the component based installer are no longer present.
2017-04-17 00:29:44 +02:00
Robin Gloster
9f86136cef
rustc: don't build on i686 2017-03-30 16:23:34 +02:00
Daiderd Jordan
01d8d1b062
rustc: use llvm_39 2017-03-28 22:10:05 +02:00
Jörg Thalheim
273e480379 rustNightlyBin: 2017-01-26 -> 2017-03-16 (#23988)
thanks!
2017-03-17 14:51:28 +01:00
Tuomas Tynkkynen
1508945755 treewide: Fix eval-release.nix for aarch64 2017-03-09 03:38:04 +02:00
Ricardo M. Correia
8d1bd281cc rustc: 1.15 -> 1.15.1 2017-02-17 16:44:01 +01:00
Tadas Barzdzius
c4bb0c7bb4 rustc, cargo: 1.14.0 -> 1.15.0, 0.15.0 -> 0.16.0 2017-02-03 15:53:09 +02:00
Yacine Hmito
61e4313bf1 rustNightlyBin: 2016-12-29 -> 2017-01-26 (#22228)
thanks!
2017-01-28 18:27:41 +01:00
Moritz Ulrich
a42044c6b5
rustc: Disable another failing tcp test on Darwin.
Fixes #21936
2017-01-17 10:59:57 +01:00
Daiderd Jordan
e1d0c9ae20
rustc: disable parallel building because of https://github.com/rust-lang/rust/issues/30181
https://github.com/NixOS/nixpkgs/pull/21742
2017-01-14 17:38:46 +01:00
Daiderd Jordan
e91840cfb6 rustc: enable codegen units and parallel building (#21742) 2017-01-12 14:25:20 +01:00
Reno Reckling
8e2a4e0948 cargo: do not make install in cargo (#21799)
cargo is already a cargo package, so why not build it with cargo
and safe us the special cases
2017-01-11 12:33:53 +01:00
Reno Reckling
2b17620d59 update rustBeta and rustNightly (#21800)
looks good
2017-01-11 11:50:42 +01:00
Moritz Ulrich
7435fefd26
rustc: Disable fragile tcp tests on Darwin
This is an alternative implementation of
https://github.com/NixOS/nixpkgs/pull/21741/files
2017-01-08 16:55:36 +01:00
Jay Mundrawala
3dc8b5d904 rustUnstableBin.rustc: Run patchelf on bin/rustdoc (#21746)
Cargo seems to run rustdoc and produces an annoying error when
it tries to run.
2017-01-08 10:53:44 +01:00
Jörg Thalheim
d05656a9ca rustNightlyBin: fix build hash 2017-01-03 18:21:19 +00:00
Jörg Thalheim
fd152db8f7 rustNightlyBin: 2016-12-05 -> 2016-12-29 (#21618)
- add cargo (hence the renaming)
- also allow to built nix packages
2017-01-03 16:50:56 +01:00
Tadas Barzdzius
31ec0795f6 cargo: 0.14 -> 0.15 2016-12-29 09:56:19 +02:00
Tadas Barzdzius
7fa4b0f2c9 rustc: 1.13.0 -> 1.14.0 2016-12-29 09:55:38 +02:00
Joachim Schiele
1f811a6727 rustcNightlyBin.rustc: revision bump 2016-11-26 to 2016-12-05 with fix to contain components as libcore 2016-12-12 18:59:10 +01:00
joachim schiele
8806344618
rust: Updates & rename rustUnstable to rustNighly. 2016-11-29 17:09:01 +01:00
joachim schiele
f67061c1de (rustc-nightly) init at 2016-11-26 - precompiled rustc nightly binary 2016-11-29 09:10:39 +01:00
Moritz Ulrich
bfc187f23a
rustc: Loosen bootstrapping restrictions.
Newer nightlies check a new environment variable that if set will loosen
restrictions on which compiler version can be used for bootstrapping.

Upstream issue is at https://github.com/rust-lang/rust/pull/37265
2016-11-28 11:21:12 +01:00
Moritz Ulrich
e36d243258
rustc: Don't fail if deleting of breaking tests fails. 2016-11-28 11:16:13 +01:00
Moritz Ulrich
aa4ad9b98a
rustc: Fix hanging build by disabling test. 2016-11-20 15:38:37 +01:00
Tadas Barzdzius
0f51eb58ee rustc, cargo: 1.12.1 -> 1.13.0, 0.13.0 -> 0.14.0 2016-11-16 13:25:19 +02:00
Tim Steinbach
96cc219524
rust: 1.12.0 -> 1.12.1 2016-10-22 13:49:23 -04:00
Tim Steinbach
b116f9b0cd
rust: 1.11.0 -> 1.12.0, cargo: 0.12.0 -> 0.13.0 2016-10-10 21:59:26 -04:00
Anthony Cowley
3989b8da43 rustc: fix build on darwin
The OS is identified as "10.4" rather than "osx". This commit removes
the 'rt' build script's hard coding of the "osx" suffix when building on
darwin since the cmake configuration falls back to building a 10.4
compatible libclang_rt.
2016-10-03 09:20:56 -04:00
Luca Bruno
24f36cce50 Merge pull request #18102 from sjmackenzie/cargo-hash-fix
Cargo has incorrect hash
2016-08-31 11:04:59 +00:00
Moritz Ulrich
70f55f9930 rust{Beta,Unstable}: Remove outdated comment. 2016-08-30 12:05:45 +02:00
Stewart Mackenzie
33d6e5acd5 Cargo has incorrect hash 2016-08-30 05:53:03 +08:00
Moritz Ulrich
8cd3e1e2ba rustc: 1.10.0 -> 1.11.0 and beta/unstable updates.
Give cargo the right name.

Fix versioning.

rustBeta: -> 2016-08-17

Looks like rustUnstable.rustc needs *exactly* this version.
2016-08-27 08:24:16 +02:00
Moritz Ulrich
02608c6a3c rustc: Disable failing linker-output-utf8 test. 2016-08-10 21:25:53 +02:00
Moritz Ulrich
3324123eb7 rustc-bootstrap: Use optionalString. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
86326cbf54 rustc: Re-enable doCheck on Darwin. 2016-08-10 21:16:48 +02:00
Daiderd Jordan
2b806e9b71 rustc: Set TMPDIR on Darwin to fix build. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
3dc73927fe rustHead.cargo: cargo -> 2016-07-25. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
c8f878436e rustBeta.cargo: cargo -> 2016-07-25. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
57a690fbe4 cargo: Force usage of pkgs.cacert. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
6fd0591674 rustc: Disable doCheck on Darwin. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
d5569064c3 rustcUnstable: Add note about when to drop the patch. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
899d026426 rustUnstable.rustc: Fix tests by disabling lowering thread-count. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
12fe154953 rust-bootstrap: Don't run patchelf on darwin. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
0f25add68d rustUnstable.rustc: master-1.11.0 -> master-1.12.0
Note that tests are failing for this commit.
2016-08-10 21:16:37 +02:00
Moritz Ulrich
755be0e1ce rustBeta.cargo: Fix build. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
4115e94c87 rustBeta.rustc: beta-1.10.10 -> 1.11.0, rustBeta.cargo: 0.10.0 -> 0.12.0. 2016-08-10 21:16:37 +02:00
John Ericson
bed2a14afa makeRustPlatform: Remove self argument 2016-07-15 10:13:21 +02:00
Moritz Ulrich
8c45378cde rustc: 1.9.0 -> 1.10.0, cargo: 0.10.0 -> 0.11.0 2016-07-13 20:08:05 +02:00
David Craven
54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
John Ericson
8f763d0539 rustc: rename rust to rustc, but keep rust attr name for backwards compat 2014-08-01 04:39:37 +02:00
John Ericson
641ccec337 rust: Refer to 0.11.nix directly in all-packages
rather than use default.nix indirection
2014-08-01 04:28:54 +02:00
John Ericson
584114b697 rust: Add an alternative package for the master tip
based off of pull request #3084
2014-07-31 20:42:20 +02:00
John Ericson
a510e024b6 rust: Add hashes for i686-darwin 2014-07-31 00:12:16 +02:00
John Ericson
399f8b48f9 rust: Prepare for more versions part 2:
- Default is now an alias for 0.11
2014-07-30 07:39:06 +02:00
John Ericson
210452979a rust: Prepare for more versions part 1:
- Factor out some things that REALLY shouldn't change between versions
2014-07-30 07:39:06 +02:00
Paul Colomiets
febf46bf5c rust: Update to 0.11 2014-07-03 00:52:33 +03:00
Charles Strahan
6d5db3e93b rust: update to 0.10 release 2014-05-12 13:37:38 -04:00
Georges Dubus
f8afc745bf rust: fixed i686 build 2014-01-22 19:29:20 +01:00
Georges Dubus
49dd0867a7 rust: Fixed build 2014-01-22 16:36:05 +01:00
Georges Dubus
6eed023894 rust: patched the source to hardcode gcc path
to avoid using a wrapper.
2014-01-22 13:33:04 +01:00
Georges Dubus
35aa131371 rust: fixed build for i686 and maybe darwin 2014-01-22 13:33:04 +01:00
Shea Levy
0e74c9f4dc Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-19 13:38:37 -05:00
Shea Levy
cb24530135 Fix whitespace
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-19 12:40:31 -05:00
Georges Dubus
2a0f1cd6f1 rust: Add 2014-01-19 17:30:36 +01:00