Merge branch 'master' into unused5

2018-07-21 15:41:22 +01:00
parent cd6e2c9642 e85db6863a
commit 218298b30f
203 changed files with 1655 additions and 627 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "bfs-${version}";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    repo = "bfs";
    owner = "tavianator";
    rev = version;
-    sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g";
+    sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
  };

  # Disable fstype test, tries to read /etc/mtab
@@ -2,8 +2,6 @@
 , fetchurl, lzip
 }:

-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
  name = "ddrescue-1.23";