Skip to content

Commit

Permalink
Add a config.nix to patch nixpkgs with local changes (1st change: wor…
Browse files Browse the repository at this point in the history
…karound nmap/nmap#34 )
  • Loading branch information
Dario Bertini committed Apr 11, 2015
1 parent 419527f commit 5fea798
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 2 additions & 1 deletion deploy.py
Expand Up @@ -100,7 +100,8 @@ def copy_ghciconf(src, target):
['ghci.conf', '.ghci', path.join(appdata, 'ghc', 'ghci.conf'), copy_ghciconf], ['ghci.conf', '.ghci', path.join(appdata, 'ghc', 'ghci.conf'), copy_ghciconf],
['lighttable', path.join(appsupport or cfg_dir, 'LightTable', 'settings'), None, symlink], ['lighttable', path.join(appsupport or cfg_dir, 'LightTable', 'settings'), None, symlink],
['lein-profile.clj', path.join('.lein', 'profiles.clj'), None, symlink], ['lein-profile.clj', path.join('.lein', 'profiles.clj'), None, symlink],
['powershell.ps1', None, path.join(home, "Documents", "WindowsPowerShell", "profile.ps1"), symlink] ['powershell.ps1', None, path.join(home, "Documents", "WindowsPowerShell", "profile.ps1"), symlink],
['nixpkgs', '.nixpkgs', None, symlink]
] ]


dotfiles = map( dotfiles = map(
Expand Down
10 changes: 10 additions & 0 deletions nixpkgs/config.nix
@@ -0,0 +1,10 @@
{
packageOverrides = pkgs: rec {
libpcap = pkgs.stdenv.lib.overrideDerivation pkgs.libpcap (oldAttrs: {
src = pkgs.fetchurl {
url = "http://www.tcpdump.org/release/libpcap-1.4.0.tar.gz";
sha256 = "7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406";
};
});
};
}
2 changes: 1 addition & 1 deletion packages.nix
Expand Up @@ -57,6 +57,7 @@ with (import <nixpkgs> {}).pkgs;
gist gist


# pentest # pentest
nmap
net_snmp net_snmp
] ++ ] ++
(with (import <nixtrunk> {}); (with (import <nixtrunk> {});
Expand All @@ -65,5 +66,4 @@ with (import <nixpkgs> {}).pkgs;
haskellPackages.hoogleLocal haskellPackages.hoogleLocal
haskellngPackages.cabal2nix haskellngPackages.cabal2nix
iojs iojs
nmap
]) ])

0 comments on commit 5fea798

Please sign in to comment.