diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:54:06 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:54:17 +0100 |
| commit | 5a67b130b9b4d72a4398b8f0cd4893674213fb20 (patch) | |
| tree | 81354bb3b5c2447bda9e93dbc94acdbc4d913c25 /pkgs/tools/networking | |
| parent | 2bb33130cc3a00a8fb1a6afb341cf31079061e5a (diff) | |
| parent | 2c288548b93b657365c27a0132a43ba0080870cc (diff) | |
| download | nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.gz nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.bz2 nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.lz nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.xz nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.zst nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/miredo/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/tools/networking/ndjbdns/default.nix | 19 |
2 files changed, 46 insertions, 7 deletions
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix new file mode 100644 index 00000000000..efe2847ae35 --- /dev/null +++ b/pkgs/tools/networking/miredo/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, nettools, iproute, judy }: + +stdenv.mkDerivation rec { + version = "1.2.6"; + name = "miredo-${version}"; + + buildInputs = [ judy ]; + + src = fetchurl { + url = "http://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; + sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps"; + }; + + postPatch = '' + substituteInPlace misc/client-hook.bsd \ + --replace '/sbin/route' '${nettools}/bin/route' \ + --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' + substituteInPlace misc/client-hook.iproute --replace '/sbin/ip' '${iproute}/bin/ip' + ''; + + configureFlags = [ "--with-Judy" ]; + + postInstall = '' + rm -rf $out/lib/systemd $out/var $out/etc/miredo/miredo.conf + ''; + + meta = with stdenv.lib; { + description = "Teredo IPv6 Tunneling Daemon"; + homepage = http://www.remlab.net/miredo/; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 256f50e5c54..3269f92d7f4 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, systemd, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }: + +with stdenv.lib; stdenv.mkDerivation rec { version = "1.06"; name = "ndjbdns-${version}"; - src = fetchurl { - url = "http://pjp.dgplug.org/ndjbdns/${name}.tar.gz"; - sha256 = "09qi5a9abqm08iqmxj74fzzq9x1w5lzr1jlbzj2hl8hz0g2sgraw"; + src = fetchFromGitHub { + owner = "pjps"; + repo = "ndjbdns"; + rev = "64d371b6f887621de7bf8bd495be10442b2accd0"; + sha256 = "0gjyvn8r66kp49gasd6sqfvg2pj0c6v67hnq7cqwl04kj69rfy86"; }; - buildInputs = [ pkgconfig systemd ]; + buildInputs = [ autoreconfHook pkgconfig ] + ++ optional stdenv.isLinux systemd; - meta = with stdenv.lib; { + meta = { description = "A brand new release of the Djbdns"; longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://pjp.dgplug.org/ndjbdns/; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } |