Merge branch 'master.upstream' into staging.upstream

2015-06-18 22:37:00 -07:00
parent 0967c0fcdb c64747c44a
commit fe4f8903b4
22 changed files with 69 additions and 73 deletions
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.26";
+  name = "dosfstools-${version}";
+  version = "3.0.28";

-  src = fetchurl {
-    url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
-    sha256 = "0x9yi6s1419k678pr9h3a5bjccbrcxxpzmjwgl262ffrikz45126";
+  src = fetchFromGitHub {
+    owner = "dosfstools";
+    repo = "dosfstools";
+    rev = "v${version}";
+    sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2";
  };

  makeFlags = "PREFIX=$(out)";