Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: b1b4092ad5d12ee17e934c35fdd84119fce060ad
https://github.com/NixOS/nixpkgs/commit/b1b4092ad5d12ee17e934c35fdd84119fce060ad
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M pkgs/development/compilers/rustc/head.nix
M pkgs/development/compilers/rustc/patches/head.patch
Log Message:
-----------
rustcMaster: Update from 2015-04-13 -> 2015-04-15
Commit: c55c7e1c1e09dfa57e1a44d08c777f995493d2c9
https://github.com/NixOS/nixpkgs/commit/c55c7e1c1e09dfa57e1a44d08c777f995493d2c9
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M pkgs/build-support/fetchgit/builder.sh
M pkgs/build-support/fetchgit/default.nix
M pkgs/build-support/fetchgit/nix-prefetch-git
Log Message:
-----------
fetchgit: Add support for specifying branch name
This is useful when `leaveDotGit = true` and some other derivation
expects some branch name to exist.
Previously, `nix-prefetch-git` always created a branch with a
hard-coded name (`fetchgit`).
Commit: 7d67efa3f23f7d5c494c90b79a63756a3917be6e
https://github.com/NixOS/nixpkgs/commit/7d67efa3f23f7d5c494c90b79a63756a3917be6e
Author: Georges Dubus <[email protected]>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M pkgs/build-support/fetchgit/nix-prefetch-git
A pkgs/build-support/rust/default.nix
A pkgs/build-support/rust/fetch-builder.sh
A pkgs/build-support/rust/fetch-cargo-deps
A pkgs/build-support/rust/fetchcargo.nix
M pkgs/development/tools/build-managers/cargo/common.nix
A pkgs/development/tools/build-managers/cargo/default.nix
A pkgs/development/tools/build-managers/cargo/setup-hook.sh
M pkgs/development/tools/build-managers/cargo/snapshot.nix
M pkgs/development/tools/rust/racer/default.nix
M pkgs/top-level/all-packages.nix
A pkgs/top-level/rust-packages.nix
Log Message:
-----------
Add support for building cargo'ed Rust programs
Commit: 5e8a4477390332e4315397a21a919d63af94595a
https://github.com/NixOS/nixpkgs/commit/5e8a4477390332e4315397a21a919d63af94595a
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M pkgs/development/tools/build-managers/cargo/default.nix
Log Message:
-----------
cargo: Build optimized binary
Commit: d648be67246e771126defb34989ecb9f88292c64
https://github.com/NixOS/nixpkgs/commit/d648be67246e771126defb34989ecb9f88292c64
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M pkgs/build-support/rust/default.nix
M pkgs/development/tools/build-managers/cargo/default.nix
M pkgs/development/tools/rust/racer/default.nix
Log Message:
-----------
buildRustPackage: Add check phase and enable it by default
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
Commit: e42c17ee9709c8fddbaee7d79c0d13f330443582
https://github.com/NixOS/nixpkgs/commit/e42c17ee9709c8fddbaee7d79c0d13f330443582
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M pkgs/build-support/rust/default.nix
M pkgs/build-support/rust/fetch-cargo-deps
M pkgs/build-support/rust/fetchcargo.nix
M pkgs/development/tools/build-managers/cargo/default.nix
Log Message:
-----------
buildRustPackage: Fix Cargo.lock being ignored
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.
Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.
To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.
Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.
To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
Commit: 0cde1dc52425f12be6f7311737abe98813e43c29
https://github.com/NixOS/nixpkgs/commit/0cde1dc52425f12be6f7311737abe98813e43c29
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M pkgs/build-support/rust/default.nix
M pkgs/development/tools/build-managers/cargo/common.nix
M pkgs/development/tools/build-managers/cargo/default.nix
R pkgs/development/tools/build-managers/cargo/setup-hook.sh
M pkgs/development/tools/build-managers/cargo/snapshot.nix
Log Message:
-----------
cargo: Remove setupHook
Instead, move that code into buildRustPackage.
The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
Commit: b993c2113c8191ca9b454abfc79d02196b6a2bd0
https://github.com/NixOS/nixpkgs/commit/b993c2113c8191ca9b454abfc79d02196b6a2bd0
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M pkgs/build-support/rust/default.nix
A pkgs/build-support/rust/patch-registry-deps/pkg-config
Log Message:
-----------
buildRustPackage: Add a mechanism to patch registry deps
... in a more generic way.
With this commit, if you need to patch a registry package to make it
work with Nix, you just need to add a script to patch-registry-deps
in the same style as the `pkg-config` script.
Commit: d6093505cc59c7cf5540afd044dea9ab8d5c1e9b
https://github.com/NixOS/nixpkgs/commit/d6093505cc59c7cf5540afd044dea9ab8d5c1e9b
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M pkgs/build-support/rust/default.nix
M pkgs/build-support/rust/fetch-cargo-deps
M pkgs/development/tools/build-managers/cargo/default.nix
M pkgs/development/tools/rust/racer/default.nix
Log Message:
-----------
buildRustPackage: Get rid of /proc/self/cwd hack
This makes buildRustPackage portable to non-Linux platforms.
Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
Commit: 916b20ae3695682d6af8b1bfdc8c24936815f248
https://github.com/NixOS/nixpkgs/commit/916b20ae3695682d6af8b1bfdc8c24936815f248
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-24 (Fri, 24 Apr 2015)
Changed paths:
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
rustRegistry: Fix "Target OID..." cargo failure.
For some reason, `cargo` doesn't like git repositories downloaded with
`fetchgit`. It will sometimes fail with the error message "Target OID for
the reference doesn't exist on the repository".
To workaround this, we'll just have to create a new git repo from
scratch...
Commit: a5c0a06ee59f6a51594c9138a5f467f69b465b9c
https://github.com/NixOS/nixpkgs/commit/a5c0a06ee59f6a51594c9138a5f467f69b465b9c
Author: Ricardo M. Correia <[email protected]>
Date: 2015-04-24 (Fri, 24 Apr 2015)
Changed paths:
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
rustRegistry: Update
Commit: 4c77830a93a5cc3b909f8675d4d35a2f5f232839
https://github.com/NixOS/nixpkgs/commit/4c77830a93a5cc3b909f8675d4d35a2f5f232839
Author: Ricardo M. Correia <[email protected]>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M pkgs/development/compilers/rustc/head.nix
Log Message:
-----------
rustcMaster: Update from 2015-04-15 -> 2015-05-09
Commit: 548e8db2499f38fe1b06a78fad7c1ddb53e0029d
https://github.com/NixOS/nixpkgs/commit/548e8db2499f38fe1b06a78fad7c1ddb53e0029d
Author: Ricardo M. Correia <[email protected]>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M pkgs/top-level/rust-packages.nix
Log Message:
-----------
rustRegistry: 2015-04-23 -> 2015-05-12
Commit: cbdedca255e50dfce0e2e345181e718bbd90b46d
https://github.com/NixOS/nixpkgs/commit/cbdedca255e50dfce0e2e345181e718bbd90b46d
Author: Ricardo M. Correia <[email protected]>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M pkgs/development/tools/build-managers/cargo/default.nix
Log Message:
-----------
cargo: 2015-04-14 -> 2015-05-11
Commit: e40a43cd1f4ea69f9ec95fbcbbb89621db31ccae
https://github.com/NixOS/nixpkgs/commit/e40a43cd1f4ea69f9ec95fbcbbb89621db31ccae
Author: Ricardo M. Correia <[email protected]>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M pkgs/development/tools/rust/racer/default.nix
A pkgs/development/tools/rust/racer/pr-232.patch
Log Message:
-----------
rustRacer: 2015-04-12 -> 2015-05-04
Commit: 755df64ee36c3d59a2451dda626415618657f513
https://github.com/NixOS/nixpkgs/commit/755df64ee36c3d59a2451dda626415618657f513
Author: Ricardo M. Correia <[email protected]>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M pkgs/build-support/fetchgit/builder.sh
M pkgs/build-support/fetchgit/default.nix
M pkgs/build-support/fetchgit/nix-prefetch-git
A pkgs/build-support/rust/default.nix
A pkgs/build-support/rust/fetch-builder.sh
A pkgs/build-support/rust/fetch-cargo-deps
A pkgs/build-support/rust/fetchcargo.nix
A pkgs/build-support/rust/patch-registry-deps/pkg-config
M pkgs/development/compilers/rustc/head.nix
M pkgs/development/compilers/rustc/patches/head.patch
M pkgs/development/tools/build-managers/cargo/common.nix
A pkgs/development/tools/build-managers/cargo/default.nix
M pkgs/development/tools/build-managers/cargo/snapshot.nix
M pkgs/development/tools/rust/racer/default.nix
A pkgs/development/tools/rust/racer/pr-232.patch
M pkgs/top-level/all-packages.nix
A pkgs/top-level/rust-packages.nix
Log Message:
-----------
Merge pull request #7501 from wizeman/u/upd-rust
Add support for Rust / Cargo packaging
Compare: https://github.com/NixOS/nixpkgs/compare/88fbc8a0dacc...755df64ee36c_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits