chore(3p): update NixOS channels to 2021-08-30 r/2801

This lets us benefit from the recent OpenSSL security-related
update [1]. Since nixos-unstable is still stuck, we temporarily
use nixos-unstable-small as our unstable channel.

Fixes necessary:

* //users/sterni/nix/char:
  Someone has decided to drop writers.writeC upstream [2],
  so we reimplement it ad-hoc using runCommandCC

[1]: https://www.openssl.org/news/secadv/20210824.txt
[2]: https://github.com/nixos/nixpkgs/commit/982f46985e37a6488d8e904b46e0cba2060adc71

Change-Id: Id84756e2e370296b7a27e1a3f1744f58f8fe3c47
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3463
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI

2 files changed, 18 insertions, 13 deletions

diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index c19809fc5a91..5d2b0fae66e2 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -13,16 +13,16 @@ let
   # nixos-unstable, and the current stable channel of the latest NixOS
   # release.
 
-  # Tracking nixos-unstable as of 2021-08-24.
+  # Tracking nixos-unstable-small as of 2021-08-30.
   unstableHashes = {
-    commit = "870959c7fb3a42af1863bed9e1756086a74eb649";
-    sha256 = "1af82rsyf4xiw2b9dqcvl6rsfd3l8qlk0dqja4zmlsmpgd4i5byq";
+    commit = "8a56ac5db3e83a1e19bbe3a696cab83c6f21c359";
+    sha256 = "1mpapzbql4cv80sksfwb5dlqq9d49s58qgad8nqp85fa49422qz8";
   };
 
-  # Tracking nixos-21.05 as of 2021-08-24.
+  # Tracking nixos-21.05 as of 2021-08-28.
   stableHashes = {
-    commit = "871e8c4d585ff2a9eb200dcbd96e3856775807b9";
-    sha256 = "08i0h5snzmrk6svbakaf693rbl3v5l9jhrz0xvfvhhs9ajmzj6gk";
+    commit = "74d017edb6717ad76d38edc02ad3210d4ad66b96";
+    sha256 = "0wvz41izp4djzzr0a6x54hcm3xjr51nlj8vqghfgyrjpk8plyk4s";
   };
 
   # import the nixos-unstable package set, or optionally use the
diff --git a/users/sterni/nix/char/default.nix b/users/sterni/nix/char/default.nix
index e6b8d6d7f168..aacfc9dcbe4d 100644
--- a/users/sterni/nix/char/default.nix
+++ b/users/sterni/nix/char/default.nix
@@ -78,13 +78,18 @@ in {
   # originally I generated a nix file containing a list of
   # characters, but infinisil uses a better way which I adapt
   # which is using builtins.readFile instead of import.
-  __generateAllChars = pkgs.writers.writeC "generate-all-chars" {} ''
-    #include <stdio.h>
-
-    int main(void) {
-      for(int i = 1; i <= 0xff; i++) {
-        putchar(i);
+  __generateAllChars = pkgs.runCommandCC "generate-all-chars" {
+    source = ''
+      #include <stdio.h>
+
+      int main(void) {
+        for(int i = 1; i <= 0xff; i++) {
+          putchar(i);
+        }
       }
-    }
+    '';
+    passAsFile = [ "source" ];
+  } ''
+    $CC -o "$out" -x c "$sourcePath"
   '';
 }