diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:14:34 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:14:34 +0200 |
commit | eab41878ac16a80b1189d5e4aeec5e037f6571db (patch) | |
tree | 8bd9dcfadee430fc3f853bfacdd6220bc4e35152 /pkgs/tools/system | |
parent | 11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27 (diff) | |
parent | afd04a49ed4d03923adf51352ce2bce1fa72455d (diff) | |
download | nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.gz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.bz2 nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.lz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.xz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.zst nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/daemon/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/system/systemd-journal2gelf/default.nix | 9 |
2 files changed, 30 insertions, 4 deletions
diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix new file mode 100644 index 000000000000..9bc6ecc6ddfa --- /dev/null +++ b/pkgs/tools/system/daemon/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation { + name = "daemon-0.6.4"; + src = fetchurl { + url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; + sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; + }; + makeFlags = "PREFIX=$(out)"; + buildInputs = [ perl ]; + + meta = { + description = "Daemon turns other process into daemons"; + longDescription = '' + Daemon turns other process into daemons. There are many tasks that need + to be performed to correctly set up a daemon process. This can be tedious. + Daemon performs these tasks for other processes. This is useful for + writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh, + Java). + ''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 0a2b7ab4f3bc..3f23624071f4 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule { +buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; version = "20190702"; @@ -8,10 +8,11 @@ buildGoModule { rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29"; + sha256 = "13jyh34wprjixinmh6l7wj7lr1f6qy6nrjcf8l29a74mczbphnvv"; + fetchSubmodules = true; }; - modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp"; + goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; |