12ce323 · obelisk · git.iko.soy

git.iko.soy/obelisk

on master help sign in

Allow shellPackages to be configured by obelisk commands

12ce323Elliot Cameron7 years ago

default.nix+3−6

@@ -294,7 +294,8 @@ in rec {

294 ${self.commonName} = nullIfAbsent (self.base + "/common");

295 ${self.backendName} = nullIfAbsent (self.base + "/backend");

296 };

297+ shellPackages = {};

297− combinedPackages = self.predefinedPackages // self.userSettings.packages;

298+ combinedPackages = self.predefinedPackages // self.userSettings.packages // self.shellPackages;

298 projectOverrides = self': super': {

299 projectOverrides = self': super': {

299 ${self.staticName} = haskellLib.dontHaddock (self'.callCabal2nix self.staticName self.processedStatic.haskellManifest {});

300 ${self.staticName} = haskellLib.dontHaddock (self'.callCabal2nix self.staticName self.processedStatic.haskellManifest {});

300 ${self.backendName} = haskellLib.addBuildDepend super'.${self.backendName} self'.obelisk-run;

301 ${self.backendName} = haskellLib.addBuildDepend super'.${self.backendName} self'.obelisk-run;

@@ -323,11 +324,7 @@ in rec {

323 } // self.userSettings.ios;

324 } // self.userSettings.ios;

324 };

325 };

325

326

326− shells-ghc = [

327+ shells-ghc = builtins.attrNames self.shellPackages;

327− self.backendName

328− self.commonName

329− self.frontendName

330− ];

331

328

332 shells-ghcjs = [

329 shells-ghcjs = [

333 self.frontendName

330 self.frontendName