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

Merge master into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2014-01-18 14:46:20 +01:00
parent 2848336491 9c1d3bfa9f
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/dos2unix/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, perl, gettext }:
stdenv.mkDerivation {
name = "dos2unix-6.0.3";
name = "dos2unix-6.0.4";
src = fetchurl {
url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.3.tar.gz;
sha256 = "014sxyidqmjvc5xp5dmcimxd3apl8gyv6whc44vkb65151dqq9pm";
url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.4.tar.gz;
sha256 = "0ymkp55shilzcrn60w1ni92gck7pbqxhi9qsnsii7gkz996j5gb6";
};
configurePhase = ''