about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-06-08T14·11+0300
committerclbot <clbot@tvl.fyi>2024-06-10T20·50+0000
commitf1aa5edb556b9d8b8b9c67b228725311955d6af3 (patch)
treef7f45b9d742f3bcf7cd5de24a8bf2df8d9851a03
parent075f7617c3776e94799115f3d0e2376936439e00 (diff)
chore(third_party/geesefs): move to expression in nixpkgs r/8244
This now exists in nixpkgs, and a more recent version of it.

Change-Id: I51fe038ba9459587952028f77e97b48212d13e74
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11762
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--third_party/geesefs/default.nix25
-rw-r--r--users/tazjin/chase-geese/default.nix2
-rw-r--r--users/tazjin/nixos/modules/geesefs.nix2
3 files changed, 2 insertions, 27 deletions
diff --git a/third_party/geesefs/default.nix b/third_party/geesefs/default.nix
deleted file mode 100644
index 98448bb737c6..000000000000
--- a/third_party/geesefs/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# Finally, a good FUSE FS implementation over S3.
-# https://github.com/yandex-cloud/geesefs
-
-{ pkgs, ... }:
-
-pkgs.buildGoModule rec {
-  pname = "geesefs";
-  version = "0.40.1";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "yandex-cloud";
-    repo = "geesefs";
-    rev = "v${version}";
-    hash = "sha256:0ig8h17z8n5j8qb7k2jyh40vv77zazhnz8bxdam9xihxksj8mizp";
-  };
-
-  subPackages = [ "." ];
-  buildInputs = [ pkgs.fuse ];
-  vendorHash = "sha256:11i7cmnlxi00d0csgpv8drfcw0aqshwc4hfs0jw7zwafdhnlyy0j";
-
-  meta = with pkgs.lib; {
-    license = licenses.asl20;
-    maintainers = [ maintainers.tazjin ];
-  };
-}
diff --git a/users/tazjin/chase-geese/default.nix b/users/tazjin/chase-geese/default.nix
index 3549f758687d..595ca92896a5 100644
--- a/users/tazjin/chase-geese/default.nix
+++ b/users/tazjin/chase-geese/default.nix
@@ -9,5 +9,5 @@ pkgs.writeShellScriptBin "chase-geese" ''
 
   echo "Mounting the cloud ..."
   mkdir -p ~/cloud
-  ${depot.third_party.geesefs}/bin/geesefs tazjins-files ~/cloud
+  ${pkgs.geesefs}/bin/geesefs tazjins-files ~/cloud
 ''
diff --git a/users/tazjin/nixos/modules/geesefs.nix b/users/tazjin/nixos/modules/geesefs.nix
index c45ee528f6a2..60ee821e2fe2 100644
--- a/users/tazjin/nixos/modules/geesefs.nix
+++ b/users/tazjin/nixos/modules/geesefs.nix
@@ -28,7 +28,7 @@
 
       mkdir -p $STATE_DIRECTORY/tazjins-files $STATE_DIRECTORY/cache
 
-      ${depot.third_party.geesefs}/bin/geesefs \
+      ${pkgs.geesefs}/bin/geesefs \
         -f -o allow_other \
         --cache $STATE_DIRECTORY/cache \
         --shared-config $CREDENTIALS_DIRECTORY/geesefs-tazjins-files \