From 9f475cd3b27ba1413d95ed06027edf099da27b03 Mon Sep 17 00:00:00 2001 From: leo Date: Wed, 8 Feb 2023 20:10:38 +0100 Subject: [PATCH] flake: bump nixpkgs, Go to 1.19 --- flake.lock | 18 +++++++++--------- flake.nix | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index f8c3b9a..5b13a6b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1653590866, - "narHash": "sha256-E4yKIrt/S//WfW5D9IhQ1dVuaAy8RE7EiCMfnbrOC78=", + "lastModified": 1675361037, + "narHash": "sha256-CTbDuDxFD3U3g/dWUB+r+B/snIe+qqP1R+1myuFGe2I=", "owner": "numtide", "repo": "nix-filter", - "rev": "3e81a637cdf9f6e9b39aeb4d6e6394d1ad158e16", + "rev": "e1b2f96c2a31415f362268bc48c3fccf47dff6eb", "type": "github" }, "original": { @@ -33,11 +33,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "lastModified": 1675698036, + "narHash": "sha256-BgsQkQewdlQi8gapJN4phpxkI/FCE/2sORBaFcYbp/A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "rev": "1046c7b92e908a1202c0f1ba3fc21d19e1cf1b62", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2810dca..8d665fd 100644 --- a/flake.nix +++ b/flake.nix @@ -59,10 +59,10 @@ inherit (pkgs) lib overlays; # -> lib = pkgs.lib;overlays = pkgs.overlays; in rec { math-optim = with pkgs; - buildGo118Module rec { + buildGo119Module rec { pname = "${projname}"; buildInputs = [ - go_1_18 + go_1_19 # gcc # glibc # glibc.static @@ -151,7 +151,7 @@ pkgs = import nixpkgs { inherit system; overlays = [ - (import ./overlay.nix) + # (import ./overlay.nix) ]; }; goPkgs = import nixpkgs { @@ -161,7 +161,7 @@ self.overlays or [] ++ [ - (import ./overlay.nix) + # (import ./overlay.nix) ]; }; gob = pkgs.writeShellScriptBin "gob" '' @@ -227,7 +227,7 @@ # use pathed go, as it's (supposed to be) faster with cgo, # which will inevitably encountered anyway. # goPkgs.go - go_1_18 + go_1_19 go-tools gopls gofumpt