File tree 1 file changed +33
-3
lines changed
1 file changed +33
-3
lines changed Original file line number Diff line number Diff line change 26
26
channel = "nightly" ;
27
27
date = "2020-07-27" ;
28
28
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 ; } ;
30
33
31
34
dhall = import easy-dhall-nix { inherit pkgs ; } ;
32
35
dhall-lang-pkg = import dhall-lang { inherit pkgs ; } ;
33
- olin-cwa = import olin { } ;
34
-
36
+ olin-cwa = import olin { inherit pkgs ; } ;
35
37
36
38
olin-spec = import ./olin-spec {
37
39
inherit dhall-lang pkgs ;
76
78
77
79
for f in ${ olin-pkg } /bin/*
78
80
do
81
+ <<<<<<< HEAD
79
82
cp "$f" "$out/wasm/$(basename $f)"
83
+ =======
84
+ cp "$f" "$out/wasm/$(basename $f)".wasm
85
+ >>>>>>> main
80
86
done
81
87
82
88
cp -rf ${ olin-cwa } /wasm/zig $out/wasm/zig
91
97
'' ;
92
98
} ;
93
99
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
94
120
packages . x86_64-linux . docker = let
95
121
img = pkgs . dockerTools . buildLayeredImage {
96
122
name = "xena/pahi" ;
97
123
tag = "latest" ;
98
124
99
125
contents = [ self . defaultPackage . x86_64-linux # pahi
100
126
pkgs . bash pkgs . coreutils pkgs . cacert pkgs . hyperfine
127
+ <<<<<<< HEAD
101
128
dhall . dhall-json-simple dhall-lang ] ;
129
+ =======
130
+ dhall . dhall-json-simple ] ;
131
+ >>>>>>> main
102
132
103
133
config = {
104
134
Cmd = [ "/bin/bash" ] ;
You can’t perform that action at this time.
0 commit comments