diff --git a/modules/cloud/gotosocial/default.nix b/modules/cloud/gotosocial/default.nix index 4595d26..4b44ba4 100644 --- a/modules/cloud/gotosocial/default.nix +++ b/modules/cloud/gotosocial/default.nix @@ -14,7 +14,7 @@ in { options.cloud.gotosocial = { enable = mkEnableOption "Enable our local GtS server"; - package = mkPackageOption pkgs "gotosocial" { }; + package = mkPackageOption pkgs "gotosocial-dtth" { }; host = mkOption { type = types.str; description = "The GtS host"; diff --git a/overlay.nix b/overlay.nix index 132391a..7277402 100644 --- a/overlay.nix +++ b/overlay.nix @@ -35,38 +35,6 @@ let }; overlay-versioning = final: prev: { - gotosocial = - let - local = prev.gotosocial.overrideAttrs (attrs: rec { - version = "0.19.0"; - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - doCheck = false; - - web-assets = final.fetchurl { - url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v${version}/gotosocial_${version}_web-assets.tar.gz"; - hash = "sha256-Ba497VKK30MWcLlR4CDDUrFZKWf/UXiSgeDr/f7fFkc="; - }; - src = final.fetchFromGitHub { - owner = "superseriousbusiness"; - repo = "gotosocial"; - rev = "v${version}"; - hash = "sha256-ioIsa2L1w4z1b7tWFhHScmPwRRq0WLngIdm4r2eCveM="; - }; - postInstall = '' - tar xf ${web-assets} - mkdir -p $out/share/gotosocial - mv web $out/share/gotosocial/ - ''; - }); - in - if builtins.compareVersions prev.gotosocial.version local.version == -1 then - local - else - prev.gotosocial; input-remapper = final.unstable.input-remapper; diff --git a/packages/common/default.nix b/packages/common/default.nix index fadb679..4180a0b 100644 --- a/packages/common/default.nix +++ b/packages/common/default.nix @@ -3,4 +3,5 @@ final: prev: { ttaenc = final.callPackage ./ttaenc.nix { }; suwako-cursors = final.callPackage ./suwako-cursors { }; nki-kakoune = final.callPackage ./nki-kakoune { }; + gotosocial-dtth = final.callPackage ./gotosocial { }; } diff --git a/packages/common/gotosocial/default.nix b/packages/common/gotosocial/default.nix new file mode 100644 index 0000000..a399d68 --- /dev/null +++ b/packages/common/gotosocial/default.nix @@ -0,0 +1,27 @@ +{ + gotosocial, + fetchurl, + fetchgit, + ... +}: +gotosocial.overrideAttrs ( + finalAttrs: prevAttrs: { + pname = "gotosocial-dtth"; + version = "0.19.1"; + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; + doCheck = false; + web-assets = fetchurl { + url = "https://codeberg.org/superseriousbusiness/gotosocial/releases/download/v${finalAttrs.version}/gotosocial_${finalAttrs.version}_web-assets.tar.gz"; + hash = "sha256-UtxFm8ZSpIGXruBdanSF1lkA7Gs1FJNhoqzDTqSNYUM="; + }; + src = fetchgit { + url = "https://codeberg.org/superseriousbusiness/gotosocial.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RhJRdRxTdbZwIAGD3gH0mjDfCvdS7xkRxcUd1ArsNoo="; + }; + } +)