From 1228dd9dd6c7c6f07881ab5d4cdd7cf73760c1a3 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 12 Jun 2024 18:02:55 +0200
Subject: [PATCH] Update nix flake (#3780)

---
 Makefile   |  8 ++++----
 flake.lock | 12 ++++++------
 flake.nix  | 14 ++++++++------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index d5b092abc..d5471b0b4 100644
--- a/Makefile
+++ b/Makefile
@@ -109,11 +109,11 @@ clean-all: clean ## Clean all artifacts
 
 .PHONY: generate
 generate: install-tools generate-swagger ## Run all code generations
-	go generate ./...
+	CGO_ENABLED=0 go generate ./...
 
 generate-swagger: install-tools ## Run swagger code generation
 	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
 	addlicense -c "Woodpecker Authors" -ignore "vendor/**" **/*.go
@@ -317,7 +317,7 @@ spellcheck:
 ##@ Docs
 .PHONY: docs
 docs: ## Generate docs (currently only for the cli)
-	go generate cmd/cli/app.go
-	go generate cmd/server/swagger.go
+	CGO_ENABLED=0 go generate cmd/cli/app.go
+	CGO_ENABLED=0 go generate cmd/server/swagger.go
 
 endif
diff --git a/flake.lock b/flake.lock
index a55d47375..606f8836c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715614915,
-        "narHash": "sha256-O6sqpppOtlfgx6PK5bnkAvBudK1rpjP7ig0dj7HvIl0=",
-        "owner": "NixOS",
+        "lastModified": 1717974879,
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d2ed14aa4f912254c578fc19b842f2910c9146be",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "master",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 9df9bc634..ac4faf064 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,6 @@
 {
-  # Override nixpkgs to use the latest set of node packages
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -10,7 +9,7 @@
     flake-utils.lib.eachDefaultSystem (
       system:
       let
-        pkgs = import nixpkgs { inherit system; };
+        pkgs = nixpkgs.legacyPackages.${system};
       in
       {
         devShells.default = pkgs.mkShell {
@@ -20,18 +19,21 @@
             gnutar
 
             # frontend
-            nodejs
-            nodePackages.pnpm
+            nodejs_20
+            pnpm
             nodePackages.typescript
             nodePackages.typescript-language-server
 
             # backend
-            go
+            go_1_22
+            glibc.static
             gofumpt
             golangci-lint
             go-mockery
             protobuf
           ];
+          CFLAGS = "-I${pkgs.glibc.dev}/include";
+          LDFLAGS = "-L${pkgs.glibc}/lib";
         };
       }
     );