Make it so that ob run will work without the thunk unpacked, fix the cabal dependencies, and update the toy-datalog thunk to latest.
This commit is contained in:
parent
f11d74147d
commit
f7dc1f551b
@ -15,9 +15,12 @@
|
|||||||
}
|
}
|
||||||
}:
|
}:
|
||||||
with obelisk;
|
with obelisk;
|
||||||
project ./. ({ ... }: {
|
project ./. ({ hackGet, ... }: {
|
||||||
android.applicationId = "systems.obsidian.obelisk.examples.minimal";
|
android.applicationId = "systems.obsidian.obelisk.examples.minimal";
|
||||||
android.displayName = "Obelisk Minimal Example";
|
android.displayName = "Obelisk Minimal Example";
|
||||||
ios.bundleIdentifier = "systems.obsidian.obelisk.examples.minimal";
|
ios.bundleIdentifier = "systems.obsidian.obelisk.examples.minimal";
|
||||||
ios.bundleName = "Obelisk Minimal Example";
|
ios.bundleName = "Obelisk Minimal Example";
|
||||||
|
overrides = self: super: {
|
||||||
|
toy-datalog = self.callCabal2nix "toy-datalog" (hackGet ./dep/toy-datalog) {};
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"url": "https://code.obsidian.systems/cale/toy-datalog.git",
|
"url": "ssh://git@code.obsidian.systems/cale/toy-datalog.git",
|
||||||
"rev": "c09e07042b633c64021c10aac0258cc117d289cc",
|
"rev": "f2161013e4f02daa2c92b32098422f8de0c53bc3",
|
||||||
"sha256": "1fl7b5iqk02i97sdpsfpp698mj4gp9hkmzamycv9jacvq7zq1k5y",
|
"sha256": "1dg6jldxgrfb89ny02wjkaxj5y6wpcs0d84dgynnavpm0w8iv0rq",
|
||||||
"private": false,
|
"private": false,
|
||||||
"fetchSubmodules": false,
|
"fetchSubmodules": false,
|
||||||
"branch": "master"
|
"branch": "master"
|
||||||
|
|||||||
@ -7,8 +7,10 @@ library
|
|||||||
hs-source-dirs: src
|
hs-source-dirs: src
|
||||||
build-depends: base
|
build-depends: base
|
||||||
, common
|
, common
|
||||||
|
, containers
|
||||||
, jsaddle
|
, jsaddle
|
||||||
, lens
|
, lens
|
||||||
|
, megaparsec
|
||||||
, obelisk-executable-config-lookup
|
, obelisk-executable-config-lookup
|
||||||
, obelisk-frontend
|
, obelisk-frontend
|
||||||
, obelisk-generated-static
|
, obelisk-generated-static
|
||||||
@ -36,10 +38,16 @@ executable frontend
|
|||||||
hs-source-dirs: src-bin
|
hs-source-dirs: src-bin
|
||||||
build-depends: base
|
build-depends: base
|
||||||
, common
|
, common
|
||||||
, frontend
|
, containers
|
||||||
|
, jsaddle
|
||||||
|
, lens
|
||||||
|
, megaparsec
|
||||||
|
, obelisk-executable-config-lookup
|
||||||
, obelisk-frontend
|
, obelisk-frontend
|
||||||
|
, obelisk-generated-static
|
||||||
, obelisk-route
|
, obelisk-route
|
||||||
, reflex-dom
|
, reflex-dom-core
|
||||||
|
, text
|
||||||
, toy-datalog
|
, toy-datalog
|
||||||
default-extensions:
|
default-extensions:
|
||||||
ImportQualifiedPost,
|
ImportQualifiedPost,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user