on master help sign in
Allow shellPackages to be configured by obelisk commands
commit12ce323fab7d1ae440c1954e377ed4b8df44ed57 authorElliot Cameron <eacameron@gmail.com> dateFri 24 Jan 2020, 00:34 (7 years ago) parent143f937
1 file changed+3−6
default.nix+3−6
default.nix+3−6
@@ -294,7 +294,8 @@ in rec {
294294 ${self.commonName} = nullIfAbsent (self.base + "/common");
295295 ${self.backendName} = nullIfAbsent (self.base + "/backend");
296296 };
297− combinedPackages = self.predefinedPackages // self.userSettings.packages;
297+ shellPackages = {};
298+ combinedPackages = self.predefinedPackages // self.userSettings.packages // self.shellPackages;
298299 projectOverrides = self': super': {
299300 ${self.staticName} = haskellLib.dontHaddock (self'.callCabal2nix self.staticName self.processedStatic.haskellManifest {});
300301 ${self.backendName} = haskellLib.addBuildDepend super'.${self.backendName} self'.obelisk-run;
@@ -323,11 +324,7 @@ in rec {
323324 } // self.userSettings.ios;
324325 };
325326
326− shells-ghc = [
327− self.backendName
328− self.commonName
329− self.frontendName
330− ];
327+ shells-ghc = builtins.attrNames self.shellPackages;
331328
332329 shells-ghcjs = [
333330 self.frontendName