public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env

Browse Source 
Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
This commit is contained in:
Robert Irelan 2015-07-07 08:29:08 -07:00
parent cf2f3f60ca
commit e6ee86b941
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/cargo/snapshot.nix
View File

@ -2,19 +2,19 @@
/* Cargo binary snapshot */ /* Cargo binary snapshot */
let snapshotDate = "2015-04-02"; let snapshotDate = "2015-06-17";
in in
with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; }); with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
let snapshotHash = if stdenv.system == "i686-linux" let snapshotHash = if stdenv.system == "i686-linux"
then "ba6c162680d5509d89ba2363d7cae2047f40c034" then "g2h9l35123r72hqdwayd9h79kspfb4y9"
else if stdenv.system == "x86_64-linux" else if stdenv.system == "x86_64-linux"
then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5" then "fnx2rf1j8zvrplcc7xzf89czn0hf3397"
else if stdenv.system == "i686-darwin" else if stdenv.system == "i686-darwin"
then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73" then "3viz3fi2jx18qjwrc90nfhm9cik59my6"
else if stdenv.system == "x86_64-darwin" else if stdenv.system == "x86_64-darwin"
then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8" then "h2bf3db4vwz5cjjkn98lxayivdc6dflp"
else throw "no snapshot for platform ${stdenv.system}"; else throw "no snapshot for platform ${stdenv.system}";
snapshotName = "cargo-nightly-${platform}.tar.gz"; snapshotName = "cargo-nightly-${platform}.tar.gz";
in in

6
pkgs/top-level/all-packages.nix
View File

@ -4661,7 +4661,7 @@ let
rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable);
# rust platform to build cargo itself (with cargoSnapshot) # rust platform to build cargo itself (with cargoSnapshot)
rustCargoPlatform = makeRustPlatform rustc cargoSnapshot rustCargoPlatform; rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform;
makeRustPlatform = rustc: cargo: self: makeRustPlatform = rustc: cargo: self:
let let
@ -5316,7 +5316,9 @@ let
rustPlatform = rustCargoPlatform; rustPlatform = rustCargoPlatform;
}; };
cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { }; cargoSnapshot = {
cargo = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
};
casperjs = callPackage ../development/tools/casperjs { }; casperjs = callPackage ../development/tools/casperjs { };