This commit is contained in:
Vivian 2023-05-04 13:08:10 +02:00
parent f534687f65
commit 882b2840d9
53 changed files with 1671 additions and 1559 deletions

View file

@ -1,4 +1,5 @@
{ stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec {
{ stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation rec {
pname = "dnd-5e-latex-template";
version = "0.8.0";
tlType = "run";
@ -13,16 +14,14 @@
phases = [ "installPhase" ];
installPhase = ''
runHook preInstall
runHook preInstall
path="$out/tex/latex/${pname}"
mkdir -p "$path"
cp -r $src/* $path
path="$out/tex/latex/${pname}"
mkdir -p "$path"
cp -r $src/* $path
runHook postInstall
runHook postInstall
'';
meta = {
description = "DnD 5e latex template";
};
meta = { description = "DnD 5e latex template"; };
}

View file

@ -1,9 +1,11 @@
{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation {
{ stdenvNoCC, fetchurl }:
stdenvNoCC.mkDerivation {
pname = "gitea-agatheme";
version = "1.2";
src = fetchurl {
url = "https://git.lain.faith/attachments/290e2304-92a3-4991-8703-fbbf52f31340";
url =
"https://git.lain.faith/attachments/290e2304-92a3-4991-8703-fbbf52f31340";
sha256 = "424f4e232c7d759485cdf1bcde9edde50f2992cf6bde61c21f71eae03a905543";
};

View file

@ -1,12 +1,10 @@
{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
, fetchYarnDeps, fixup_yarn_lock
{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests, yarn, callPackage
, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript, fetchYarnDeps
, fixup_yarn_lock
# Allow building a fork or custom version of Mastodon:
, pname ? "mastodon"
, version ? import ./version.nix
, srcOverride ? null
, dependenciesDir ? ./. # Should contain gemset.nix, yarn.nix and package.json.
# Allow building a fork or custom version of Mastodon:
, pname ? "mastodon", version ? import ./version.nix, srcOverride ? null
, dependenciesDir ? ./. # Should contain gemset.nix, yarn.nix and package.json.
}:
stdenv.mkDerivation rec {
@ -14,7 +12,8 @@ stdenv.mkDerivation rec {
# Using overrideAttrs on src does not build the gems and modules with the overridden src.
# Putting the callPackage up in the arguments list also does not work.
src = if srcOverride != null then srcOverride else callPackage ./source.nix {};
src =
if srcOverride != null then srcOverride else callPackage ./source.nix { };
mastodon-gems = bundlerEnv {
name = "${pname}-gems-${version}";
@ -42,11 +41,17 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
# sha256 = lib.fakeSha256;
sha256 = "sha256-5KmPgKE1QRPoTjeSYidKt/z9vzWzTOoJVr5dNtofKJY=";
# sha256 = lib.fakeSha256;
sha256 = "sha256-5KmPgKE1QRPoTjeSYidKt/z9vzWzTOoJVr5dNtofKJY=";
};
nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodon-gems mastodon-gems.wrappedRuby ];
nativeBuildInputs = [
fixup_yarn_lock
nodejs-slim
yarn
mastodon-gems
mastodon-gems.wrappedRuby
];
RAILS_ENV = "production";
NODE_ENV = "production";
@ -114,11 +119,12 @@ stdenv.mkDerivation rec {
passthru = {
tests.mastodon = nixosTests.mastodon;
updateScript = callPackage ./update.nix {};
updateScript = callPackage ./update.nix { };
};
meta = with lib; {
description = "Self-hosted, globally interconnected microblogging software based on ActivityPub";
description =
"Self-hosted, globally interconnected microblogging software based on ActivityPub";
homepage = "https://joinmastodon.org";
license = licenses.agpl3Plus;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,6 @@
# This file was generated by pkgs.mastodon.updateScript.
{ fetchgit, applyPatches }: let
{ fetchgit, applyPatches }:
let
src = fetchgit {
url = "https://github.com/glitch-soc/mastodon.git";
rev = "c18884de32b60152600ec95ed42cdf9c00fdab7a";
@ -7,5 +8,5 @@
};
in applyPatches {
inherit src;
patches = [];
patches = [ ];
}

View file

@ -1,24 +1,22 @@
{ runCommand
, lib
, makeWrapper
, yarn2nix
, bundix
, coreutils
, diffutils
, nix-prefetch-git
, gnused
, jq
}:
{ runCommand, lib, makeWrapper, yarn2nix, bundix, coreutils, diffutils
, nix-prefetch-git, gnused, jq }:
let
binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-git gnused jq ];
in
runCommand "mastodon-update-script"
{
binPath = lib.makeBinPath [
yarn2nix
bundix
coreutils
diffutils
nix-prefetch-git
gnused
jq
];
in runCommand "mastodon-update-script" {
nativeBuildInputs = [ makeWrapper ];
meta = {
maintainers = with lib.maintainers; [ happy-river ];
description = "Utility to generate Nix expressions for Mastodon's dependencies";
description =
"Utility to generate Nix expressions for Mastodon's dependencies";
platforms = lib.platforms.unix;
};
} ''