ea07fc7 · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge pull request #742 from obsidiansystems/eac@use-dedupe

Enable dedupe in GHCJS

commitea07fc7f58412f5a2ecf7db1f1b91d04f6ae61e3 authorElliot Cameron <3noch@users.noreply.github.com> dateWed 20 May 2020, 10:39 (6 years ago) parentdb6b886 03d43c9

4 files changed+17−12

compare with master

unifiedsplit

dep/reflex-platform/default.nix+1−7 dep/reflex-platform/github.json+3−3 dep/reflex-platform/thunk.nix+9 skeleton/frontend/frontend.cabal+4−2

dep/reflex-platform/default.nix+1−7

@@ -1,8 +1,2 @@

11# DO NOT HAND-EDIT THIS FILE

2−let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:

3− if !fetchSubmodules && !private then builtins.fetchTarball {

4− url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;

5− } else (import <nixpkgs> {}).fetchFromGitHub {

6− inherit owner repo rev sha256 fetchSubmodules private;

7− };

8−in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))

2+import (import ./thunk.nix)

dep/reflex-platform/github.json+3−3

@@ -1,8 +1,8 @@

11{

22 "owner": "reflex-frp",

33 "repo": "reflex-platform",

4− "branch": "release/0.5.3.0",

4+ "branch": "develop",

55 "private": false,

6− "rev": "9779ea3b4c87fdc971057c561262696d5e9b1847",

7− "sha256": "0v87ilal9355xwz8y9m0zh14pm9c0f7pqch0854kkj92ybc5l62q"

6+ "rev": "c21ec7036c8351185cd2feef9ce577b6a61c4f22",

7+ "sha256": "0m4sdpz6qvngralpyprrbvsyi2zmfh2l3q5vhihwfp3842blvbfg"

88}

dep/reflex-platform/thunk.nixnew file+9

@@ -0,0 +1,9 @@

1+# DO NOT HAND-EDIT THIS FILE

2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:

3+ if !fetchSubmodules && !private then builtins.fetchTarball {

4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;

5+ } else (import <nixpkgs> {}).fetchFromGitHub {

6+ inherit owner repo rev sha256 fetchSubmodules private;

7+ };

8+ json = builtins.fromJSON (builtins.readFile ./github.json);

9+in fetch json

skeleton/frontend/frontend.cabal+4−2

@@ -28,7 +28,9 @@ executable frontend

2828 , reflex-dom

2929 , obelisk-generated-static

3030 , frontend

31− --TODO: Make these ghc-options optional

3231 ghc-options: -threaded

32+ if impl(ghcjs)

33+ ghc-options: -dedupe

34+ cpp-options: -DGHCJS_BROWSER

3335 if os(darwin)

34− ghc-options: -dynamic

36+ ghc-options: -dynamic