pkgs: fix woodpecker

This commit is contained in:
Dmitriy Pleshevskiy 2023-03-31 17:04:02 +03:00
parent 34b05418f7
commit b971fa4384
Signed by: pleshevskiy
GPG key ID: 79C4487B44403985
5 changed files with 13 additions and 10 deletions

View file

@ -52,7 +52,7 @@
tor-browser-bundle-bin
myip
# woodpecker-cli
woodpecker-cli
];
local.git = {

View file

@ -1,8 +1,6 @@
{ pkgs, config, ... }:
let
nextPkgs = pkgs.callPackage ../../../../../packages/woodpecker { };
canigouData = import ../../data.secret.nix;
data = import ./data.secret.nix;
@ -30,7 +28,7 @@ in
"WOODPECKER_BACKEND=docker"
"WOODPECKER_BACKEND_DOCKER_VOLUMES=${dockerSockVolume},${dockerConfVolume}"
];
ExecStart = "${nextPkgs.woodpecker-agent}/bin/woodpecker-agent";
ExecStart = "${pkgs.unstable.woodpecker-agent}/bin/woodpecker-agent";
User = userAgent;
Group = group;
};

View file

@ -2,8 +2,6 @@
{ pkgs, config, ... }:
let
nextPkgs = pkgs.callPackage ../../../../../packages/woodpecker { };
data = import ./data.secret.nix;
inherit (data) hostname port grpcPort userServer group database;
in
@ -36,7 +34,7 @@ in
"WOODPECKER_DOCKER_CONFIG=${config.age.secrets.woodpecker-docker-config.path}"
"WOODPECKER_AUTHENTICATE_PUBLIC_REPOS=true"
];
ExecStart = "${nextPkgs.woodpecker-server}/bin/woodpecker-server";
ExecStart = "${pkgs.unstable.woodpecker-server}/bin/woodpecker-server";
User = userServer;
Group = group;
};

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitea }:
let
version = "36bdad8b00d3b8329dd414f3ccd22675660ec1bb";
srcSha256 = "sha256-c3fb/UP5flFuBvgLfxMAwSfQ24JlyjAiobBXeJhCvJk=";
version = "ef1f27d5e3fae7ae6278717f33dde61778a302d1";
srcSha256 = "sha256-4m9+SC4aMU8AVwrgdDoNFf02mh4R6PLmgnGQ2K8dEuk=";
yarnSha256 = "sha256-DZHwITEG+d3Xtj2k4FaWTEFNjJtX7rD0OvG2uuv6xH0=";
in
{

View file

@ -1,4 +1,5 @@
{ lib, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }:
{ callPackage, fetchYarnDeps, mkYarnPackage }:
let
common = callPackage ./common.nix { };
in
@ -14,6 +15,12 @@ mkYarnPackage {
sha256 = common.yarnSha256;
};
patchPhase = ''
cd src/assets/locales
rm $(ls | grep -v en.json)
cd -
'';
buildPhase = ''
runHook preBuild