From 8bd653d07aea315941f51bc586501ca2ce3d8495 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Thu, 22 Aug 2024 13:23:52 -0400 Subject: [PATCH 1/2] modify some scripts to enable support for nix --- peering | 2 +- scripts/peering-app | 2 +- scripts/peering-bgp | 2 +- scripts/peering-openvpn | 2 +- scripts/peering-prefix | 2 +- scripts/peering-proxy | 2 +- shell.nix | 11 +++++++++++ 7 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 shell.nix diff --git a/peering b/peering index 98e4251..4db9f38 100755 --- a/peering +++ b/peering @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu progdir=$(cd "$(dirname "$0")" && pwd -P) diff --git a/scripts/peering-app b/scripts/peering-app index e1c43c8..a3bd006 100755 --- a/scripts/peering-app +++ b/scripts/peering-app @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu usage () { diff --git a/scripts/peering-bgp b/scripts/peering-bgp index a98caef..c1c2748 100755 --- a/scripts/peering-bgp +++ b/scripts/peering-bgp @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu usage () { diff --git a/scripts/peering-openvpn b/scripts/peering-openvpn index 019ddbf..0d8e530 100755 --- a/scripts/peering-openvpn +++ b/scripts/peering-openvpn @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu usage () { diff --git a/scripts/peering-prefix b/scripts/peering-prefix index 32c0182..cc10a30 100755 --- a/scripts/peering-prefix +++ b/scripts/peering-prefix @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu # program=$(basename $0) diff --git a/scripts/peering-proxy b/scripts/peering-proxy index d34dbfc..ecff16a 100755 --- a/scripts/peering-proxy +++ b/scripts/peering-proxy @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eu usage () { diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..6a7491a --- /dev/null +++ b/shell.nix @@ -0,0 +1,11 @@ +{ pkgs ? import {}}: + +pkgs.mkShell { + buildInputs = with pkgs; [ + bird + openvpn + socat + psmisc + ipcalc + ]; +} From 9f3970e7c2480b3a12fac1f5b212550d9f6dbd64 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Sat, 24 Aug 2024 01:28:31 -0400 Subject: [PATCH 2/2] use bird2 --- shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index 6a7491a..3cb6995 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,7 @@ pkgs.mkShell { buildInputs = with pkgs; [ - bird + bird2 openvpn socat psmisc