about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2024-12-31T09·05+0300
committerclbot <clbot@tvl.fyi>2025-01-01T17·35+0000
commit54f72afcda5acb08f450f3082b12b63866ad0135 (patch)
tree1b7e009a6b1dc341c47c83895b5ab5228f6a4865 /third_party
parentbd73dff0bfd03a411c27193487bdeebf987ccbc7 (diff)
chore(3p/sources): bump channels & overlays (2024-12-31) r/9057
Last one of the year! С наступающим)

Fixes:

* users/wpcarro: remove use-package from emacs packages (it has been built-in
  for a while now)
* users/sterni: the same thing
* users/aspen: remove `coz`, forwardport `gdmap` from stable
* users/flokli: dropped corneish_zen firmware from CI
  This firmware depends on a non-reproducible FOD which, when updated, causes
  build failures. We have worked around this repeatedly, but it needs to be
  fixed properly.
* tvix: regenerate Go protobufs
* tvix: address new clippy lints
* tvix/{castore,store,build}-go: update grpc/protobuf libraries
* tvix/eval: formatting fixes
* 3p/overlays/tvl: work around GCC 14 -Werrors

Change-Id: Ice5948ca7780192fb7d2abc6a48971fb875f03c9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12933
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: aspen <root@gws.fyi>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party')
-rw-r--r--third_party/nixpkgs/default.nix5
-rw-r--r--third_party/overlays/tvl.nix8
-rw-r--r--third_party/sources/sources.json24
3 files changed, 24 insertions, 13 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 3ec49ea084d8..7648a32100a8 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -56,11 +56,14 @@ let
     # newer trunk fails somewhere within reqwest, trying to read a mystery file
     trunk = stableNixpkgs.trunk;
 
-    # the big lis package change breaks everything in //3p/lisp, undo it for now.
+    # the big lisp package change breaks everything in //3p/lisp, undo it for now.
     lispPackages = stableNixpkgs.lispPackages;
 
     # mypaint is broken on stable (2024-09-05)
     mypaint = stableNixpkgs.mypaint;
+
+    # gdmap is broken on unstable (2024-12-31)
+    gdmap = stableNixpkgs.gdmap;
   };
 
   # Overlay to expose the nixpkgs commits we are using to other Nix code.
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index aec22971c64d..9e8b80ad627b 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -109,6 +109,14 @@ depot.nix.readTree.drvTargets {
     ];
   });
 
+  # https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors
+  thttpd = super.thttpd.overrideAttrs (oldAttrs: {
+    NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE or [ ] ++ [
+      "-Wno-error=implicit-int"
+      "-Wno-error=implicit-function-declaration"
+    ];
+  });
+
   # https://github.com/NixOS/nixpkgs/pull/329415/files
   grpc-health-check = super.rustPlatform.buildRustPackage {
     pname = "grpc-health-check";
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 7777adec63e6..043034e98b1f 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -29,10 +29,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e",
-        "sha256": "09dmq1dh7l6c8zp42phpyljf4npmpch840hm476ajmvw1441z96z",
+        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
+        "sha256": "1vklmr0vzhplcjcqg19v66c1swg3xcgw96ry90dyd4hl2cb9j80b",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/8264bfe3a064d704c57df91e34b795b6ac7bad9e.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/10e99c43cdf4a0713b4e81d90691d22c6a58bdf2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
-        "sha256": "1968wcqnb5gb947js0kv17hy15nc5817ra66nj33nc532d342ig0",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "sha256": "1fs25csg0lq3v34jdzxr2qdvnyvylimmfh0qxlf39h4j1hclvbyj",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/88195a94f390381c6afcdaa933c2f6ff93959cb4.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "b070e6030118680977bc2388868c4b3963872134",
-        "sha256": "1z15xqpmclxc1jldqy9g714fjx4rg37rv47jz9065bdw5gw1avvf",
+        "rev": "d199142e84bfaae476ffb4e09a70879d7918784d",
+        "sha256": "1bhapkiiii984m86cp1xkr8jh0i86vmbl5z3b9nzylfg0y7fij5f",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/b070e6030118680977bc2388868c4b3963872134.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/d199142e84bfaae476ffb4e09a70879d7918784d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
@@ -113,10 +113,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "b02b7ca7c98eee7fe26ac18277040c3fc814b52d",
-        "sha256": "1gj23v4v3dpk6fcq9s8yylhx9wqkdgb2mhlhv66xmb9qrwv8v20p",
+        "rev": "3c6d3186ab06737d1defd2b5ae556d0ecd161603",
+        "sha256": "05cg2fhjqv4xly1g5a8dm0bc08yzzqn2is5s7c7kczib3j4gpiq5",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/b02b7ca7c98eee7fe26ac18277040c3fc814b52d.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/3c6d3186ab06737d1defd2b5ae556d0ecd161603.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }