git.iko.soy/obelisk
on master help sign in
Bump reflex to reunification branch
0c2fc3eMatthew Bauer
default.nix+1−1
compare with master
unifiedsplit
@@ -114,7 +114,7 @@ let
114 obelisk-asset-serve-snap = self.callCabal2nix "obelisk-asset-serve-snap" (hackGet ./lib/asset + "/serve-snap") {};
114 obelisk-asset-serve-snap = self.callCabal2nix "obelisk-asset-serve-snap" (hackGet ./lib/asset + "/serve-snap") {};
115 obelisk-backend = self.callCabal2nix "obelisk-backend" (cleanSource ./lib/backend) {};
115 obelisk-backend = self.callCabal2nix "obelisk-backend" (cleanSource ./lib/backend) {};
116 obelisk-cliapp = self.callCabal2nix "obelisk-cliapp" (cleanSource ./lib/cliapp) {};
116 obelisk-cliapp = self.callCabal2nix "obelisk-cliapp" (cleanSource ./lib/cliapp) {};
117− obelisk-command = (self.callCabal2nix "obelisk-command" (cleanSource ./lib/command) {}).override { Cabal = super.Cabal_2_0_0_2; };
117+ obelisk-command = (self.callCabal2nix "obelisk-command" (cleanSource ./lib/command) {});
118 obelisk-executable-config = executableConfig.haskellPackage self;
118 obelisk-executable-config = executableConfig.haskellPackage self;
119 obelisk-executable-config-inject = executableConfig.platforms.web.inject self; # TODO handle platforms.{ios,android}
119 obelisk-executable-config-inject = executableConfig.platforms.web.inject self; # TODO handle platforms.{ios,android}
120 obelisk-migration = self.callCabal2nix "obelisk-migration" (cleanSource ./lib/migration) {};
120 obelisk-migration = self.callCabal2nix "obelisk-migration" (cleanSource ./lib/migration) {};
dep/reflex-platform/github.json+3−3
@@ -1,7 +1,7 @@
1{
1{
2 "owner": "reflex-frp",
2 "owner": "reflex-frp",
3 "repo": "reflex-platform",
3 "repo": "reflex-platform",
4− "branch": "develop",
4+ "branch": "reunification",
5− "rev": "a4d679629b52f80ecae857864591d79d902a5c5d",
5+ "rev": "7f31ba5a8de7330366fa8201d1865e27a832f064",
6− "sha256": "1p34qc3ryar81jh01g4jm0svr05yri83vlswm2jbxiabigy47652"
6+ "sha256": "02jpwp7065aqxfqggkfykdcavx5g838lv9xac725ls4nb17nwg8x"
7}
7}