diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-07-21 20:53:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-21 20:53:39 +0000 |
| commit | 376b5fd0003987a4f2cbe04fbd981c587bbed09d (patch) | |
| tree | c1bd96715a87c56cbb7d78f9367ffee1f2f1c589 /pkgs/tools | |
| parent | 44565adda500eb36e21a7c8f7ff67b32b272cf11 (diff) | |
| parent | 16d0b8dcbd6a8a6be12a2732c7174529c3828051 (diff) | |
| download | nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.tar nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.tar.gz nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.tar.bz2 nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.tar.lz nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.tar.xz nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.tar.zst nixlib-376b5fd0003987a4f2cbe04fbd981c587bbed09d.zip | |
Merge pull request #64463 from Ma27/graylog-test
nixos/graylog: minor fixes, add test
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/system/systemd-journal2gelf/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/system/systemd-journal2gelf/deps.nix | 11 |
2 files changed, 7 insertions, 20 deletions
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 7230f55d309c..2219d623a039 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "SystemdJournal2Gelf-${version}"; - version = "20170413"; - - goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; +buildGoModule rec { + pname = "SystemdJournal2Gelf-unstable"; + version = "20190702"; src = fetchFromGitHub { - rev = "862b1d60d2ba12cd8480304ca95041066cc8bdd0"; + rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "0xvvc7w2sxkhb33nkq5v626l673d5j2z0yc75wvmqzncwfkkv94v"; + sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29"; }; - goDeps = ./deps.nix; + modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp"; meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; diff --git a/pkgs/tools/system/systemd-journal2gelf/deps.nix b/pkgs/tools/system/systemd-journal2gelf/deps.nix deleted file mode 100644 index 2e0988e81054..000000000000 --- a/pkgs/tools/system/systemd-journal2gelf/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ - goPackagePath = "github.com/DECK36/go-gelf"; - fetch = { - type = "git"; - url = "https://github.com/DECK36/go-gelf"; - rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f"; - sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay"; - }; -} -] |