From f9978f55ffcca72e3b5fcf3bca708eac3f0fd4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 16 Aug 2022 10:26:29 +0100 Subject: [PATCH] switch to catstodon --- flake.lock | 19 ++++++++++--------- flake.nix | 2 +- mastodon/update.sh | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 6be79fb..07490aa 100644 --- a/flake.lock +++ b/flake.lock @@ -293,17 +293,18 @@ "mastodon": { "flake": false, "locked": { - "lastModified": 1660574115, - "narHash": "sha256-zkpHNTyguNg1VObQFehjUCmsEb4LQ+X1nxGm+/UH7JE=", - "owner": "glitch-soc", - "repo": "mastodon", - "rev": "aba0032f540407d88144ac637a59fce69625546f", - "type": "github" + "lastModified": 1660591183, + "narHash": "sha256-ST+JDz0efEmjdiSYUwDAdU2gIqvxwQCRBVZKrDM+uUk=", + "ref": "develop", + "rev": "1591adb62384f511436e94131c7553197ff5000d", + "revCount": 15730, + "type": "git", + "url": "https://git.kescher.at/kescher/catstodon" }, "original": { - "owner": "glitch-soc", - "repo": "mastodon", - "type": "github" + "ref": "develop", + "type": "git", + "url": "https://git.kescher.at/kescher/catstodon" } }, "matrix-media-repo": { diff --git a/flake.nix b/flake.nix index 6e5fdef..367b972 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ clean-s3-cache.flake = false; miifox-net.url = "git+https://git.chir.rs/CarolineHusky/MiiFox.net"; miifox-net.flake = false; - mastodon.url = "github:glitch-soc/mastodon"; + mastodon.url = "git+https://git.kescher.at/kescher/catstodon?ref=develop"; mastodon.flake = false; nixpkgs-go116.url = "github:NixOS/nixpkgs/dab5668f6be905a7f0de39a7d67fd8f78a13d600"; matrix-media-repo.url = "github:turt2live/matrix-media-repo"; diff --git a/mastodon/update.sh b/mastodon/update.sh index 71202d0..6893b16 100755 --- a/mastodon/update.sh +++ b/mastodon/update.sh @@ -2,7 +2,7 @@ #! nix-shell -i bash -p bundix yarn2nix yarn nix-prefetch-git jq set -e -URL=https://github.com/glitch-soc/mastodon.git +URL=$(jq -r '.nodes.mastodon.locked.url' ../flake.lock) REVISION=$(jq -r '.nodes.mastodon.locked.rev' ../flake.lock) rm -f gemset.nix yarn.nix