chore(3p/sources): bump channels & overlays (2025-02-09)

Included changes:

* targeted primary NixOS channel back at `nixos-unstable`

* //3p/chicago95: disable new broken symlink check

* //tvix: omit unnecessary lifetime clippy recommends

* //users/sterni/blipqn: wait a bit for data to arrive in test so it
  succeeds under load.

* //fun/paroxysm: force pkg-config flag of pq-sys by adding a bogus
  dependency on it. Otherwise, pq-sys will try to use pg_config
  which does not work correctly in pkgs.libpq at the moment.

* //users/flokli/keyboards/dilemma: disable temporarily

Change-Id: I6d53bd7bca6886f3457e1f41505e97314f4cd191
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13119
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: aspen <root@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>

fun/paroxysm/Cargo.toml

@@ -20,3 +20,12 @@ serde = { version = "1.0", features = [ "derive" ] }
 [dependencies.diesel]
 features = [ "postgres", "chrono", "r2d2" ]
 version = "1.4"
+
+# Add bogus dependency on any version of pq-sys, so we can force the pkg-config
+# flag since pg_config reports an incorrect libdir in pkgs.libpq
+# https://github.com/NixOS/nixpkgs/pull/359659#issuecomment-2660995914
+# https://github.com/NixOS/nixpkgs/pull/382380
+# https://github.com/sgrif/pq-sys/issues/75
+[dependencies.pq-sys]
+features = [ "pkg-config" ]
+version = "*"

third_party/chicago95/default.nix

@@ -42,6 +42,9 @@ pkgs.stdenvNoCC.mkDerivation {
     cp -r ${gtk4ProjectSrc}/gtk-4.0 $out/share/themes/Chicago95
   '';
 
+  # TODO(tazjin): investigate various broken symlinks in $out/share/icons
+  dontCheckForBrokenSymlinks = true;
+
   meta.license = pkgs.lib.licenses.gpl3;
 }
 

third_party/sources/sources.json

@@ -43,10 +43,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
+        "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
-        "sha256": "0j56s38y0yzy3pw7qia1n9zkmmn9nkb9mpklj2mc30k5l11fs170",
+        "sha256": "0x15vxlsmf6c421252ww9nmqapfyxar6xjqmpf38y1fkbw6m4iyi",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/18fa9f323d8adbb0b7b8b98a8488db308210ed93.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/6d3163aea47fdb1fe19744e91306a2ea4f602292.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -86,16 +86,16 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-unstable-small",
+        "branch": "nixos-unstable",
         "description": "Nix Packages collection",
         "gcroot": true,
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6eec6bbb933a6dad6cf6afe3d51329f31d22e974",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
-        "sha256": "0qmqw1ilzcjc3ivc7s05hf3iakn2b457d41v3fzdm28lqpf70skx",
+        "sha256": "0ms5nbr2vmvhbr531bxvyi10nz9iwh5cry12pl416gyvf0mxixpv",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/6eec6bbb933a6dad6cf6afe3d51329f31d22e974.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/2ff53fe64443980e139eaa286017f53f88336dd0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -118,10 +118,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e2bb8c205a069514535f083742c7da8dfb6e02b9",
+        "rev": "cd3e0a87bf9edadb0f311ba1eb677bbae7a08b81",
-        "sha256": "1x2ip7ap91c42wc7pjnsjwyj8v689x53177j5r01v4k94jk0k57v",
+        "sha256": "02qcjw78pkxfi9s43gvx0z36yc9b7ldmm5jpja864grclcr5cb3q",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/e2bb8c205a069514535f083742c7da8dfb6e02b9.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/cd3e0a87bf9edadb0f311ba1eb677bbae7a08b81.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
@@ -130,10 +130,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "5248f077160ebbedbc62f32356a7eb08823fc91b",
+        "rev": "ddccfe8aced779f7b54d27bbe7e122ecb1dda33a",
-        "sha256": "0caga1xxvbdh2gmn0gm3vggxwcv55bpvvrlxwbkzmhqhbmwdm0li",
+        "sha256": "0rzj0ld39anp05asf1v45i6sz3jgggmmj6qs110n718kv1zpb92j",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/5248f077160ebbedbc62f32356a7eb08823fc91b.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/ddccfe8aced779f7b54d27bbe7e122ecb1dda33a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

tvix/castore/src/composition.rs

@@ -288,7 +288,7 @@ pub struct CompositionContext<'a> {
     composition: Option<&'a Composition>,
 }
 
-impl<'a> CompositionContext<'a> {
+impl CompositionContext<'_> {
     /// Get a composition context for one-off store creation.
     pub fn blank(registry: &'static Registry) -> Self {
         Self {

tvix/nix-compat/src/wire/ser/bytes.rs

@@ -11,7 +11,7 @@ impl NixSerialize for Bytes {
     }
 }
 
-impl<'a> NixSerialize for &'a [u8] {
+impl NixSerialize for &[u8] {
     async fn serialize<W>(&self, writer: &mut W) -> Result<(), W::Error>
     where
         W: NixWrite,

users/flokli/keyboards/dilemma/default.nix

@@ -43,5 +43,7 @@ rec {
     QMK_HOME=${qmk_firmware_src} ${pkgs.qmk}/bin/qmk flash ${firmware}/bastardkb_dilemma_3x5_3_flokli.uf2
   '';
 
-  meta.ci.targets = [ "firmware" ];
+  # TODO(flokli): it appears that qmk and qmk_firmeware have diverged so that the latter misses some deps
+  meta.ci.skip = true;
+  # meta.ci.targets = [ "firmware" ];
 }

users/sterni/blipqn/default.nix

@@ -25,6 +25,7 @@ let
       runHook preCheck
       nc -lu 2323 > raw &
       BQN ./examples.bqn localhost 2323 32 10 235
+      sleep .5
       kill %1
       base64 raw > received
       diff -u received - <<EOF