mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

nix: use 22.11 stable nixpkgs #13

Merged
pleshevskiy merged 16 commits from stable-nix into main 2023-03-31 17:40:22 +03:00
Conversation 0 Commits 16 Files changed 19 +13 -10
5 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b971fa4384 - Show all commits

2
home/users/jan/home.nix
View file

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

4
nixos/hosts/magenta/services/woodpecker/agent-docker.nix
View file

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

4
nixos/hosts/magenta/services/woodpecker/server.nix
View file

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

4
packages/woodpecker/common.nix
View file

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

9
packages/woodpecker/frontend.nix
View file

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