diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 19:02:09 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 19:02:09 -0600 |
| commit | 2c1d3a9a824938e37a1a67f7532ac6f417f917c2 (patch) | |
| tree | b16b4cdf7c63b21f6ecbc6b04fcadd54b546d829 /pkgs/servers | |
| parent | e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3 (diff) | |
| parent | 0925c482c8378e8a6a8724edc6596ea60f90a113 (diff) | |
| download | nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.gz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.bz2 nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.lz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.xz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.zst nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/identd/oidentd/default.nix | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 514771f7e580..e92cd6175af1 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.8"; + version = "3.7.9"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "00jsix333g44y20psrp12c96b7d161yvrysnygjjz4wc5gbrzlxy"; + sha256 = "138hz19g4x562vm7aqdsxc98ay0aidn37isafzhkig8cjlygg2iq"; }; buildInputs = diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 1abe9512f589..80049cea7379 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { name = "oidentd-${version}"; - version = "2.2.2"; - - CFLAGS = [ "--std=gnu89" ]; + version = "2.3.1"; + nativeBuildInputs = [ bison flex ]; src = fetchurl { - url = "https://ftp.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; - sha256 = "1svj7ymljp4s17d7jlx6602n9081714qsj5yymmv1s9wagzjqyn9"; + url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + sha256 = "1sljid4jyz9gjyx8wy3xd6bq4624dxs422nqd3mcxnsvgxr6d6zd"; }; - meta = { - homepage = http://ojnk.sourceforge.net/; - description = "An implementation of the IDENT protocol"; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Configurable Ident protocol server"; + homepage = https://oidentd.janikrabe.com/; + license = licenses.gpl2; + platforms = platforms.linux; }; } |