pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-03-03 09:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #184 from water-sucks/nix-fixes-this

Browse Source 
fix(nix): resolve issues and revamp the flake
This commit is contained in:
Owen Schwartz
2025-12-04 10:23:20 -05:00
committed by GitHub
parent ba43083f04 15b40b0f24
commit 7f650bbfdf
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1756217674, "lastModified": 1763934636,
"narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "narHash": "sha256-9glbI7f1uU+yzQCq5LwLgdZqx6svOhZWkd4JRY265fc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

50
flake.nix
View File

@@ -2,7 +2,7 @@
description = "newt - A tunneling client for Pangolin"; description = "newt - A tunneling client for Pangolin";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
outputs = outputs =
@@ -22,30 +22,36 @@
system: system:
let let
pkgs = pkgsFor system; pkgs = pkgsFor system;
inherit (pkgs) lib;
# Update version when releasing # Update version when releasing
version = "1.4.2"; version = "1.6.0";
# Update the version in a new source tree
srcWithReplacedVersion = pkgs.runCommand "newt-src-with-version" { } ''
cp -r ${./.} $out
chmod -R +w $out
rm -rf $out/.git $out/result $out/.envrc $out/.direnv
sed -i "s/version_replaceme/${version}/g" $out/main.go
'';
in in
{ {
default = self.packages.${system}.pangolin-newt; default = self.packages.${system}.pangolin-newt;
pangolin-newt = pkgs.buildGoModule { pangolin-newt = pkgs.buildGoModule {
pname = "pangolin-newt"; pname = "pangolin-newt";
version = version; inherit version;
src = srcWithReplacedVersion; src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
vendorHash = "sha256-PENsCO2yFxLVZNPgx2OP+gWVNfjJAfXkwWS7tzlm490=";
meta = with pkgs.lib; { vendorHash = "sha256-Jbu0pz+okV4N9MHUXLcTqSr3s/k5OVZ09hNuS/+4LFY=";
env = {
CGO_ENABLED = 0;
};
ldflags = [
"-X main.newtVersion=${version}"
];
meta = {
description = "A tunneling client for Pangolin"; description = "A tunneling client for Pangolin";
homepage = "https://github.com/fosrl/newt"; homepage = "https://github.com/fosrl/newt";
license = licenses.gpl3; license = lib.licenses.gpl3;
maintainers = [ ]; maintainers = [
lib.maintainers.water-sucks
];
}; };
}; };
} }
@@ -54,10 +60,20 @@
system: system:
let let
pkgs = pkgsFor system; pkgs = pkgsFor system;
inherit (pkgs)
go
gopls
gotools
go-outline
gopkgs
godef
golint
;
in in
{ {
default = pkgs.mkShell { default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = [
go go
gopls gopls
gotools gotools