mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-07-07 22:45:50 +00:00
Code Issues Projects Releases Wiki Activity

Update nix flake (#3780)

Browse source
This commit is contained in:
6543 2024-06-12 18:02:55 +02:00 committed by GitHub
parent a4b4b13ae7
commit 1228dd9dd6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -109,11 +109,11 @@ clean-all: clean ## Clean all artifacts
.PHONY: generate .PHONY: generate
generate: install-tools generate-swagger ## Run all code generations generate: install-tools generate-swagger ## Run all code generations
go generate ./... CGO_ENABLED=0 go generate ./...
generate-swagger: install-tools ## Run swagger code generation generate-swagger: install-tools ## Run swagger code generation
swag init -g server/api/ -g cmd/server/swagger.go --outputTypes go -output cmd/server/docs swag init -g server/api/ -g cmd/server/swagger.go --outputTypes go -output cmd/server/docs
go generate cmd/server/swagger.go CGO_ENABLED=0 go generate cmd/server/swagger.go
generate-license-header: install-tools generate-license-header: install-tools
addlicense -c "Woodpecker Authors" -ignore "vendor/**" **/*.go addlicense -c "Woodpecker Authors" -ignore "vendor/**" **/*.go
@ -317,7 +317,7 @@ spellcheck:
##@ Docs ##@ Docs
.PHONY: docs .PHONY: docs
docs: ## Generate docs (currently only for the cli) docs: ## Generate docs (currently only for the cli)
go generate cmd/cli/app.go CGO_ENABLED=0 go generate cmd/cli/app.go
go generate cmd/server/swagger.go CGO_ENABLED=0 go generate cmd/server/swagger.go
endif endif

12
flake.lock
View file

@ -20,16 +20,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715614915, "lastModified": 1717974879,
"narHash": "sha256-O6sqpppOtlfgx6PK5bnkAvBudK1rpjP7ig0dj7HvIl0=", "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d2ed14aa4f912254c578fc19b842f2910c9146be", "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "master", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

14
flake.nix
View file

@ -1,7 +1,6 @@
{ {
# Override nixpkgs to use the latest set of node packages
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -10,7 +9,7 @@
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = nixpkgs.legacyPackages.${system};
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
@ -20,18 +19,21 @@
gnutar gnutar
# frontend # frontend
nodejs nodejs_20
nodePackages.pnpm pnpm
nodePackages.typescript nodePackages.typescript
nodePackages.typescript-language-server nodePackages.typescript-language-server
# backend # backend
go go_1_22
glibc.static
gofumpt gofumpt
golangci-lint golangci-lint
go-mockery go-mockery
protobuf protobuf
]; ];
CFLAGS = "-I${pkgs.glibc.dev}/include";
LDFLAGS = "-L${pkgs.glibc}/lib";
}; };
} }
); );