move to unstable

This commit is contained in:
Sean Buckley 2021-10-06 00:16:18 -04:00
parent ce51889ba4
commit cd65afa7e7
3 changed files with 13 additions and 32 deletions

View file

@ -16,28 +16,6 @@
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1633351077, "lastModified": 1633351077,
"narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=", "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=",
@ -51,6 +29,12 @@
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
},
"root": {
"inputs": {
"impermanence": "impermanence",
"nixpkgs": "nixpkgs"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -1,9 +1,8 @@
{ {
inputs.nixpkgs.url = "nixpkgs/nixos-21.05"; inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
inputs.unstable.url = "nixpkgs/nixos-unstable";
inputs.impermanence.url = "github:nix-community/impermanence"; inputs.impermanence.url = "github:nix-community/impermanence";
outputs = { self, nixpkgs, unstable, impermanence, ... }: outputs = { self, nixpkgs, impermanence, ... }:
let let
mypkgs = pkgs: mypkgs = pkgs:
{ {
@ -17,7 +16,6 @@
{ {
security-toolbox = pkgs.callPackage ./pkgs/security-toolbox { security-toolbox = pkgs.callPackage ./pkgs/security-toolbox {
pkgs = pkgs // self.packages.${pkgs.system}; pkgs = pkgs // self.packages.${pkgs.system};
unstable = unstable.legacyPackages.${pkgs.system};
}; };
} }
// (if pkgs.system != "x86_64-linux" then { } else // (if pkgs.system != "x86_64-linux" then { } else
@ -43,7 +41,7 @@
nixosConfigurations = self.lib.getHosts { nixosConfigurations = self.lib.getHosts {
path = ./hosts; path = ./hosts;
inherit nixpkgs unstable; inherit nixpkgs;
inherit (self) nixosModule; inherit (self) nixosModule;
}; };

View file

@ -1,4 +1,4 @@
{ pkgs, unstable }: { pkgs }:
let let
proxybrowser = pkgs.writeShellScriptBin "proxybrowser" '' proxybrowser = pkgs.writeShellScriptBin "proxybrowser" ''
@ -28,12 +28,14 @@ pkgs.symlinkJoin {
dhcpdump dhcpdump
dirb dirb
exiftool exiftool
exploitdb
gef gef
ghidra-bin ghidra-bin
gobuster gobuster
iptables-nftables-compat iptables-nftables-compat
macchanger macchanger
masscan masscan
metasploit
net-snmp net-snmp
nmap nmap
openvpn openvpn
@ -45,10 +47,7 @@ pkgs.symlinkJoin {
weevely weevely
wfuzz wfuzz
unstable.exploitdb
unstable.metasploit
(burpsuite.overrideAttrs (_: { meta = { }; })) (burpsuite.overrideAttrs (_: { meta = { }; }))
(unstable.postman.overrideAttrs (_: { meta = { }; })) (postman.overrideAttrs (_: { meta = { }; }))
]; ];
} }