From 0e705fedb04bffb45f02a6798cbaa1ab216d48e9 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Fri, 27 May 2022 18:09:47 +0200
Subject: chore(3p/sources): Bump channels & overlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* //nix/buildLisp: disable CCL once again due to
  The Mysterious Runtime Bug™.

* //users/tazjin/nixos: uninstall dmd which is broken in nixpkgs atm.

Change-Id: I8dd2220af48a7e087584b6f50529fb8477e6a2fb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5699
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
---
 nix/buildLisp/default.nix               |  3 ++-
 third_party/sources/sources.json        | 18 +++++++++---------
 users/tazjin/nixos/modules/physical.nix |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix
index a8168334a77b..d9f9e70a37a9 100644
--- a/nix/buildLisp/default.nix
+++ b/nix/buildLisp/default.nix
@@ -154,7 +154,8 @@ let
           let
             implementation = old.implementation or defaultImplementation;
             brokenOn = old.brokenOn or [ ];
-            targets = lib.subtractLists (brokenOn ++ [ implementation.name ])
+            # TODO(sterni): https://github.com/Clozure/ccl/issues/405
+            targets = lib.subtractLists (brokenOn ++ [ "ccl" implementation.name ])
               (builtins.attrNames impls);
           in
           {
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 064f4250af36..b63a5160c671 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
-        "sha256": "1ipd1k1gvxh9sbg4w4cpa3585q09gvsq8xbjvxnnmfjib6r6xx4i",
+        "rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060",
+        "sha256": "1hs1lnnbp1dky3nfp7xlricpp5c63sr46jyrnvykci8bl8jnxnl3",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/dfd82985c273aac6eced03625f454b334daae2e8.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5ce6597eca7d7b518c03ecda57d45f9404b5e060.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -53,10 +53,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009",
-        "sha256": "09ffmjs9lwm97p8v8977p319kc8ys2fjnyv08gb99kgbr7gfiyfd",
+        "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b",
+        "sha256": "0p3c9gjjdr1gz55al2s5yhh59kx8fqbgzhw4cab3mqair9h84m4j",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/cbd40c72b2603ab54e7208f99f9b35fc158bc009.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/06db2e2197401b74fcf82d4e84be15b0b5851c7b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
@@ -65,10 +65,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "b4d8786707a8bb97b65d02290b5cea3d20be49d8",
-        "sha256": "1xp5wgwcn69v0yaqjwwf27k52avsz2dwrzapsajdgg1cz40ibzgw",
+        "rev": "29281434b74516435cf1c3a79046bbec2cca9ee2",
+        "sha256": "0ma62bf9haacbqc37d11w9c89fi6a7rj0sndnjp9dsfqh25jxrk3",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/b4d8786707a8bb97b65d02290b5cea3d20be49d8.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/29281434b74516435cf1c3a79046bbec2cca9ee2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/users/tazjin/nixos/modules/physical.nix b/users/tazjin/nixos/modules/physical.nix
index 386b756cafef..8b11e1bf0872 100644
--- a/users/tazjin/nixos/modules/physical.nix
+++ b/users/tazjin/nixos/modules/physical.nix
@@ -22,7 +22,7 @@ in
       curl
       ddcutil
       direnv
-      dmd
+      # dmd # TODO(tazjin): temporarily broken in nixpkgs, reinstall when it works again
       dnsutils
       electrum
       emacsNativeComp # emacsclient
-- 
cgit 1.4.1