Merge branch 'master' into staging

* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
This commit is contained in:
Orivej Desh
2019-09-22 21:33:00 +00:00
37 changed files with 2208 additions and 1508 deletions

View File

@@ -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;
};
}

View File

@@ -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";