mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge pull request #144824 from erictapen/mastodon-3.4.2
This commit is contained in:
commit
0ff4fcf739
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"version": "3.4.1",
|
"version": "3.4.4",
|
||||||
"name": "@tootsuite/mastodon",
|
"name": "@mastodon/mastodon",
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12"
|
"node": ">=12"
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/tootsuite/mastodon.git"
|
"url": "https://github.com/mastodon/mastodon.git"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 2 versions",
|
"last 2 versions",
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
{ fetchgit, applyPatches }: let
|
{ fetchgit, applyPatches }: let
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/tootsuite/mastodon.git";
|
url = "https://github.com/tootsuite/mastodon.git";
|
||||||
rev = "v3.4.1";
|
rev = "v3.4.4";
|
||||||
sha256 = "1pg3yh6gfzwrhzm35s6ydpny4fj117z2avi4rck5d7n20j8s2hf5";
|
sha256 = "0gi818ns7ws63g7izhcqq5b28kifzmvg0p278lq82h02ysg9grj3";
|
||||||
};
|
};
|
||||||
in applyPatches {
|
in applyPatches {
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
|
@ -1,20 +1,30 @@
|
||||||
{ pkgs, stdenv, lib, makeWrapper, yarn2nix, bundix, coreutils,
|
{ pkgs
|
||||||
diffutils, nix-prefetch-github, gnused, jq }:
|
, runCommand
|
||||||
stdenv.mkDerivation rec {
|
, lib
|
||||||
name = "mastodon-update-script";
|
, makeWrapper
|
||||||
installPhase = ''
|
, yarn2nix
|
||||||
mkdir -p $out/bin
|
, bundix
|
||||||
cp ${./update.sh} $out/bin/update.sh
|
, coreutils
|
||||||
patchShebangs $out/bin/update.sh
|
, diffutils
|
||||||
wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs}
|
, nix-prefetch-github
|
||||||
'';
|
, gnused
|
||||||
|
, jq
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
binPath = lib.makeBinPath [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ];
|
||||||
|
in
|
||||||
|
runCommand "mastodon-update-script"
|
||||||
|
{
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq ];
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
maintainers = with lib.maintainers; [ happy-river ];
|
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;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
} ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ${./update.sh} $out/bin/update.sh
|
||||||
|
patchShebangs $out/bin/update.sh
|
||||||
|
wrapProgram $out/bin/update.sh --prefix PATH : ${binPath}
|
||||||
|
''
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
"3.4.1"
|
"3.4.4"
|
||||||
|
|
|
@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag
|
||||||
+++ b/package.json
|
+++ b/package.json
|
||||||
@@ -1,4 +1,5 @@
|
@@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
+ "version": "3.4.1",
|
+ "version": "3.4.4",
|
||||||
"name": "@tootsuite/mastodon",
|
"name": "@mastodon/mastodon",
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|
Loading…
Reference in a new issue