diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-14 01:51:36 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-14 01:51:36 +0100 |
| commit | 773a67a983cbe1928da6c524db24a25229a6f5fe (patch) | |
| tree | 2a00ed5a39f85b837578625cf49d193f4d308f14 /lass/5pkgs/default.nix | |
| parent | a0fbe917ac45cda4de0f16bced3ce3ebfc556fe8 (diff) | |
| parent | e7d22252dcad25fd5594e9a431f5a39aa620906d (diff) | |
Merge remote-tracking branch 'cloudkrebs/master' into pre-merge
Diffstat (limited to 'lass/5pkgs/default.nix')
| -rw-r--r-- | lass/5pkgs/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 869f808ce..2b9582912 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -5,14 +5,13 @@ let in rec { - bitlbee-dev = callPackage ./bitlbee-dev.nix {}; - bitlbee-steam = callPackage ./bitlbee-steam.nix { inherit bitlbee-dev; }; - bitlbee = callPackage ./bitlbee.nix { inherit bitlbee-steam; }; firefoxPlugins = { noscript = callPackage ./firefoxPlugins/noscript.nix {}; ublock = callPackage ./firefoxPlugins/ublock.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; }; - go = callPackage ./go/default.nix {}; newsbot-js = callPackage ./newsbot-js/default.nix {}; + xmonad-lass = + let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in + pkgs.haskellPackages.callPackage src {}; } |