diff options
| -rw-r--r-- | collections/aszlig.nix | 15 | ||||
| -rw-r--r-- | envs/default.nix | 1 |
2 files changed, 15 insertions, 1 deletions
diff --git a/collections/aszlig.nix b/collections/aszlig.nix index 21f997aa..7a740411 100644 --- a/collections/aszlig.nix +++ b/collections/aszlig.nix @@ -20,6 +20,7 @@ with pkgs; ]; python = with pythonPackages; [ + hetzner pep8 polib pkgs.python @@ -43,6 +44,7 @@ with pkgs; mmv mutt ncdu + openssl p7zip rlwrap screen @@ -54,6 +56,8 @@ with pkgs; ]; multimedia = [ + ffmpeg + flac miro mp3info mpg321 @@ -72,12 +76,16 @@ with pkgs; ]; dev = [ + erlang + gcc gdb + gitAndTools.hub gitFull gnumake - gitAndTools.hub + haxe ltrace manpages + neko nix-repl nixpkgs-lint posix_man_pages @@ -91,9 +99,12 @@ with pkgs; jwhois mtr netrw + nixops nmap samplicator socat + telnet + wireshark ]; x11 = [ @@ -105,6 +116,7 @@ with pkgs; ]; misc = [ + axbo (chromiumBeta.override { enablePepperFlash = true; }) @@ -116,6 +128,7 @@ with pkgs; imagemagick lastwatch rtorrent + sqlite youtubeDL ]; } diff --git a/envs/default.nix b/envs/default.nix index 7ec40e8f..730e82cc 100644 --- a/envs/default.nix +++ b/envs/default.nix @@ -13,6 +13,7 @@ with pkgs; }; collection = import ../collections/aszlig.nix pkgs; in lib.mapAttrsToList genAszligEnv collection; + ignoreCollisions = true; }; catapultEnv = myEnvFun { |