mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
ubridge: migrate to pkgs/by-name, format with nixfmt-rfc-style
This commit is contained in:
parent
25e07e7c53
commit
69ed950c46
@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, libpcap
|
||||
, testers
|
||||
, ubridge
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libpcap,
|
||||
testers,
|
||||
ubridge,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,14 +14,14 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "GNS3";
|
||||
repo = "ubridge";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Vo57Yw5E4AdUt9MFlFEcRcDkIDG3aQfISIzsC6E05kk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "/usr/local/bin" "$out/bin" \
|
||||
--replace "setcap" "#setcap"
|
||||
--replace-fail "/usr/local/bin" "$out/bin" \
|
||||
--replace-fail "setcap" "#setcap"
|
||||
'';
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
@ -34,11 +35,9 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = ubridge;
|
||||
command = "ubridge -v";
|
||||
};
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = ubridge;
|
||||
command = "ubridge -v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -48,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
various technologies. Currently bridging between UDP tunnels, Ethernet
|
||||
and TAP interfaces is supported. Packet capture is also supported.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/GNS3/ubridge";
|
||||
changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "ubridge";
|
@ -13306,8 +13306,6 @@ with pkgs;
|
||||
|
||||
ubpm = libsForQt5.callPackage ../applications/misc/ubpm { };
|
||||
|
||||
ubridge = callPackage ../tools/networking/ubridge { };
|
||||
|
||||
ubertooth = callPackage ../applications/radio/ubertooth { };
|
||||
|
||||
ucarp = callPackage ../servers/ucarp { };
|
||||
|
Loading…
Reference in New Issue
Block a user