diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-02-03 14:37:55 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-02-03 14:39:28 +0100 |
| commit | 2746973061f8e62c4decdf8e131c7db06f5c511f (patch) | |
| tree | 93b92f691cbc0455498f284d67805c3a521c4547 | |
| parent | 4ce1c5938905eedd1050f0be8a0c6a69587f5aac (diff) | |
| download | nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.tar nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.tar.gz nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.tar.bz2 nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.tar.lz nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.tar.xz nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.tar.zst nixpkgs-2746973061f8e62c4decdf8e131c7db06f5c511f.zip | |
ndppd: don't use weird upstream systemd service unit
| -rw-r--r-- | nixos/modules/services/networking/ndppd.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/ndppd/default.nix | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index 54a6e393657..ba17f1ba825 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -157,6 +157,8 @@ in { }; systemd.services.ndppd = { + description = "NDP Proxy Daemon"; + documentation = [ "man:ndppd(1)" "man:ndppd.conf(5)" ]; after = [ "network-pre.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}"; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index a5eb9021048..6e6315ced7d 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,11 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip }: -let - serviceFile = fetchurl { - url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; - sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -27,11 +22,6 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cp ndppd.conf-dist $out/etc/ndppd.conf - - mkdir -p $out/lib/systemd/system - # service file needed for our module is not in release yet - substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ - --replace /usr/sbin/ndppd $out/sbin/ndppd ''; meta = { |