vivlim
/
snoottube-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update staging to 4.1.0

This commit is contained in:
Vivian Lim 2023-03-06 11:54:42 -08:00
parent e7970ab5a8
commit 732df8a453
7 changed files with 283 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flake.nix
View File

@ -31,6 +31,7 @@
let let
# Get mastodon sources from the location described in source.nix. # Get mastodon sources from the location described in source.nix.
src = pkgs.callPackage ./mastodon/source.nix { }; src = pkgs.callPackage ./mastodon/source.nix { };
srcStaging = pkgs.callPackage ./mastodon-staging/source.nix { };
in { in {
mastodonFork = (nixpkgs-mastodon.legacyPackages.${prev.system}.pkgs.mastodon.override { mastodonFork = (nixpkgs-mastodon.legacyPackages.${prev.system}.pkgs.mastodon.override {
pname = "mastodonFork"; pname = "mastodonFork";
@ -48,12 +49,12 @@
}); });
mastodonStagingFork = (nixpkgs-mastodon.legacyPackages.${prev.system}.pkgs.mastodon.override { mastodonStagingFork = (nixpkgs-mastodon.legacyPackages.${prev.system}.pkgs.mastodon.override {
pname = "mastodonStagingFork"; pname = "mastodonStagingFork";
srcOverride = src; srcOverride = srcStaging;
dependenciesDir = ./mastodon-staging; dependenciesDir = ./mastodon-staging;
version = import ./mastodon-staging/version.nix; version = import ./mastodon-staging/version.nix;
}).overrideAttrs (oldAttrs: rec { }).overrideAttrs (oldAttrs: rec {
yarnOfflineCache = pkgs.fetchYarnDeps { yarnOfflineCache = pkgs.fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${srcStaging}/yarn.lock";
sha256 = import ./mastodon-staging/yarn-sha256.nix; sha256 = import ./mastodon-staging/yarn-sha256.nix;
}; };
mastodonModules = oldAttrs.mastodonModules.overrideAttrs (oldModuleAttrs: { mastodonModules = oldAttrs.mastodonModules.overrideAttrs (oldModuleAttrs: {

490
mastodon-staging/gemset.nix
View File

File diff suppressed because it is too large Load Diff

4
mastodon-staging/source.nix
View File

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let { fetchgit, applyPatches }: let
src = fetchgit { src = fetchgit {
url = "https://github.com/vivlim/glitch-soc-snoottube.git"; url = "https://github.com/vivlim/glitch-soc-snoottube.git";
rev = "bda7744161227781376c4b2d49ed3fa893da0484"; rev = "fddc4b593c39be7436cd641c75c491fb189a649c";
sha256 = "1102r38i7l1kfwq2g0q6apr1xk9pqx62k62i24gxwd0105v002ls"; sha256 = "0v6xg3cbr5a7190dzqxipls57s2c0p1s1zvrnbr2avdxjmcyfr96";
}; };
in applyPatches { in applyPatches {
inherit src; inherit src;

4
mastodon-staging/update.sh
View File

@ -7,11 +7,11 @@ IFS=$'\n\t'
# self-explanatory # self-explanatory
UPDATE_URL="https://github.com/vivlim/glitch-soc-snoottube.git" UPDATE_URL="https://github.com/vivlim/glitch-soc-snoottube.git"
BRANCH="snoot-prod" BRANCH="snoot-4.1"
# intermediate variables # intermediate variables
PREFETCHED_JSON="$(nix-prefetch-git "$UPDATE_URL" --branch-name "$BRANCH")" PREFETCHED_JSON="$(nix-prefetch-git "$UPDATE_URL" refs/heads/"$BRANCH")"
GIT_REV="$(echo "$PREFETCHED_JSON" | jq -r '.rev')" GIT_REV="$(echo "$PREFETCHED_JSON" | jq -r '.rev')"
REPO_PATH="$(echo "$PREFETCHED_JSON" | jq -r '.path')" REPO_PATH="$(echo "$PREFETCHED_JSON" | jq -r '.path')"
# i believe this is the most "correct" way to get the version string from the source # i believe this is the most "correct" way to get the version string from the source

2
mastodon-staging/version.nix
View File

@ -1 +1 @@
"4.0.2+glitch-snoot" "4.1.0+glitch-snoot"

2
mastodon-staging/yarn-sha256.nix
View File

@ -1 +1 @@
"0j4wqrqlgczhz6dfskyillr5cj60ap6vcn31a5n8c2l3gz99pm63" "1jb479wp5pcjnf3bzj7w4g9ma6w46kwp1frf7arqj2chq9mfli2x"

2
mastodon/update.sh
View File

@ -11,7 +11,7 @@ BRANCH="snoot-prod"
# intermediate variables # intermediate variables
PREFETCHED_JSON="$(nix-prefetch-git "$UPDATE_URL" --branch-name "$BRANCH")" PREFETCHED_JSON="$(nix-prefetch-git "$UPDATE_URL" refs/heads/"$BRANCH")"
GIT_REV="$(echo "$PREFETCHED_JSON" | jq -r '.rev')" GIT_REV="$(echo "$PREFETCHED_JSON" | jq -r '.rev')"
REPO_PATH="$(echo "$PREFETCHED_JSON" | jq -r '.path')" REPO_PATH="$(echo "$PREFETCHED_JSON" | jq -r '.path')"
# i believe this is the most "correct" way to get the version string from the source # i believe this is the most "correct" way to get the version string from the source