git.iko.soy/obelisk
on master help sign in
Allow skeleton's obelisk to be overridden and fix release.nix (#420)

* Allow skeleton's obelisk to be overridden and fix release.nix * Accept android sdk license for hydra

commit4e3d5d3593272de9adafe52a2d5c1d79ee30b85b authorAli Abrar <aliabrar@gmail.com> dateFri 3 May 2019, 20:56 (7 years ago) parentb3dea93
3 files changed+23−14
compare with master
unifiedsplit
ChangeLog.md+1 release.nix+13−5 skeleton/default.nix+9−9
ChangeLog.md+1
@@ -9,6 +9,7 @@ This project's release branch is `master`. This log is written from the perspect
99* Add `COMPLETE` pragma to `(:/)`. Using this pattern synonym should no longer generate spurious warnings about non-exhaustive pattern matching.
1010* Make asset path hashing strict (see `Obelisk.Asset.Gather`)
1111* Add the `ob shell` command to enter a nix shell for an obelisk project
12+* Allow skeleton's obelisk to be overridden. This changes the skeleton's default.nix interface: the arguments that it used to take are now part of the new "obelisk" argument.
1213
1314## v0.1.0.0 - 2019-03-29
1415
release.nix+13−5
@@ -1,4 +1,5 @@
1−{ local-self ? import ./. {}
1+{ self-args ? {}
2+, local-self ? import ./. self-args
23}:
34
45let
@@ -59,17 +60,24 @@ let
5960 (concatDepends ghcjs)
6061 ];
6162 command = local-self.command;
62− serverExeSkeleton = (import ./skeleton {}).exe;
63− builtSkeleton = (import ./skeleton {}).all;
63+ serverExeSkeleton = (import ./skeleton { obelisk = local-self; }).exe;
64+ androidSkeleton = (import ./skeleton { obelisk = local-self; }).android.frontend;
65+ iosObelisk = import ./. (self-args // {
66+ system = "x86_64-darwin";
67+ iosSdkVersion = "10.2";
68+ });
69+ iosSkeleton = (import ./skeleton { obelisk = iosObelisk; }).ios.frontend;
6470 in {
6571 inherit
6672 command
6773 ghc ghcjs
68− serverExeSkeleton builtSkeleton;
74+ serverExeSkeleton
75+ iosSkeleton
76+ androidSkeleton;
6977 cache = reflex-platform.pinBuildInputs
7078 "obelisk-${system}"
7179 cachePackages
72− [command serverExeSkeleton builtSkeleton];
80+ [command serverExeSkeleton iosSkeleton androidSkeleton];
7381 });
7482
7583 metaCache = local-self.pinBuildInputs
skeleton/default.nix+9−9
@@ -1,13 +1,13 @@
1−{ system ? builtins.currentSystem # TODO: Get rid of this system cruft
2−, iosSdkVersion ? "10.2"
1+{ obelisk ? import ./.obelisk/impl {
2+ system = builtins.currentSystem;
3+ iosSdkVersion = "10.2";
4+ # You must accept the Android Software Development Kit License Agreement at
5+ # https://developer.android.com/studio/terms in order to build Android apps.
6+ # Uncomment and set this to `true` to indicate your acceptance:
7+ # config.android_sdk.accept_license = false;
8+ }
39}:
4−with import ./.obelisk/impl {
5− inherit system iosSdkVersion;
6− # You must accept the Android Software Development Kit License Agreement at
7− # https://developer.android.com/studio/terms in order to build Android apps.
8− # Uncomment and set this to `true` to indicate your acceptance:
9− # config.android_sdk.accept_license = false;
10−};
10+with obelisk;
1111project ./. ({ ... }: {
1212 android.applicationId = "systems.obsidian.obelisk.examples.minimal";
1313 android.displayName = "Obelisk Minimal Example";