mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
tinygo: 0.13.1 -> 0.16.0
And enable microcontroller targets. Works for me for microbit.
This commit is contained in:
parent
da89a252ca
commit
b996c8d335
|
@ -6,13 +6,14 @@ let main = ./main.go;
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "tinygo";
|
pname = "tinygo";
|
||||||
version = "0.13.1";
|
version = "0.16.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tinygo-org";
|
owner = "tinygo-org";
|
||||||
repo = "tinygo";
|
repo = "tinygo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v";
|
sha256 = "063aszbsnr0myq56kms1slmrfs7m4nmg0zgh2p66lxdsifrfly7j";
|
||||||
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
overrideModAttrs = (_: {
|
overrideModAttrs = (_: {
|
||||||
|
@ -21,15 +22,23 @@ buildGoModule rec {
|
||||||
rm -rf *
|
rm -rf *
|
||||||
cp ${main} main.go
|
cp ${main} main.go
|
||||||
cp ${gomod} go.mod
|
cp ${gomod} go.mod
|
||||||
|
chmod +w go.mod
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
preBuild = "cp ${gomod} go.mod";
|
preBuild = "cp ${gomod} go.mod";
|
||||||
|
|
||||||
vendorSha256 = "19194dlzpl6zzw2gqybma5pwip71rw8z937f104k6c158qzzgy62";
|
postBuild = "make gen-device";
|
||||||
|
|
||||||
|
vendorSha256 = "12k2gin0v7aqz5543m12yhifc0xsz26qyqra5l4c68xizvzcvkxb";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
prePatch = ''
|
||||||
|
sed -i s/', "-nostdlibinc"'// builder/builtins.go
|
||||||
|
sed -i s/'"-nostdlibinc", '// compileopts/config.go builder/picolibc.go
|
||||||
|
'';
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
buildInputs = [ llvm clang-unwrapped makeWrapper ];
|
buildInputs = [ llvm clang-unwrapped makeWrapper ];
|
||||||
propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
|
propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
|
||||||
|
@ -37,7 +46,11 @@ buildGoModule rec {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $out/share/tinygo
|
mkdir -p $out/share/tinygo
|
||||||
cp -a lib src targets $out/share/tinygo
|
cp -a lib src targets $out/share/tinygo
|
||||||
wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo"
|
wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo" \
|
||||||
|
--prefix "PATH" : "$out/libexec/tinygo"
|
||||||
|
mkdir -p $out/libexec/tinygo
|
||||||
|
ln -s ${clang-unwrapped}/bin/clang $out/libexec/tinygo/clang-10
|
||||||
|
ln -s ${lld}/bin/lld $out/libexec/tinygo/ld.lld-10
|
||||||
ln -sf $out/bin $out/share/tinygo
|
ln -sf $out/bin $out/share/tinygo
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
module github.com/tinygo-org/tinygo
|
module github.com/tinygo-org/tinygo
|
||||||
|
|
||||||
go 1.14
|
go 1.11
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
|
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
|
||||||
|
github.com/chromedp/cdproto v0.0.0-20200709115526-d1f6fc58448b
|
||||||
|
github.com/chromedp/chromedp v0.5.4-0.20200303084119-2bb39134ab9e
|
||||||
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
|
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
|
||||||
github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46
|
github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892
|
||||||
go.bug.st/serial v1.0.0
|
go.bug.st/serial v1.0.0
|
||||||
golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a
|
golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2
|
||||||
google.golang.org/appengine v1.4.0
|
tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9
|
||||||
tinygo.org/x/go-llvm v0.0.0-20200401165421-8d120882fc7a
|
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue