From 48d760c650f813dc4419a8d717bc98bd15db2670 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 12 May 2016 09:23:13 +0100 Subject: [PATCH] dosfstools: temporarily revert upgrade that breaks tests See #15394 Revert "dosfstools: Enable compat symlinks" This reverts commit 346482c8d586de299ff8f457d69653917a4d62e2. Revert "dosfstools: 3.0.28 -> 4.0" This reverts commit 135fe56183a2c125a777ce59aa5e78f51f3dfec2. --- pkgs/tools/filesystems/dosfstools/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index c2691491ba3e..76df4f41257b 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "dosfstools-${version}"; - version = "4.0"; + version = "3.0.28"; - src = fetchurl { - sha256 = "1bvxbv1w6vhbx0nx7ygp700wq5k2hjv0hm7w0kz1x7amaf4p6dwh"; - url = "https://github.com/dosfstools/dosfstools/releases/download/v${version}/${name}.tar.xz"; + src = fetchFromGitHub { + owner = "dosfstools"; + repo = "dosfstools"; + rev = "v${version}"; + sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2"; }; - configureFlags = [ "--enable-compat-symlinks" ]; + makeFlags = "PREFIX=$(out)"; - meta = with stdenv.lib; { + meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; + repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = http://www.daniel-baumann.ch/software/dosfstools/; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; + platforms = stdenv.lib.platforms.linux; }; }