Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 97d02a78f049
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2d59a6215ca6
Choose a head ref
  • 7 commits
  • 55 files changed
  • 3 contributors

Commits on Oct 22, 2017

  1. rust: remove beta and nightly releases 

    nixpkgs is for stable software. If you want beta and nightly, use the
nixpkgs-mozilla overlay.
    @zimbatm
    zimbatm committed Oct 22, 2017
    Copy the full SHA
    1d6eaac View commit details
    Browse the repository at this point in the history

  2. rust: unbreak building with bundled LLVM

    @mguentner @zimbatm
    mguentner authored and zimbatm committed Oct 22, 2017
    Copy the full SHA
    e30e201 View commit details
    Browse the repository at this point in the history

  3. 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 rust-lang/rust#43026

And PR #30088
    @zimbatm
    zimbatm committed Oct 22, 2017
    Copy the full SHA
    7bd191d View commit details
    Browse the repository at this point in the history

  4. cargo: use fetchFromGitHub

    @zimbatm
    zimbatm committed Oct 22, 2017
    Copy the full SHA
    d170c2c View commit details
    Browse the repository at this point in the history

  5. 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>
    @kevincox @zimbatm
    kevincox authored and zimbatm committed Oct 22, 2017
    Copy the full SHA
    5f8cf00 View commit details
    Browse the repository at this point in the history

  6. cargo: 0.21.1 -> 0.22.0

    @zimbatm
    zimbatm committed Oct 22, 2017
    Copy the full SHA
    6bbce42 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #30088 from zimbatm/rust-1.20.0 

    Rust 1.20.0
    @zimbatm
    zimbatm committed Oct 22, 2017
    1
    Copy the full SHA
    2d59a62 View commit details
    Browse the repository at this point in the history