diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-05-27 00:02:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-27 00:02:24 +0000 |
| commit | 8f73f12f12e4998dc65488a7f3a3dc344943a3b1 (patch) | |
| tree | eac299cff327fa6993d81343bb7609cc93a6a9c1 /pkgs/tools/filesystems | |
| parent | 73ddcacb58198bd090822836ccb1ee968bfaf22c (diff) | |
| parent | dc7b61633814c589530b0b8812ca73f9be6ffe29 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/s3fs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/supertag/default.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 58ef6442d8d04..acdde0335bcd6 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.91"; + version = "1.92"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-41IgUgpVZiIzi3N5kgX7PAhgnd+i/FH1o8t5y3Uw14g="; + sha256 = "sha256-CS6lxDIBwhcnEG6XehbyAI4vb72PmwQ7p+gC1bbJEzM="; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/tools/filesystems/supertag/default.nix index 4e7cb8beae579..cee8ae3ead44f 100644 --- a/pkgs/tools/filesystems/supertag/default.nix +++ b/pkgs/tools/filesystems/supertag/default.nix @@ -1,5 +1,5 @@ { lib, rustPlatform, fetchFromGitHub -, clang, llvmPackages, pkg-config +, pkg-config , dbus, fuse, sqlite }: @@ -20,9 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - - nativeBuildInputs = [ clang pkg-config ]; + nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; buildInputs = [ dbus fuse sqlite ]; # The test are requiring extended permissions. |