diff options
| author | sterni <sternenseemann@systemli.org> | 2022-07-28T11·14+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-08-02T22·39+0000 |
| commit | 83d3042209aad014a6b9908700fad642dadccdbe (patch) | |
| tree | 27a7ba3acfadd821a2d547ba0232029ccd8b92d9 /users | |
| parent | 6f71482534b7c6dc01db4dfddf0528acd6a749bc (diff) | |
chore(3p/sources): Bump channels & overlays r/4375
* //users/grfn/system/home: build rain with Go 1.17, as it fails to build with Go 1.18 which introduces new compile-time errors * //3p/nixpkgs: pick ntfy from stable channel as it does not build on unstable * //users/sterni/emacs: make sure use-package is available before org-tracker can be loaded dynamically from $HOME/src. Interestingly this only became a problem with this channel bump. Change-Id: Id7d23b66bc3ba0202a01b4f8d670854e1f31175e Reviewed-on: https://cl.tvl.fyi/c/depot/+/5988 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'users')
| -rw-r--r-- | users/grfn/system/home/modules/development/readyset.nix | 5 | ||||
| -rw-r--r-- | users/sterni/emacs/init.el | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/users/grfn/system/home/modules/development/readyset.nix b/users/grfn/system/home/modules/development/readyset.nix index e3e84a31afce..9bb9d6644db3 100644 --- a/users/grfn/system/home/modules/development/readyset.nix +++ b/users/grfn/system/home/modules/development/readyset.nix @@ -8,7 +8,9 @@ home.packages = with pkgs; [ # This goes in $PATH so I can run it from rofi and parent to my WM (writeShellScriptBin "dotclip" "xclip -out -selection clipboard | dot -Tpng | feh -") - (buildGoModule rec { + + # TODO(grfn): rain fails to build with Go >=1.18, investigate. + (buildGo117Module rec { pname = "rain"; version = "1.2.0"; @@ -21,6 +23,7 @@ vendorSha256 = "16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v"; }) + awscli2 amazon-ecr-credential-helper ]; diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el index 0d3f9037f5fb..3c6ed78cdf71 100644 --- a/users/sterni/emacs/init.el +++ b/users/sterni/emacs/init.el @@ -1,3 +1,8 @@ +;; set up package infrastructure + +(require 'use-package) +(package-initialize) + ;; Set default font and fallback font via set-fontset-font ;; TODO(sterni): Investigate why ZWJ sequences aren't shaped properly (let ((mono-font "Bitstream Vera Sans Mono-12") @@ -162,10 +167,6 @@ (project-magit "Magit"))) ;;; Configure packages -(require 'use-package) - -(package-initialize) - (use-package undo-tree :config (global-undo-tree-mode) |