v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

ci

Browse source
This commit is contained in:
Vivian 2024-03-18 09:21:59 +01:00
parent 52483f2ea1
commit 121d11c0ab
8 changed files with 53 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

20
nixos/pkgs/glitch-soc/source.nix
View file

@ -1,33 +1,19 @@
# This file was generated by pkgs.mastodon.updateScript.
{ fetchFromGitHub, applyPatches, patches ? [] }:
let
<<<<<<< HEAD
version = "bc39b3196db8c79719c5a6c920c780284b8266a";
=======
version = "5bc39b3";
revision = "5bc39b3196db8c79719c5a6c920c780284b8266a";
>>>>>>> 8ec4a162da27435bf9deb68fa41bbfaf0c7d3f49
version = "d7d4770";
revision = "d7d477047eba7cb88df54dd78f42095ed0fbea76";
in
(
applyPatches {
src = fetchFromGitHub {
owner = "glitch-soc";
repo = "mastodon";
<<<<<<< HEAD
rev = "v${version}";
hash = "sha256-6ipYkF0PP3D15PD7vyN1cGqnxoBRrXEaRsrto7ZXej0=";
};
patches = patches ++ [];
}) // {
inherit version;
yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
=======
rev = "${revision}";
hash = "sha256-6ipYkF0PP3D15PD7vyN1cGqnxoBRrXEaRsrto7ZXej0=";
hash = "sha256-x1fqDtCOiNS61EhnpObUuxrdTd5n2mhjoGbIYGivbDg=";
};
patches = patches ++ [./yarn-typescript.patch];
}) // {
inherit version;
yarnHash = "sha256-CIIz5wwWzvDKc/VbSIT7Z5D9kwOLoErXoO0WQWfV/g4=";
>>>>>>> 8ec4a162da27435bf9deb68fa41bbfaf0c7d3f49
}