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

Merge remote-tracking branch 'upstream/master' into x-updates

Browse Source 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
This commit is contained in:
Michael Raskin
2013-06-10 10:04:46 +04:00
parent 7db886fdb9 604652f1da
commit 8271de6727
36 changed files with 496 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/html-tidy/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let date = "2009-07-04"; in
stdenv.mkDerivation rec {
name = "html-tidy-${date}";
name = "html-tidy-20090704";
# According to http://tidy.sourceforge.net/, there are no new
# release tarballs, so one has to either get the code from CVS or