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

fix merge failure

This commit is contained in:
Robin Gloster 2016-06-11 10:07:46 +00:00
parent 8031cba2ab
commit 851446e26e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -935,8 +935,6 @@ in
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter; UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
}; };
bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
bibtextools = callPackage ../tools/typesetting/bibtex-tools { bibtextools = callPackage ../tools/typesetting/bibtex-tools {
inherit (strategoPackages016) strategoxt sdf; inherit (strategoPackages016) strategoxt sdf;
}; };

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

@ -7,15 +7,15 @@
{ runCommand, fetchFromGitHub, git }: { runCommand, fetchFromGitHub, git }:
let let
version = "2016-05-28"; version = "2016-06-10";
rev = "eb354be1bc4c368e4ed885bd126f625f371b4bfa"; rev = "18a44fdb7bd193c4cf62a0f3a9b807daf8620546";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "rust-lang"; owner = "rust-lang";
repo = "crates.io-index"; repo = "crates.io-index";
sha256 = "1scbfraj2cgpi5q1bkhhj18jv58hkyl9pms8qnx3fvxs6yq68ba9"; sha256 = "0jrawwdw1znw7z4hxivlssc3g90h05f3zmwm10ap4qhjpy4rrc1z";
}; };
in in