aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2020-04-07 10:35:42 -0400
committerChristine Dodrill <me@christine.website>2020-04-07 10:35:42 -0400
commit9545fa3c6665dd321d157a0734f67583a9829f06 (patch)
tree8f77dbb56699156a21915a7f4a6ebffd24d4f6d4
parent590aabc5889c8be78ea45d7972495789ba310bc0 (diff)
downloadx-9545fa3c6665dd321d157a0734f67583a9829f06.tar.xz
x-9545fa3c6665dd321d157a0734f67583a9829f06.zip
add lorri
-rw-r--r--.envrc1
-rw-r--r--go.mod4
-rw-r--r--go.sum2
-rw-r--r--shell.nix14
4 files changed, 19 insertions, 2 deletions
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..be81fed
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+eval "$(lorri direnv)" \ No newline at end of file
diff --git a/go.mod b/go.mod
index e5f8ec1..8acfe1b 100644
--- a/go.mod
+++ b/go.mod
@@ -64,10 +64,10 @@ require (
github.com/xtaci/smux v1.5.7
github.com/yawning/bulb v0.0.0-20170405033506-85d80d893c3d // indirect
go4.org v0.0.0-20190313082347-94abd6928b1d
- golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
+ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
golang.org/x/exp/errors v0.0.0-20190510132918-efd6b22b2522
golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff // indirect
- golang.org/x/mod v0.1.0
+ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee
golang.org/x/net v0.0.0-20190923162816-aa69164e4478
golang.org/x/oauth2 v0.0.0-20190523182746-aaccbc9213b0
google.golang.org/appengine v1.6.0 // indirect
diff --git a/go.sum b/go.sum
index 6af621f..d4ce7b1 100644
--- a/go.sum
+++ b/go.sum
@@ -205,6 +205,7 @@ golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff h1:+2zgJKVDVAz/BWSsuniCmU1
golang.org/x/image v0.0.0-20190523035834-f03afa92d3ff/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/mod v0.1.0 h1:sfUMP1Gu8qASkorDVjnMuvgJzwFbTZSeXFiGBYAVdl4=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -231,6 +232,7 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..3b579f8
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,14 @@
+let
+ pkgs = import <nixpkgs> {};
+in
+pkgs.mkShell {
+ buildInputs = with pkgs; [
+ go
+ golint
+ gometalinter
+ goimports
+ vgo2nix
+
+ niv
+ ];
+}