Merge branch master into staging

2015-04-06 18:58:08 -07:00
parent 04e39bdb5c 812d8f9fa6
commit 6ec373d776
430 changed files with 8926 additions and 4887 deletions
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:

-stdenv.mkDerivation {
-  name = "dos2unix-7.0";
+stdenv.mkDerivation rec {
+  name = "dos2unix-7.2.1";
  
  src = fetchurl {
-    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.0.tar.gz;
-    sha256 = "0az7nkgddnmimb88sj004klszbvkir02f4zlnij8drc6b80gw6jm";
+    url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
+    sha256 = "1ws5d66gjs3iqc92d0qxwivixl9092540kxqq2gr6jdzmflqm4jk";
  };

  configurePhase = ''