diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
| commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
| tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/tools/text | |
| parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
| parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
| download | nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip | |
Merge master into stdenv-updates
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
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/dos2unix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index a0033771b67d..a7d5bed6642a 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -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 = '' |