fix(build): go and nix builds not working properly
This commit is contained in:
@@ -6,7 +6,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"snitch/internal/testutil"
|
||||
"github.com/karol-broda/snitch/internal/testutil"
|
||||
)
|
||||
|
||||
// TestCLIContract tests the CLI interface contracts as specified in the README
|
||||
|
||||
@@ -9,8 +9,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"snitch/internal/collector"
|
||||
"snitch/internal/testutil"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/testutil"
|
||||
)
|
||||
|
||||
var updateGolden = flag.Bool("update-golden", false, "Update golden files")
|
||||
|
||||
@@ -8,10 +8,10 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"os/exec"
|
||||
"snitch/internal/collector"
|
||||
"snitch/internal/color"
|
||||
"snitch/internal/config"
|
||||
"snitch/internal/resolver"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/color"
|
||||
"github.com/karol-broda/snitch/internal/config"
|
||||
"github.com/karol-broda/snitch/internal/resolver"
|
||||
"strconv"
|
||||
"strings"
|
||||
"text/tabwriter"
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"snitch/internal/collector"
|
||||
"snitch/internal/testutil"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/testutil"
|
||||
)
|
||||
|
||||
func TestLsCommand_EmptyResults(t *testing.T) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package cmd
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"snitch/internal/config"
|
||||
"github.com/karol-broda/snitch/internal/config"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
@@ -2,8 +2,8 @@ package cmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"snitch/internal/collector"
|
||||
"snitch/internal/color"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/color"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
@@ -2,8 +2,8 @@ package cmd
|
||||
|
||||
import (
|
||||
"log"
|
||||
"snitch/internal/config"
|
||||
"snitch/internal/tui"
|
||||
"github.com/karol-broda/snitch/internal/config"
|
||||
"github.com/karol-broda/snitch/internal/tui"
|
||||
"time"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
@@ -7,8 +7,8 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"snitch/internal/collector"
|
||||
"snitch/internal/resolver"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/resolver"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
"github.com/fatih/color"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"snitch/internal/tui"
|
||||
"github.com/karol-broda/snitch/internal/tui"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -50,13 +50,15 @@
|
||||
version = "nix-${rev}";
|
||||
go = mkGo125 pkgs;
|
||||
buildGoModule = pkgs.buildGoModule.override { inherit go; };
|
||||
isDarwin = pkgs.stdenv.isDarwin;
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "snitch";
|
||||
inherit version;
|
||||
src = self;
|
||||
vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk=";
|
||||
env.CGO_ENABLED = "0";
|
||||
# darwin requires cgo for libproc, linux uses pure go with /proc
|
||||
env.CGO_ENABLED = if isDarwin then "1" else "0";
|
||||
env.GOTOOLCHAIN = "local";
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -69,7 +71,7 @@
|
||||
description = "a friendlier ss/netstat for humans";
|
||||
homepage = "https://github.com/karol-broda/snitch";
|
||||
license = pkgs.lib.licenses.mit;
|
||||
platforms = pkgs.lib.platforms.linux;
|
||||
platforms = pkgs.lib.platforms.linux ++ pkgs.lib.platforms.darwin;
|
||||
mainProgram = "snitch";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
)
|
||||
|
||||
// TestCollector wraps MockCollector for use in tests
|
||||
|
||||
@@ -3,7 +3,7 @@ package tui
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package tui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"time"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
@@ -2,7 +2,7 @@ package tui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ package tui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"snitch/internal/collector"
|
||||
"snitch/internal/theme"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/theme"
|
||||
"time"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package tui
|
||||
|
||||
import (
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package tui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"snitch/internal/collector"
|
||||
"github.com/karol-broda/snitch/internal/collector"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user