From 59ea00ac7bebde72ab6af9532606d4220e91d181 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <d@ennis.no>
Date: Thu, 30 Apr 2020 12:49:06 +0200
Subject: Revert "latest version of filebin requires go1.13, which is newer
 than what ubuntu ships with"

This reverts commit ccb35625442e4455b3cfbe7b2fd72ac49ba47c56.

go1.13 is now included in Focal
---
 mkosi.build   | 11 ++---------
 mkosi.default |  1 +
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mkosi.build b/mkosi.build
index e7cf983..1956aa9 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,16 +1,9 @@
 #!/bin/sh
 
-export GOVER='1.13.6'
-export GOPATH="${SRCDIR}"
-export PATH="${PATH}:/usr/local/go/bin:${GOPATH}/bin"
-
-
 cd $SRCDIR
 mkdir src bin pkg
-wget "https://dl.google.com/go/go${GOVER}.linux-amd64.tar.gz"
-tar -C /usr/local -xzf "go${GOVER}.linux-amd64.tar.gz"
-rm "go${GOVER}.linux-amd64.tar.gz"
-go version
+export GOPATH="${SRCDIR}"
+export PATH="${PATH}:${GOPATH}/bin"
 go get -d github.com/espebra/filebin
 cd ${GOPATH}/src/github.com/espebra/filebin
 make get-deps
diff --git a/mkosi.default b/mkosi.default
index ba01ff6..791a710 100644
--- a/mkosi.default
+++ b/mkosi.default
@@ -13,6 +13,7 @@ WithNetwork=yes
 BuildPackages=
     unattended-upgrades
     git
+    golang
     make
 Packages=
     iputils-ping
-- 
cgit v1.2.3