diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-25 18:52:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 18:52:08 +0000 |
commit | a127deeb889b111138f5152e54681577706ab741 (patch) | |
tree | 229b3bde60ee64c4ee7b14ee1360c0755f22888d /pkgs/tools/filesystems | |
parent | 351b28d469b5c29b06b7f6cac4f6bd36513f2606 (diff) | |
parent | 9ce1caa63c9c806e705cd0d282a4aa920dce76fd (diff) | |
download | nixlib-a127deeb889b111138f5152e54681577706ab741.tar nixlib-a127deeb889b111138f5152e54681577706ab741.tar.gz nixlib-a127deeb889b111138f5152e54681577706ab741.tar.bz2 nixlib-a127deeb889b111138f5152e54681577706ab741.tar.lz nixlib-a127deeb889b111138f5152e54681577706ab741.tar.xz nixlib-a127deeb889b111138f5152e54681577706ab741.tar.zst nixlib-a127deeb889b111138f5152e54681577706ab741.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/android-file-transfer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/bindfs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/catcli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/convoy/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/gitfs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/gocryptfs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/sandboxfs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/tmsu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/ubidump/default.nix | 2 |
10 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 68199a0938eb..f0efaaa32316 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: +{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a8baeaf3ef55..cc6916869b6f 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,16 +1,14 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.14.8"; + version = "1.14.9"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"; + sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; }; - dontStrip = true; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postFixup = '' diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 8f4e9941029b..2f179a151d1e 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildPythonApplication , docopt, anytree diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 4c493ea22527..774568fdde17 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, lvm2 }: +{ lib, buildGoPackage, fetchFromGitHub, lvm2 }: buildGoPackage rec { pname = "convoy"; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 1d1863ede968..e4a120264fd8 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "gitfs"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 318e39e8322e..b8b330c129a0 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , openssl diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 3a63ad9747fe..80ae8ca2b3cd 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPythonApplication, blivet }: +{ lib, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { pname = "nixpart"; diff --git a/pkgs/tools/filesystems/sandboxfs/default.nix b/pkgs/tools/filesystems/sandboxfs/default.nix index 8777fa50a5d8..32d186344dd7 100644 --- a/pkgs/tools/filesystems/sandboxfs/default.nix +++ b/pkgs/tools/filesystems/sandboxfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , rustPlatform , fuse diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 7129de950136..1eac3e03ec92 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: buildGoPackage rec { pname = "tmsu"; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 2787b87964fd..6a6409ad3251 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, fetchFromGitHub, python3, makeWrapper }: python3.pkgs.buildPythonApplication rec { |