Skip to content

Commit

Permalink
Checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
luigy committed May 9, 2022
1 parent 587ba07 commit df66d64
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ nixpkgsFunc ? import ./nixpkgs
, system ? builtins.currentSystem
, config ? {}
, config ? { android_sdk.accept_license = true; }
, enableLibraryProfiling ? false
, enableExposeAllUnfoldings ? true
, enableTraceReflexEvents ? false
Expand Down
4 changes: 3 additions & 1 deletion haskell-overlays/reflex-packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ in
])) {})
(drv: {
# TODO: Get hlint working for cross-compilation
doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
# doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
doCheck = false; # stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);

# The headless browser run as part of the tests will exit without this
preBuild = (drv.preBuild or "") + ''
Expand Down Expand Up @@ -99,6 +100,7 @@ in
useTemplateHaskellFlag
])) {})
(drv: {
doCheck = false;
# Hack until https://github.com/NixOS/cabal2nix/pull/432 lands
libraryHaskellDepends = (drv.libraryHaskellDepends or [])
++ stdenv.lib.optionals (with stdenv.hostPlatform; isAndroid && is32bit) [
Expand Down
8 changes: 8 additions & 0 deletions haskell-overlays/reflex-packages/dep/reflex-dom/git.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"url": "ssh://[email protected]/lodewallet/reflex-dom.git",
"rev": "4cb50b696af3570218f14238d3170dfa93ab10d9",
"sha256": "192bb2cqdq6xwr8xsfg5j4adi2i878yjy8vwdn8yr32d51kvsv60",
"private": true,
"fetchSubmodules": false,
"branch": "webview-experiments"
}
8 changes: 0 additions & 8 deletions haskell-overlays/reflex-packages/dep/reflex-dom/github.json

This file was deleted.

17 changes: 11 additions & 6 deletions haskell-overlays/reflex-packages/dep/reflex-dom/thunk.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# DO NOT HAND-EDIT THIS FILE
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
if !fetchSubmodules && !private then builtins.fetchTarball {
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
} else (import <nixpkgs> {}).fetchFromGitHub {
inherit owner repo rev sha256 fetchSubmodules private;
let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:
let realUrl = let firstChar = builtins.substring 0 1 url; in
if firstChar == "/" then /. + url
else if firstChar == "." then ./. + url
else url;
in if !fetchSubmodules && private then builtins.fetchGit {
url = realUrl; inherit rev;
${if branch == null then null else "ref"} = branch;
} else (import <nixpkgs> {}).fetchgit {
url = realUrl; inherit rev sha256;
};
json = builtins.fromJSON (builtins.readFile ./github.json);
json = builtins.fromJSON (builtins.readFile ./git.json);
in fetch json

0 comments on commit df66d64

Please sign in to comment.