diff options
| author | Shea Levy <shea@shealevy.com> | 2014-01-19 12:39:17 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-01-19 12:39:17 -0500 |
| commit | 4b9da6697bc78fb2786f2be9a1c5507725c8a3f7 (patch) | |
| tree | fd4c723ffd4967dc131e38f3a361506d3a913907 /pkgs/top-level | |
| parent | d7bf8677a3e23a318d1649be16aa6d518980d2ed (diff) | |
| parent | 2a0f1cd6f155a58164ac47a8a3b8270e05e62070 (diff) | |
| download | nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.tar nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.tar.gz nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.tar.bz2 nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.tar.lz nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.tar.xz nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.tar.zst nixlib-4b9da6697bc78fb2786f2be9a1c5507725c8a3f7.zip | |
Merge branch 'master' of git://github.com/madjar/nixpkgs
rust: Add Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f739221bc16..5f13dde8cd86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3106,8 +3106,7 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - # TODO: the corresponding nix file is missing - # rust = pkgsi686Linux.callPackage ../development/compilers/rust {}; + rust = callPackage ../development/compilers/rust {}; sbcl = builderDefsPackage (import ../development/compilers/sbcl) { inherit makeWrapper; |