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

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
This commit is contained in:
Shea Levy
2013-02-21 11:13:30 -05:00
parent aacca1902c 9cff61881d
commit acd4299e75
71 changed files with 783 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/idris/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.6";
sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1";
version = "0.9.6.1";
sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62";
isLibrary = false;
isExecutable = true;
buildDepends = [