From 3f92b5f197d974de9cfdffca4b5e544ca4f23d8c Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 2 Dec 2023 09:48:56 +0100 Subject: [PATCH] use nixpkgs sliding sync package --- pkgs/matrix-sliding-sync/default.nix | 37 ---------------------------- sliding-sync/default.nix | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/matrix-sliding-sync/default.nix diff --git a/pkgs/matrix-sliding-sync/default.nix b/pkgs/matrix-sliding-sync/default.nix deleted file mode 100644 index db34544..0000000 --- a/pkgs/matrix-sliding-sync/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "matrix-sliding-sync"; - version = "0.99.11"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "sliding-sync"; - rev = "refs/tags/v${version}"; - hash = "sha256-Wd/nnJhKg+BDyOIz42zEScjzQRrpEq6YG9/9Tk24hgg="; - }; - - vendorHash = "sha256-0QSyYhOht1j1tWNxHQh+NUZA/W1xy7ANu+29H/gusOE="; - - subPackages = [ "cmd/syncv3" ]; - - ldflags = [ - "-s" - "-w" - "-X main.GitCommit=${src.rev}" - ]; - - # requires a running matrix-synapse - doCheck = false; - - meta = with lib; { - description = "A sliding sync implementation of MSC3575 for matrix"; - homepage = "https://github.com/matrix-org/sliding-sync"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ emilylange ]; - mainProgram = "syncv3"; - }; -} diff --git a/sliding-sync/default.nix b/sliding-sync/default.nix index a2953d5..a138747 100644 --- a/sliding-sync/default.nix +++ b/sliding-sync/default.nix @@ -11,7 +11,7 @@ in package = lib.mkOption { type = lib.types.package; - default = pkgs.callPackage ../pkgs/matrix-sliding-sync { }; + default = pkgs.matrix-sliding-sync; description = "What package to use for the sliding-sync proxy."; };