From 97cb51e4fb48c57169c491ca6fdf09461c35f7a5 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 10 Dec 2023 22:59:55 +0100
Subject: [PATCH] pkgs/nixos-firewall-tool: Remove package as it got upstreamed

---
 configuration/common/programs.nix             |  1 -
 flake.nix                                     |  1 -
 pkgs/nixos-firewall-tool/default.nix          | 10 ----
 .../nixos-firewall-tool.sh                    | 55 -------------------
 pkgs/overlay.nix                              |  1 -
 5 files changed, 68 deletions(-)
 delete mode 100644 pkgs/nixos-firewall-tool/default.nix
 delete mode 100755 pkgs/nixos-firewall-tool/nixos-firewall-tool.sh

diff --git a/configuration/common/programs.nix b/configuration/common/programs.nix
index d0e80cc..a10e7fc 100644
--- a/configuration/common/programs.nix
+++ b/configuration/common/programs.nix
@@ -10,7 +10,6 @@
     colmena
     vim
     agenix
-    nixos-firewall-tool
     nixfiles-system-upgrade
   ];
 
diff --git a/flake.nix b/flake.nix
index 380ac69..bff1ede 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,7 +117,6 @@
         nixfiles-system-upgrade
         nixfiles-updated-inputs
         nixfiles-update-ssh-host-keys
-        nixos-firewall-tool
         pyexcel-xlsx
         pyexcel-webio
         update-from-hydra
diff --git a/pkgs/nixos-firewall-tool/default.nix b/pkgs/nixos-firewall-tool/default.nix
deleted file mode 100644
index b225e93..0000000
--- a/pkgs/nixos-firewall-tool/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeShellApplication {
-  name = "nixos-firewall-tool";
-  text = builtins.readFile ./nixos-firewall-tool.sh;
-  runtimeInputs = with pkgs; [
-    iptables
-  ];
-}
-
diff --git a/pkgs/nixos-firewall-tool/nixos-firewall-tool.sh b/pkgs/nixos-firewall-tool/nixos-firewall-tool.sh
deleted file mode 100755
index 17e7ce8..0000000
--- a/pkgs/nixos-firewall-tool/nixos-firewall-tool.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-ip46tables() {
-  iptables -w "$@"
-  ip6tables -w "$@"
-
-}
-
-show_help() {
-    echo "nixos-firewall-tool"
-    echo ""
-    echo "Can temporarily manipulate the NixOS firewall"
-    echo ""
-    echo "Open TCP port:"
-    echo " nixos-firewall-tool open tcp 8888"
-    echo ""
-    echo "Show all firewall rules:"
-    echo " nixos-firewall-tool show"
-    echo ""
-    echo "Open UDP port:"
-    echo " nixos-firewall-tool open udp 51820"
-    echo ""
-    echo "Reset firewall configuration to system settings:"
-    echo " nixos-firewall-tool reset"
-}
-
-if [[ -z ${1+x} ]]; then
-  show_help
-  exit 1
-fi
-
-case $1 in
-  "open")
-    protocol="$2"
-    port="$3"
-
-    ip46tables -I nixos-fw -p "$protocol" --dport "$port" -j nixos-fw-accept
-  ;;
-  "show")
-    ip46tables --numeric --list nixos-fw
-  ;;
-  "reset")
-    systemctl restart firewall.service
-  ;;
-  -h|--help|help)
-    show_help
-    exit 0
-  ;;
-  *)
-    show_help
-    exit 1
-  ;;
-esac
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 8b366cb..52b4146 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -9,7 +9,6 @@ final: prev: {
   nixfiles-system-upgrade = final.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
   nixfiles-updated-inputs = final.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
   nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
-  nixos-firewall-tool = final.callPackage ./nixos-firewall-tool {};
   pyexcel-xlsx = final.python3.pkgs.callPackage ./pyexcel-xlsx {};
   pyexcel-webio = final.python3.pkgs.callPackage ./pyexcel-webio {};
   update-from-hydra = final.callPackage ./update-from-hydra {};