diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-11 08:59:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-11 08:59:54 +0200 |
| commit | ae8eee9c3f97ba4973da524094a5f1fab592b70a (patch) | |
| tree | e950225203c30bf1144d9baeedb25c8cf23604a4 /pkgs/tools/filesystems | |
| parent | bb9f138f00f4b77218e50ecf905074c238c2b4f2 (diff) | |
| parent | c87c474b17af792e7984ef4f058291f7ce06f594 (diff) | |
| download | nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.tar nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.tar.gz nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.tar.bz2 nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.tar.lz nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.tar.xz nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.tar.zst nixpkgs-ae8eee9c3f97ba4973da524094a5f1fab592b70a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/gcsfuse/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 3f0e261b18d..89fa3ebe33b 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "11an7cxgg3x830mwlhyx50xkcv7zpa9aziz6gz1crwp8shr4hdik"; + sha256 = "1ai1dgf07g2c08rp87kygrl67hyj7x793093wmnwaxfpylx5flv0"; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; @@ -20,6 +20,8 @@ buildGoPackage rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; + buildFlagsArray = [ "-ldflags=-s -w -X main.gcsfuseVersion=${version}" ]; + meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 72b95641d00..e9afa5cf190 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1ilxkrqbpb5whv7xfwfvph76jwyjzf988njjpyyr99h6jv2r77q1"; + sha256 = "1dpx0a200s46s1dxp64hkn765vap0hzmyyvmq7wrmcs81mvlrd0l"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; |