git.iko.soy/obelisk
on master help sign in
Merge pull request #235 from obsidiansystems/master-cache
c5e5e83Luigy Leon
default.nix+6−4
compare with master
unifiedsplit
@@ -91,9 +91,11 @@ let
91 in {
91 in {
92 # Dynamic linking with split objects dramatically increases startup time (about
92 # Dynamic linking with split objects dramatically increases startup time (about
93 # 0.5 seconds on a decent machine with SSD), so we do `justStaticExecutables`.
93 # 0.5 seconds on a decent machine with SSD), so we do `justStaticExecutables`.
94+ obelisk-command = haskellLib.overrideCabal
94− obelisk-command = (addOptparseApplicativeCompletionScripts "ob"
95+ (addOptparseApplicativeCompletionScripts "ob"
95− (haskellLib.justStaticExecutables super.obelisk-command)).overrideAttrs (drv: {
96+ (haskellLib.justStaticExecutables super.obelisk-command))
96− buildInputs = drv.buildInputs ++ [ pkgs.makeWrapper ];
97+ (drv: {
98+ buildTools = (drv.buildTools or []) ++ [ pkgs.buildPackages.makeWrapper ];
97 postFixup = ''
99 postFixup = ''
98 ${drv.postFixup or ""}
100 ${drv.postFixup or ""}
99 # Make `ob` reference its runtime dependencies.
101 # Make `ob` reference its runtime dependencies.
@@ -337,6 +339,6 @@ in rec {
337 obelisk = import (base + "/.obelisk/impl") {};
339 obelisk = import (base + "/.obelisk/impl") {};
338 };
340 };
339 haskellPackageSets = {
341 haskellPackageSets = {
340− inherit (reflex-platform) ghc;
342+ inherit (reflex-platform) ghc ghcjs;
341 };
343 };
342}
344}
release.nix+78−42
@@ -1,45 +1,81 @@
1{ local-self ? import ./. {}
1{ local-self ? import ./. {}
2−, local-pkgs ? local-self.nixpkgs
3}:
2}:
4
3
5−with local-pkgs.lib;
4+let
6−
5+ inherit (local-self.nixpkgs) lib runCommand nix;
6+
7−genAttrs [ "x86_64-linux" "x86_64-darwin" ] (system: {
7+ cacheBuildSystems = [ "x86_64-linux" "x86_64-darwin" ];
8+
9+ obeliskPackagesCommon = [
10+ "obelisk-frontend"
11+ "obelisk-route"
12+ "obelisk-executable-config"
13+ ];
14+
15+ obeliskPackagesBackend = obeliskPackagesCommon ++ [
16+ "obelisk-asset-manifest"
17+ "obelisk-asset-serve-snap"
18+ "obelisk-backend"
19+ "obelisk-cliapp"
20+ "obelisk-command"
21+ "obelisk-executable-config-inject"
22+ "obelisk-frontend"
23+ "obelisk-run"
24+ "obelisk-route"
25+ "obelisk-selftest"
26+ "obelisk-snap"
27+ "obelisk-snap-extras"
28+ ];
29+
30+ pnameToAttrs = pkgsSet: pnames:
31+ lib.listToAttrs (map
32+ (name: { inherit name; value = pkgsSet.${name}; })
33+ pnames);
34+
35+ concatDepends = let
36+ extractDeps = x: (x.override {
37+ mkDerivation = drv: {
38+ out = builtins.concatLists [
39+ (drv.buildDepends or [])
40+ (drv.libraryHaskellDepends or [])
41+ (drv.executableHaskellDepends or [])
42+ ];
43+ };
44+ }).out;
45+ in pkgAttrs: builtins.concatLists (map extractDeps (builtins.attrValues pkgAttrs));
46+
47+ perPlatform = lib.genAttrs cacheBuildSystems (system: let
8− inherit (import ./. { inherit system; }) command;
48+ obelisk = import ./. { inherit system; };
9− built-skeleton = (import ./skeleton { inherit system; }).all;
49+ reflex-platform = obelisk.reflex-platform;
10− tests = {
50+ ghc = pnameToAttrs
11− #TODO: Doesn't work; see discussion in https://www.pivotaltracker.com/story/show/157265140
51+ obelisk.haskellPackageSets.ghc
12− # ob-init = runCommand "ob-init" {
52+ obeliskPackagesBackend;
13− # nativeBuildInputs = [
53+ ghcjs = pnameToAttrs
54+ obelisk.haskellPackageSets.ghcjs
55+ obeliskPackagesCommon;
56+ cachePackages = builtins.concatLists [
57+ (builtins.attrValues ghc)
58+ (builtins.attrValues ghcjs)
59+ (concatDepends ghc)
60+ (concatDepends ghcjs)
61+ ];
62+ command = local-self.command;
63+ serverExeSkeleton = (import ./skeleton {}).exe;
64+ builtSkeleton = (import ./skeleton {}).all;
65+ in {
66+ inherit
14− # self.command
67+ command
15− # nix
68+ ghc ghcjs
16− # ];
69+ serverExeSkeleton builtSkeleton;
17− # } ''
70+ cache = reflex-platform.pinBuildInputs
18− # # mkdir $out
71+ "obelisk-${system}"
19− # # cd $out
72+ cachePackages
20− # # ob init --symlink=${self.path}
73+ [command serverExeSkeleton builtSkeleton];
21− #'';
74+ });
22−
75+
23− #TODO: Re-enable this
76+ metaCache = local-self.pinBuildInputs
24− #verify-migration = runCommand "verify-migration" {
25− # nativeBuildInputs = [
26− # self.command
27− # nix # obelisk uses `nix-hash`
28− # ];
29− #} ''
30− # set -e
31− # # Fix permissions so `removePathForcibly` works on copied-to-tmp paths
32− # cp -a ${self.pathGit} $TMPDIR/obelisk
33− # cd $TMPDIR/obelisk
77+ "obelisk-everywhere"
34− # chmod -R u+w .
78+ (map (a: a.cache) (builtins.attrValues perPlatform))
35− #
79+ [];
36− # (set -x;
80+
37− # ob internal hash;
81+in perPlatform // { inherit metaCache; }
38− # ob internal verify-migration;
39− # )
40− #
41− # mkdir -p $out
42− # touch $out/done
43− #'';
44− };
45−})