From cd65afa7e70ef923aa78b187e64616e60fcc33f1 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 6 Oct 2021 00:16:18 -0400
Subject: [PATCH] move to unstable

---
 flake.lock                        | 28 ++++++----------------------
 flake.nix                         |  8 +++-----
 pkgs/security-toolbox/default.nix |  9 ++++-----
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6638b48..2ea47c4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,28 +16,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1633267966,
-        "narHash": "sha256-gFKvZ5AmV/dDTKXVxacPbXe4R0BsFpwtVaQxuIm2nnk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7daf35532d2d8bf5e6f7f962e6cd13a66d01a71d",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "impermanence": "impermanence",
-        "nixpkgs": "nixpkgs",
-        "unstable": "unstable"
-      }
-    },
-    "unstable": {
       "locked": {
         "lastModified": 1633351077,
         "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=",
@@ -51,6 +29,12 @@
         "ref": "nixos-unstable",
         "type": "indirect"
       }
+    },
+    "root": {
+      "inputs": {
+        "impermanence": "impermanence",
+        "nixpkgs": "nixpkgs"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 1afa9f1..0f4f1bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,8 @@
 {
-  inputs.nixpkgs.url = "nixpkgs/nixos-21.05";
-  inputs.unstable.url = "nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
   inputs.impermanence.url = "github:nix-community/impermanence";
 
-  outputs = { self, nixpkgs, unstable, impermanence, ... }:
+  outputs = { self, nixpkgs, impermanence, ... }:
     let
       mypkgs = pkgs:
         {
@@ -17,7 +16,6 @@
         {
           security-toolbox = pkgs.callPackage ./pkgs/security-toolbox {
             pkgs = pkgs // self.packages.${pkgs.system};
-            unstable = unstable.legacyPackages.${pkgs.system};
           };
         }
         // (if pkgs.system != "x86_64-linux" then { } else
@@ -43,7 +41,7 @@
 
       nixosConfigurations = self.lib.getHosts {
         path = ./hosts;
-        inherit nixpkgs unstable;
+        inherit nixpkgs;
         inherit (self) nixosModule;
       };
 
diff --git a/pkgs/security-toolbox/default.nix b/pkgs/security-toolbox/default.nix
index b26d6eb..85dbf23 100644
--- a/pkgs/security-toolbox/default.nix
+++ b/pkgs/security-toolbox/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, unstable }:
+{ pkgs }:
 let
 
   proxybrowser = pkgs.writeShellScriptBin "proxybrowser" ''
@@ -28,12 +28,14 @@ pkgs.symlinkJoin {
       dhcpdump
       dirb
       exiftool
+      exploitdb
       gef
       ghidra-bin
       gobuster
       iptables-nftables-compat
       macchanger
       masscan
+      metasploit
       net-snmp
       nmap
       openvpn
@@ -45,10 +47,7 @@ pkgs.symlinkJoin {
       weevely
       wfuzz
 
-      unstable.exploitdb
-      unstable.metasploit
-
       (burpsuite.overrideAttrs (_: { meta = { }; }))
-      (unstable.postman.overrideAttrs (_: { meta = { }; }))
+      (postman.overrideAttrs (_: { meta = { }; }))
     ];
 }