diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-24 20:31:44 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-25 17:35:21 +0100 |
commit | 9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef (patch) | |
tree | 6e5795908883df8f42e0f4491091347ebf8667e4 /pkgs/tools/networking/hans/default.nix | |
parent | 7b6454cbb959e001a1e421d6cc00a00994fb7518 (diff) | |
download | nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.tar nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.tar.gz nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.tar.bz2 nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.tar.lz nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.tar.xz nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.tar.zst nixlib-9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef.zip |
Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right direction. Removes the deprecated meta.version, and move some meta sections to the end of the file where I should have put them in the first place.
Diffstat (limited to 'pkgs/tools/networking/hans/default.nix')
-rw-r--r-- | pkgs/tools/networking/hans/default.nix | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index aecc0bb63fa3..0e838a896cb2 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, nettools }: -let version = "0.4.4"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "hans-${version}"; + version = "0.4.4"; src = fetchFromGitHub { sha256 = "1xskffmmdmg1whlrl5wpkv9z29vh0igrbmsz0b45s9v0761a7kis"; @@ -11,8 +11,19 @@ stdenv.mkDerivation { owner = "friedrich"; }; + buildInputs = [ nettools ]; + + postPatch = '' + substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -D -m0755 hans $out/bin/hans + ''; + meta = with stdenv.lib; { - inherit version; description = "Tunnel IPv4 over ICMP"; longDescription = '' Hans makes it possible to tunnel IPv4 through ICMP echo packets, so you @@ -25,16 +36,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ nettools ]; - - postPatch = '' - substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -D -m0755 hans $out/bin/hans - ''; } |