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

Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

Browse source
This commit is contained in:
Vivian 2024-02-14 15:29:57 +01:00
commit 52483f2ea1
7 changed files with 116 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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