aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@xeiaso.net>2023-08-24 10:47:27 -0400
committerXe Iaso <me@xeiaso.net>2023-08-24 10:47:50 -0400
commit3f4df5351c88167a0becaf13100148bff830a664 (patch)
tree21d5bdd37361dfbc0f6b0ca93f9359a91f6c2581
parent0f035f34b46be55152ef430f9be66e1ce13eb680 (diff)
downloadx-3f4df5351c88167a0becaf13100148bff830a664.tar.xz
x-3f4df5351c88167a0becaf13100148bff830a664.zip
flake: update to Go 1.21.0
Signed-off-by: Xe Iaso <me@xeiaso.net>
-rw-r--r--flake.lock30
-rw-r--r--flake.nix7
-rw-r--r--go.mod2
3 files changed, 22 insertions, 17 deletions
diff --git a/flake.lock b/flake.lock
index 3afa55d..e1dc6f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
]
},
"locked": {
- "lastModified": 1690373729,
- "narHash": "sha256-e136hTT7LqQ2QjOTZQMW+jnsevWwBpMj78u6FRUsH9I=",
+ "lastModified": 1692351612,
+ "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=",
"owner": "nix-community",
"repo": "naersk",
- "rev": "d9a33d69a9c421d64c8d925428864e93be895dcc",
+ "rev": "78789c30d64dea2396c9da516bbcc8db3a475207",
"type": "github"
},
"original": {
@@ -79,11 +79,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1690272529,
- "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
+ "lastModified": 1692734709,
+ "narHash": "sha256-SCFnyHCyYjwEmgUsHDDuU0TsbVMKeU1vwkR+r7uS2Rg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
+ "rev": "b85ed9dcbf187b909ef7964774f8847d554fab3b",
"type": "github"
},
"original": {
@@ -114,11 +114,11 @@
]
},
"locked": {
- "lastModified": 1690424156,
- "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=",
+ "lastModified": 1692842983,
+ "narHash": "sha256-VJkts5gTo4eGMT1IgXhL5tRVkS1TailFKjjVktAuhdk=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "f335a0213504c7e6481c359dc1009be9cf34432c",
+ "rev": "8f6d56270ec028a340583111609b12663f5d7490",
"type": "github"
},
"original": {
@@ -162,11 +162,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1689068808,
- "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+ "lastModified": 1692799911,
+ "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+ "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
@@ -178,11 +178,11 @@
"wasigo": {
"flake": false,
"locked": {
- "lastModified": 1690421841,
- "narHash": "sha256-areZ+V2mktz0KfHI2DqqExUs5SSM8PcF18HC9hZ69ko=",
+ "lastModified": 1692861447,
+ "narHash": "sha256-eauxUisk7FxTHShQIfJoswaUEkPDTJ9LrWMhNqkyzyY=",
"owner": "golang",
"repo": "go",
- "rev": "8a1ff5182780af72d08c3e6b91694425a1498014",
+ "rev": "d5c5808534f0ad97333b1fd5fff81998f44986fe",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 22b39d7..e815d19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,9 @@
pkgs = import nixpkgs {
inherit system;
overlays = [
+ (final: prev: {
+ go = prev.go_1_21;
+ })
gomod2nix.overlays.default
rust-overlay.overlays.default
#(final: prev: self.packages.${system})
@@ -184,7 +187,7 @@
src = pkgs.runCommand "gowasi-version-hack" { } ''
mkdir -p $out
echo "go-wasip1-dev-${wasigo.shortRev}" > $out/VERSION
- cp -vrf ${wasigo}/* $out
+ cp -rf ${wasigo}/* $out
'';
}) // {
GOOS = "wasip1";
@@ -302,6 +305,8 @@
terraform
litestream
nodejs
+ deno
+ esbuild
postgresql_15
pgloader
diff --git a/go.mod b/go.mod
index 026080b..55577cb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module within.website/x
-go 1.19
+go 1.21.0
require (
cirello.io/goherokuname v0.0.0-20190914093443-b436bae8c2c5