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>

4 files changed, 27 insertions, 20 deletions

diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 9060b5e0e1b7..dc3a59d43550 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -49,6 +49,9 @@ let
       # bat syntaxes changed with syntect 5.0, but cheddar is still on 4.x
       # TODO(tazjin): upgrade cheddar to syntect 5.0
       bat
+
+      # ntfy does not build on unstable as of 2022-08-02
+      ntfy
       ;
   };
 
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 2838d390edbc..9ac1c4c36634 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "e1c34ef6f6eb7d966af5011eeeec6342017cd535",
-        "sha256": "075iramlazrbm17k2s2fzswyg0aibkcjn9q3cgmf3claj2m1i1l6",
+        "rev": "0ccabd776050ea80faf610a9dd5b390171ee8037",
+        "sha256": "1i9lqr49jmihxzrhs5965bmhf9zwmfdh4nc1xg4xhkqy3wlahj1s",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/e1c34ef6f6eb7d966af5011eeeec6342017cd535.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/0ccabd776050ea80faf610a9dd5b390171ee8037.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -53,10 +53,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d",
-        "sha256": "1yivdc9k1qcr29yxq9pz4qs2i29wgxj5y550kp0lz2wzp45ksi1x",
+        "rev": "5857574d45925585baffde730369414319228a84",
+        "sha256": "1y78031l7ba0k4gqplysyc6jcbx1va0s597lv5ccz1bvd1790ms8",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/b39924fc7764c08ae3b51beef9a3518c414cdb7d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5857574d45925585baffde730369414319228a84.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -65,10 +65,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b",
-        "sha256": "1z7mxyw5yk1gcsjs5wl8zm4klxg4xngljgrsnpl579l998205qym",
+        "rev": "a1fe662eb26ffc2a036b37c4670392ade632c413",
+        "sha256": "06wjkx8b527agyrmgm0kf51pgsxjwm8330iywa8a1dmlp1jmkl3k",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/573603b7fdb9feb0eb8efc16ee18a015c667ab1b.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a1fe662eb26ffc2a036b37c4670392ade632c413.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rust-overlay": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "eb5da5f2f030d144f405b5195c2b688aafce4c88",
-        "sha256": "1c97l2s8zd458qi3k958ighh0y3mhfwp7rlxjbba5qss71q3jmq4",
+        "rev": "9055cb4f33f062c0dd33aa7e3c89140da8f70057",
+        "sha256": "1524x2k40dlmhrq0l4wa9h219wq47azm3n2lvj0f6y8r4r23c5iq",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/eb5da5f2f030d144f405b5195c2b688aafce4c88.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/9055cb4f33f062c0dd33aa7e3c89140da8f70057.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
@@ -89,10 +89,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "2718c2db84a5d7607aa510fe33565e00c7959859",
-        "sha256": "09xa6mky8znf8f7z2npcdrwndv1i9729kxr1x1mha2l5kjwh673m",
+        "rev": "fdbc12eb9f661448f20eba8c1640515b47cb620d",
+        "sha256": "1qzsfwx535a9frqlcqivj9n8z5y860h6ak08k3n8hg2jr4s4ssvn",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/2718c2db84a5d7607aa510fe33565e00c7959859.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/fdbc12eb9f661448f20eba8c1640515b47cb620d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
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)