diff --git a/bus/bus.go b/bus/bus.go index 6b8e001..33807b6 100644 --- a/bus/bus.go +++ b/bus/bus.go @@ -55,7 +55,9 @@ func (n *NotifyBus) ServerInfo() (*NotifyServerInfo, error) { func (n *NotifyBus) Notify(notification BusNotification) (uint32, error) { obj := n.conn.Object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") + var ret uint32 + call := obj.Call( "org.freedesktop.Notifications.Notify", // Method 0, // Flags diff --git a/flake.nix b/flake.nix index 24f1530..c01fb66 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,24 @@ natstonotify = self.packages.${prev.system}.default; }; + checks = forAllSystems ( + { pkgs }: + { + lint = self.packages.${pkgs.system}.default.overrideAttrs (old: { + name = "golangci-lint"; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.golangci-lint ]; + buildPhase = '' + HOME=$TMPDIR golangci-lint run --timeout 360s + ''; + doCheck = false; + installPhase = '' + touch $out $unittest + ''; + fixupPhase = ":"; + }); + } + ); + packages = forAllSystems ( { pkgs }: { @@ -48,7 +66,7 @@ version = version; pname = "natstonotify"; src = src; - vendorHash = pkgs.lib.fakeHash; + vendorHash = "sha256-xAFxgUH2QUkmdCXJB4NzURozedgMIyawdf/g3vxOyC0="; }; } ); diff --git a/go.mod b/go.mod index 3787c39..7d00b8c 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,15 @@ module git.t-juice.club/torjus/natstonotify go 1.23.4 require ( - github.com/godbus/dbus/v5 v5.1.0 // indirect + github.com/godbus/dbus/v5 v5.1.0 + github.com/nats-io/nats.go v1.39.0 + github.com/nats-io/nkeys v0.4.9 + github.com/urfave/cli/v3 v3.0.0-beta1 +) + +require ( github.com/klauspost/compress v1.17.11 // indirect - github.com/nats-io/nats.go v1.39.0 // indirect - github.com/nats-io/nkeys v0.4.9 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/urfave/cli/v3 v3.0.0-beta1 // indirect golang.org/x/crypto v0.33.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 // indirect diff --git a/go.sum b/go.sum index 751852d..c4f1e43 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= @@ -8,6 +10,10 @@ github.com/nats-io/nkeys v0.4.9 h1:qe9Faq2Gxwi6RZnZMXfmGMZkg3afLLOtrU+gDZJ35b0= github.com/nats-io/nkeys v0.4.9/go.mod h1:jcMqs+FLG+W5YO36OX6wFIFcmpdAns+w1Wm6D3I/evE= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjcw9Zg= github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= @@ -16,3 +22,5 @@ golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index c9f61f3..59bbaff 100644 --- a/main.go +++ b/main.go @@ -147,7 +147,7 @@ func main() { fmt.Printf("Error connecting to NATS: %s\n", err) return cli.Exit(err, 1) } - defer nc.Drain() // nolint: errcheck + defer nc.Drain() //nolint: errcheck data, err := json.Marshal(bn) if err != nil {