summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-21 17:18:23 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-21 17:18:23 +0200
commitfc9ed81381f5501e858b03268f8a07ee354b80a4 (patch)
tree034ed06cf37cafae2b6ec859eacd72b21660cf8d
parent9f7e8810e661a3ed1cfc533730e10a3c15f3ab35 (diff)
downloadnixos-fc9ed81381f5501e858b03268f8a07ee354b80a4.tar
nixos-fc9ed81381f5501e858b03268f8a07ee354b80a4.tar.gz
nixos-fc9ed81381f5501e858b03268f8a07ee354b80a4.tar.bz2
nixos-fc9ed81381f5501e858b03268f8a07ee354b80a4.tar.xz
nixos-fc9ed81381f5501e858b03268f8a07ee354b80a4.zip
scope fix
-rw-r--r--bragi.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/bragi.nix b/bragi.nix
index e07d1789..0d6f52c6 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -1,6 +1,8 @@
1{ config, pkgs, ... }: 1{ config, pkgs, ... }:
2 2
3{ 3let
4 trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out;
5in {
4 imports = 6 imports =
5 [ 7 [
6 ./bragi-hw.nix 8 ./bragi-hw.nix
@@ -21,9 +23,7 @@
21 networking.wireless.enable = true; 23 networking.wireless.enable = true;
22 24
23 nixpkgs.config.packageOverrides = pkgs: 25 nixpkgs.config.packageOverrides = pkgs:
24 let 26 rec {
25 trivmixService = opts: (pkgs.callPackage ./custom/trivmix-service.nix opts).out;
26 in rec {
27 customizedHaskellPackages = pkgs.recurseIntoAttrs ( 27 customizedHaskellPackages = pkgs.recurseIntoAttrs (
28 pkgs.haskellPackages.override { 28 pkgs.haskellPackages.override {
29 extensios = self: super: let 29 extensios = self: super: let