about summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-07-21 15:41:22 +0100
committerGitHub <noreply@github.com>2018-07-21 15:41:22 +0100
commit218298b30fe79be30716438a1906d1abd61b9377 (patch)
tree65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/tools/system
parentcd6e2c9642b8e608c905f350cece21141435deef (diff)
parente85db6863a546cfdde0150f03ed0d2db28992575 (diff)
downloadnixlib-218298b30fe79be30716438a1906d1abd61b9377.tar
nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.gz
nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2
nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.lz
nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.xz
nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.zst
nixlib-218298b30fe79be30716438a1906d1abd61b9377.zip
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/bfs/default.nix4
-rw-r--r--pkgs/tools/system/ddrescue/default.nix2
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 3f618301a864..fd7f93d1546c 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -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
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 2f507de9c22f..6c852efe96e5 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -2,8 +2,6 @@
 , fetchurl, lzip
 }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "ddrescue-1.23";