about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2023-07-25 11:35:30 +0900
committersefidel <contact@sefidel.net>2023-07-25 11:35:30 +0900
commit53f05aef7592fc304e736e323015e1be59aa0072 (patch)
tree8b8527647c59f2599e19e52851e2ee1df5019030
parentc8ea18e110dce3bd6dcc6c7336e70e7e71330b0a (diff)
downloadinfra-53f05aef7592fc304e736e323015e1be59aa0072.tar.gz
infra-53f05aef7592fc304e736e323015e1be59aa0072.zip
feat(overlays/sliding-sync): use nixpkgs package for sliding-sync
-rw-r--r--overlays/default.nix1
-rw-r--r--overlays/sliding-sync-module.nix2
-rw-r--r--overlays/sliding-sync.nix22
3 files changed, 1 insertions, 24 deletions
diff --git a/overlays/default.nix b/overlays/default.nix
index 3c5f857..b1a2bf2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,3 +1,2 @@
 self: super: {
-  sliding-sync = super.callPackage ./sliding-sync.nix { };
 }
diff --git a/overlays/sliding-sync-module.nix b/overlays/sliding-sync-module.nix
index 692818b..c9e3f59 100644
--- a/overlays/sliding-sync-module.nix
+++ b/overlays/sliding-sync-module.nix
@@ -70,7 +70,7 @@ in
         Type = "simple";
         DynamicUser = true;
         ExecStart =
-          "${pkgs.sliding-sync}/bin/syncv3";
+          "${pkgs.matrix-sliding-sync}/bin/syncv3";
         Restart = "on-failure";
       };
       environment = {
diff --git a/overlays/sliding-sync.nix b/overlays/sliding-sync.nix
deleted file mode 100644
index 50c058d..0000000
--- a/overlays/sliding-sync.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-# TODO: needs:
-# - tests
-# - `meta` attribute
-
-buildGoModule rec {
-  pname = "sliding-sync";
-  version = "0.99.1";
-  src = fetchFromGitHub {
-    owner = "matrix-org";
-    repo = "sliding-sync";
-    rev = "v${version}";
-    sha256 = "sha256-g1yMGb8taToEFG6N057yPcdZB855r0f6EwnJ98FIiic=";
-  };
-
-  vendorHash = "sha256-FmibAVjKeJUrMSlhoE7onLoa4EVjQvjDI4oU4PB5LBE=";
-
-  subPackages = [
-    "cmd/syncv3"
-  ];
-}