fixed linting
This commit is contained in:
parent
6105d8bc05
commit
0933b2b504
59 changed files with 2843 additions and 2638 deletions
|
@ -1,9 +1,22 @@
|
|||
{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests, yarn, callPackage
|
||||
, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript, fetchYarnDeps
|
||||
{ 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
|
||||
# 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.
|
||||
}:
|
||||
|
||||
|
@ -106,16 +119,18 @@ stdenv.mkDerivation rec {
|
|||
ln -s /tmp tmp
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
run-streaming = writeShellScript "run-streaming.sh" ''
|
||||
# NixOS helper script to consistently use the same NodeJS version the package was built with.
|
||||
${nodejs-slim}/bin/node ./streaming
|
||||
installPhase =
|
||||
let
|
||||
run-streaming = writeShellScript "run-streaming.sh" ''
|
||||
# NixOS helper script to consistently use the same NodeJS version the package was built with.
|
||||
${nodejs-slim}/bin/node ./streaming
|
||||
'';
|
||||
in
|
||||
''
|
||||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
ln -s ${run-streaming} $out/run-streaming.sh
|
||||
'';
|
||||
in ''
|
||||
mkdir -p $out
|
||||
cp -r * $out/
|
||||
ln -s ${run-streaming} $out/run-streaming.sh
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.mastodon = nixosTests.mastodon;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,11 +1,13 @@
|
|||
# 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 = "a1df9fdb06854bd55f018918236132ccfa7d9d84";
|
||||
sha256 = "0amqiigq3qgag6qm119aaysmd2k93vwgr1aynxjxmbpn35ykcay3";
|
||||
};
|
||||
in applyPatches {
|
||||
in
|
||||
applyPatches {
|
||||
inherit src;
|
||||
patches = [];
|
||||
patches = [ ];
|
||||
}
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
{ 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
|
||||
|
@ -10,7 +19,9 @@ let
|
|||
gnused
|
||||
jq
|
||||
];
|
||||
in runCommand "mastodon-update-script" {
|
||||
in
|
||||
runCommand "mastodon-update-script"
|
||||
{
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -2,8 +2,10 @@
|
|||
let
|
||||
sources = builtins.fromJSON (builtins.readFile ./sources.json);
|
||||
source = lib.findFirst (x: x.platform == stdenv.hostPlatform.system)
|
||||
(throw "unsupported platform: ${stdenv.hostPlatform.system}") sources;
|
||||
in plexRaw.overrideAttrs (attrs: {
|
||||
(throw "unsupported platform: ${stdenv.hostPlatform.system}")
|
||||
sources;
|
||||
in
|
||||
plexRaw.overrideAttrs (attrs: {
|
||||
pname = attrs.pname + "-plexpass";
|
||||
inherit (source) version;
|
||||
src = fetchurl {
|
||||
|
|
|
@ -6,7 +6,8 @@ let
|
|||
mkdir -p $out/plugins/
|
||||
cp -r ${src} $out/plugins/swipe
|
||||
'';
|
||||
in roundcubePlugin rec {
|
||||
in
|
||||
roundcubePlugin rec {
|
||||
pname = "roundcube-swipe";
|
||||
version = "0.5";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue