Skip to content

Commit b32070e

Browse files
support pure evaluation
This consists of two changes: 1. Use rustChannelOf instead of rustChannelOfTargets to supply a sha256 (required for pure eval) 2. Inherit pkgs in olin. Olin is *almost* pure, pending Xe/olin#135.
2 parents 5e24444 + d34411f commit b32070e

File tree

1 file changed

+33
-3
lines changed

1 file changed

+33
-3
lines changed

flake.nix

+33-3
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@
2626
channel = "nightly";
2727
date = "2020-07-27";
2828
targets = [ "wasm32-unknown-unknown" "wasm32-wasi" ];
29-
in mozilla.rustChannelOfTargets channel date targets;
29+
in (mozilla.rustChannelOf {
30+
inherit channel date;
31+
sha256 = "sha256-75eK1CNDEkeVvJ1phWOHZBuujMhalYCxbi5sgAFUlvI=";
32+
}).rust.override { inherit targets; };
3033

3134
dhall = import easy-dhall-nix { inherit pkgs; };
3235
dhall-lang-pkg = import dhall-lang { inherit pkgs; };
33-
olin-cwa = import olin { };
34-
36+
olin-cwa = import olin { inherit pkgs; };
3537

3638
olin-spec = import ./olin-spec {
3739
inherit dhall-lang pkgs;
@@ -76,7 +78,11 @@
7678
7779
for f in ${olin-pkg}/bin/*
7880
do
81+
<<<<<<< HEAD
7982
cp "$f" "$out/wasm/$(basename $f)"
83+
=======
84+
cp "$f" "$out/wasm/$(basename $f)".wasm
85+
>>>>>>> main
8086
done
8187
8288
cp -rf ${olin-cwa}/wasm/zig $out/wasm/zig
@@ -91,14 +97,38 @@
9197
'';
9298
};
9399

100+
<<<<<<< HEAD
101+
=======
102+
devShell.x86_64-linux = pkgs.mkShell {
103+
buildInputs = [
104+
rust
105+
106+
pkgs.hyperfine
107+
108+
pkgs.openssl
109+
pkgs.pkg-config
110+
111+
dhall-lang-pkg
112+
dhall
113+
114+
pkgs.go
115+
olin
116+
];
117+
};
118+
119+
>>>>>>> main
94120
packages.x86_64-linux.docker = let
95121
img = pkgs.dockerTools.buildLayeredImage {
96122
name = "xena/pahi";
97123
tag = "latest";
98124

99125
contents = [ self.defaultPackage.x86_64-linux # pahi
100126
pkgs.bash pkgs.coreutils pkgs.cacert pkgs.hyperfine
127+
<<<<<<< HEAD
101128
dhall.dhall-json-simple dhall-lang ];
129+
=======
130+
dhall.dhall-json-simple ];
131+
>>>>>>> main
102132

103133
config = {
104134
Cmd = [ "/bin/bash" ];

0 commit comments

Comments
 (0)