From 189ef03e81f3f2bab9a544a9b6d3496648cc4d5c Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Thu, 16 Dec 2021 02:20:33 +0000 Subject: [PATCH] Add go_1_18 overlay hell --- user/daniel/home.nix | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/user/daniel/home.nix b/user/daniel/home.nix index 660223b..2bb0f45 100644 --- a/user/daniel/home.nix +++ b/user/daniel/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, fetchurl, ... }: { imports = [ @@ -13,6 +13,29 @@ services.dunst.enable = true; + nixpkgs.overlays = [ (final: prev: { + go_1_18 = prev.go_1_17.overrideAttrs (old: rec { + version="1.18beta1"; + src = prev.fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "sha256-QYwCjbFGmctbLUkHrTpBnXn3ibMZFu+HZIZ+SnjmU6E="; + }; + patches = builtins.filter ( + x: !(builtins.isList (builtins.match ".*/go-1.9-skip-flaky-20072.patch" (builtins.toString x))) + ) old.patches; + }); + }) + + (final: prev: { + gopls = prev.gopls.override { + buildGoModule = prev.buildGoModule.override { + go = final.go_1_18; + }; + }; + }) + + ]; + home = { username = "daniel"; homeDirectory = "/home/daniel"; @@ -49,7 +72,7 @@ entr feh fzf - go_1_17 + go_1_18 google-drive-ocamlfuse gomuks gopls