summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-28 20:52:49 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-02-28 20:52:49 +0200
commit34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852 (patch)
treed3e3546a41a812d151d1980cb8ee6808a8b8c7c6 /pkgs/tools/filesystems
parentad17db3562766979371f0ae9cc0d2428f44a9d58 (diff)
parentf1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff)
downloadnixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.gz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.bz2
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.lz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.xz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.zst
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.zip
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/securefs/default.nix4
-rw-r--r--pkgs/tools/filesystems/zerofree/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index 233034792e15..6fc7ba6499ea 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "securefs-${version}";
-  version = "0.3.2";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
-    sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh";
+    sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2";
     rev = version;
     repo = "securefs";
     owner = "netheril96";
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix
index 593715b2068d..3283d6789f73 100644
--- a/pkgs/tools/filesystems/zerofree/default.nix
+++ b/pkgs/tools/filesystems/zerofree/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zerofree-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "http://frippery.org/uml/${name}.tgz";
-    sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf";
+    sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
   };
 
   buildInputs = [ e2fsprogs ];