diff options
author | tv <tv@krebsco.de> | 2017-10-03 18:48:18 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-10-03 18:48:18 +0200 |
commit | d567c2c21e0fe029a069edda8eda28cd24771511 (patch) | |
tree | bcc1ea51b71b22c18ac653a1b4aded927e6c173e /lass/5pkgs/default.nix | |
parent | 32a8fc0396769946242ef8c1a48fb64ae572e0db (diff) | |
parent | 902a65304d1e07ce5a7192a0403d6fa1bed1f135 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/5pkgs/default.nix')
-rw-r--r-- | lass/5pkgs/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 46633ba1a..d04833255 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -4,9 +4,6 @@ nixpkgs.config.packageOverrides = rec { acronym = pkgs.callPackage ./acronym/default.nix {}; dpass = pkgs.callPackage ./dpass {}; - ejabberd = pkgs.callPackage ./ejabberd { - erlang = pkgs.erlangR16; - }; firefoxPlugins = { noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {}; ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {}; |