starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-04-22 08:38:39 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

nix: fix deprecated attributes and update dev tools

Browse Source 
- Fix deprecated flake output attributes (overlay -> overlays.default,
  devShell -> devShells.default, defaultPackage -> packages.default)
- Use stdenv.hostPlatform.system instead of deprecated prev.system
- Update grpc-gateway 2.24.0 -> 2.27.4
- Update protobuf-language-server
- Update nixpkgs
This commit is contained in:
Kristoffer Dalby
2026-01-21 16:50:10 +00:00
parent ee303186b3
commit aee1d2a640
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1766840161, "lastModified": 1768875095,
"narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
flake.nix
View File

@@ -23,9 +23,9 @@
default = headscale; default = headscale;
}; };
overlay = _: prev: overlays.default = _: prev:
let let
pkgs = nixpkgs.legacyPackages.${prev.system}; pkgs = nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system};
buildGo = pkgs.buildGo125Module; buildGo = pkgs.buildGo125Module;
vendorHash = "sha256-escboufgbk+lEitw48eWEIltXbaCPdysb/g4YR+extg="; vendorHash = "sha256-escboufgbk+lEitw48eWEIltXbaCPdysb/g4YR+extg=";
in in
@@ -62,16 +62,16 @@
protoc-gen-grpc-gateway = buildGo rec { protoc-gen-grpc-gateway = buildGo rec {
pname = "grpc-gateway"; pname = "grpc-gateway";
version = "2.24.0"; version = "2.27.4";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "grpc-ecosystem"; owner = "grpc-ecosystem";
repo = "grpc-gateway"; repo = "grpc-gateway";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lUEoqXJF1k4/il9bdDTinkUV5L869njZNYqObG/mHyA="; sha256 = "sha256-4bhEQTVV04EyX/qJGNMIAQDcMWcDVr1tFkEjBHpc2CA=";
}; };
vendorHash = "sha256-Ttt7bPKU+TMKRg5550BS6fsPwYp0QJqcZ7NLrhttSdw="; vendorHash = "sha256-ohZW/uPdt08Y2EpIQ2yeyGSjV9O58+QbQQqYrs6O8/g=";
nativeBuildInputs = [ pkgs.installShellFiles ]; nativeBuildInputs = [ pkgs.installShellFiles ];
@@ -80,16 +80,16 @@
protobuf-language-server = buildGo rec { protobuf-language-server = buildGo rec {
pname = "protobuf-language-server"; pname = "protobuf-language-server";
version = "2546944"; version = "1cf777d";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lasorda"; owner = "lasorda";
repo = "protobuf-language-server"; repo = "protobuf-language-server";
rev = "${version}"; rev = "1cf777de4d35a6e493a689e3ca1a6183ce3206b6";
sha256 = "sha256-Cbr3ktT86RnwUntOiDKRpNTClhdyrKLTQG2ZEd6fKDc="; sha256 = "sha256-9MkBQPxr/TDr/sNz/Sk7eoZwZwzdVbE5u6RugXXk5iY=";
}; };
vendorHash = "sha256-PfT90dhfzJZabzLTb1D69JCO+kOh2khrlpF5mCDeypk="; vendorHash = "sha256-4nTpKBe7ekJsfQf+P6edT/9Vp2SBYbKz1ITawD3bhkI=";
subPackages = [ "." ]; subPackages = [ "." ];
}; };
@@ -129,7 +129,7 @@
(system: (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
overlays = [ self.overlay ]; overlays = [ self.overlays.default ];
inherit system; inherit system;
}; };
buildDeps = with pkgs; [ git go_1_25 gnumake ]; buildDeps = with pkgs; [ git go_1_25 gnumake ];
@@ -182,9 +182,9 @@
config.Entrypoint = [ (pkgs.headscale + "/bin/headscale") ]; config.Entrypoint = [ (pkgs.headscale + "/bin/headscale") ];
}; };
in in
rec { {
# `nix develop` # `nix develop`
devShell = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = buildInputs =
devDeps devDeps
++ [ ++ [
@@ -219,14 +219,16 @@
packages = with pkgs; { packages = with pkgs; {
inherit headscale; inherit headscale;
inherit headscale-docker; inherit headscale-docker;
default = headscale;
}; };
defaultPackage = pkgs.headscale;
# `nix run` # `nix run`
apps.headscale = flake-utils.lib.mkApp { apps.headscale = flake-utils.lib.mkApp {
drv = packages.headscale; drv = pkgs.headscale;
};
apps.default = flake-utils.lib.mkApp {
drv = pkgs.headscale;
}; };
apps.default = apps.headscale;
checks = { checks = {
headscale = pkgs.testers.nixosTest (import ./nix/tests/headscale.nix); headscale = pkgs.testers.nixosTest (import ./nix/tests/headscale.nix);