diff --git a/pkgs/tools/misc/dosfstools/3.00deb.nix b/pkgs/tools/misc/dosfstools/3.00deb.nix deleted file mode 100644 index 59c386da2b2..00000000000 --- a/pkgs/tools/misc/dosfstools/3.00deb.nix +++ /dev/null @@ -1,34 +0,0 @@ -args : with args; with builderDefs; - let patch = - fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.0-1.diff.gz; - sha256 = "5ecab7e9cf213b0cc7406649ca59edb9ec6daad2fa454bce423ccb1744fc1336"; - }; - localDefs = builderDefs.passthru.function (rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.0.orig.tar.gz; - sha256 = "46125aafff40e8215e6aa30087c6c72a82654c8f5fca4878adc1fa26342eab58"; - }; - preBuild = FullDepEntry ('' - gunzip < ${patch} | patch -Np1 - '')["minInit" "doUnpack"]; - - buildInputs = []; - configureFlags = []; - makeFlags = " PREFIX=$out "; - }); - in with localDefs; -stdenv.mkDerivation rec { - name = "dosfstools-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - [preBuild "doMakeInstall" doForceShare doPropagate]); - meta = { - description = " - Dosfstools - utilities for vfat file system. -"; - homepage = "http://sixpak.org/dosfstools/dosfstools-2.8vb2.tar.gz"; - inherit src; - }; -} diff --git a/pkgs/tools/misc/dosfstools/default.nix b/pkgs/tools/misc/dosfstools/default.nix new file mode 100644 index 00000000000..43691c22714 --- /dev/null +++ b/pkgs/tools/misc/dosfstools/default.nix @@ -0,0 +1,24 @@ +args : with args; with builderDefs; + let localDefs = builderDefs.passthru.function (rec { + src = /* put a fetchurl here */ + fetchurl { + url = http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.1.tar.bz2; + sha256 = "7fab0de42391277028071d01ff4da83ff9a399408ccf29958cdee62ffe746d45"; + }; + + buildInputs = []; + configureFlags = []; + makeFlags = " PREFIX=$out "; + }); + in with localDefs; +stdenv.mkDerivation rec { + name = "dosfstools-3.01"; + builder = writeScript (name + "-builder") + (textClosure localDefs + ["doMakeInstall" doForceShare doPropagate]); + meta = { + description = "Dosfstools - utilities for vfat file system."; + homepage = "http://www.daniel-baumann.ch/software/dosfstools/"; + inherit src; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94cf9c68413..2c84227a0e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -683,7 +683,7 @@ let gnused groff libxml2 libxslt makeWrapper; }; - dosfstools = composedArgsAndFun (selectVersion ../tools/misc/dosfstools "3.00deb") { + dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) { inherit builderDefs; };