From 418fa3bb330af527e0d48e3f597a296a7d42c461 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Oct 2013 16:01:27 -0400 Subject: [PATCH] D'oh Signed-off-by: Shea Levy --- nixos/modules/module-list.nix | 2 +- nixos/modules/programs/gurobi.nix | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ff272ffea9b..a2e1abf036b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -35,7 +35,6 @@ ./misc/assertions.nix ./misc/check-config.nix ./misc/crashdump.nix - ./misc/gurobi.nix ./misc/ids.nix ./misc/lib.nix ./misc/locate.nix @@ -120,6 +119,7 @@ ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/gpsd.nix + ./services/misc/gurobi.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix ./services/misc/nixos-manual.nix diff --git a/nixos/modules/programs/gurobi.nix b/nixos/modules/programs/gurobi.nix index 4c673a96db0..7fa099b0884 100644 --- a/nixos/modules/programs/gurobi.nix +++ b/nixos/modules/programs/gurobi.nix @@ -23,21 +23,21 @@ in { type = types.nullOr types.string; }; }; + }; - config = mkIf (cfg.license != null || cfg.tokenServerAddress != null) { - assertions = [ { - assertion = cfg.license == null || cfg.tokenServerAddress == null; - message = "Please only set one of a gurobi license file and a gurobi token server address"; - } ]; + config = mkIf (cfg.license != null || cfg.tokenServerAddress != null) { + assertions = [ { + assertion = cfg.license == null || cfg.tokenServerAddress == null; + message = "Please only set one of a gurobi license file and a gurobi token server address"; + } ]; - environment.variables.GRB_LICENSE_FILE = if cfg.license != null - then cfg.license - else pkgs.writeTextFile { - name = "gurobi-generated-license"; - text = "TOKENSERVER=${cfg.tokenServerAddress}"; - }; + environment.variables.GRB_LICENSE_FILE = if cfg.license != null + then cfg.license + else pkgs.writeTextFile { + name = "gurobi-generated-license"; + text = "TOKENSERVER=${cfg.tokenServerAddress}"; + }; - environment.systemPackages = [ pkgs.gurobi ]; - }; + environment.systemPackages = [ pkgs.gurobi ]; }; }