mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-10-28 10:51:44 +01:00 
			
		
		
		
	Merge pull request #781 from juanfont/switch-to-nix-unstable
Switch to Nix unstable for Go 1.19
This commit is contained in:
		
						commit
						096a009685
					
				
							
								
								
									
										14
									
								
								flake.lock
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								flake.lock
									
									
									
									
									
								
							@ -2,11 +2,11 @@
 | 
				
			|||||||
  "nodes": {
 | 
					  "nodes": {
 | 
				
			||||||
    "flake-utils": {
 | 
					    "flake-utils": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1653893745,
 | 
					        "lastModified": 1659877975,
 | 
				
			||||||
        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
 | 
					        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
 | 
				
			||||||
        "owner": "numtide",
 | 
					        "owner": "numtide",
 | 
				
			||||||
        "repo": "flake-utils",
 | 
					        "repo": "flake-utils",
 | 
				
			||||||
        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
 | 
					        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
@ -17,16 +17,16 @@
 | 
				
			|||||||
    },
 | 
					    },
 | 
				
			||||||
    "nixpkgs": {
 | 
					    "nixpkgs": {
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1654847188,
 | 
					        "lastModified": 1662019588,
 | 
				
			||||||
        "narHash": "sha256-MC+eP7XOGE1LAswOPqdcGoUqY9mEQ3ZaaxamVTbc0hM=",
 | 
					        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
 | 
				
			||||||
        "owner": "NixOS",
 | 
					        "owner": "NixOS",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "rev": "8b66e3f2ebcc644b78cec9d6f152192f4e7d322f",
 | 
					        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "owner": "NixOS",
 | 
					        "owner": "NixOS",
 | 
				
			||||||
        "ref": "nixos-22.05",
 | 
					        "ref": "nixos-unstable",
 | 
				
			||||||
        "repo": "nixpkgs",
 | 
					        "repo": "nixpkgs",
 | 
				
			||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
  description = "headscale - Open Source Tailscale Control server";
 | 
					  description = "headscale - Open Source Tailscale Control server";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  inputs = {
 | 
					  inputs = {
 | 
				
			||||||
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
 | 
					    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 | 
				
			||||||
    flake-utils.url = "github:numtide/flake-utils";
 | 
					    flake-utils.url = "github:numtide/flake-utils";
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -17,7 +17,7 @@
 | 
				
			|||||||
        in
 | 
					        in
 | 
				
			||||||
        rec {
 | 
					        rec {
 | 
				
			||||||
          headscale =
 | 
					          headscale =
 | 
				
			||||||
            pkgs.buildGo118Module rec {
 | 
					            pkgs.buildGo119Module rec {
 | 
				
			||||||
              pname = "headscale";
 | 
					              pname = "headscale";
 | 
				
			||||||
              version = headscaleVersion;
 | 
					              version = headscaleVersion;
 | 
				
			||||||
              src = pkgs.lib.cleanSource self;
 | 
					              src = pkgs.lib.cleanSource self;
 | 
				
			||||||
@ -95,7 +95,7 @@
 | 
				
			|||||||
            overlays = [ self.overlay ];
 | 
					            overlays = [ self.overlay ];
 | 
				
			||||||
            inherit system;
 | 
					            inherit system;
 | 
				
			||||||
          };
 | 
					          };
 | 
				
			||||||
          buildDeps = with pkgs; [ git go_1_18 gnumake ];
 | 
					          buildDeps = with pkgs; [ git go_1_19 gnumake ];
 | 
				
			||||||
          devDeps = with pkgs;
 | 
					          devDeps = with pkgs;
 | 
				
			||||||
            buildDeps ++ [
 | 
					            buildDeps ++ [
 | 
				
			||||||
              golangci-lint
 | 
					              golangci-lint
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user