From 4259dac0aab8502a7d589a4364078ee291445c5f Mon Sep 17 00:00:00 2001 From: death916 Date: Tue, 8 Jul 2025 04:54:41 -0700 Subject: [PATCH] nightly pin for halloy --- overlays/halloy-overlay.nix | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/overlays/halloy-overlay.nix b/overlays/halloy-overlay.nix index 6f416f6..ab10261 100644 --- a/overlays/halloy-overlay.nix +++ b/overlays/halloy-overlay.nix @@ -1,23 +1,10 @@ self: super: let - rustNightly = (super.rust-bin.fromTarball { - src = super.fetchurl { - url = "https://static.rust-lang.org/dist/2024-05-01/rust-nightly-x86_64-unknown-linux-gnu.tar.xz"; - sha256 = "0000000000000000000000000000000000000000000000000000"; # Replace with the correct hash after the build fails - }; - }).override { - extensions = [ - "rust-src" - "rustc-dev" - ]; - }; - nightlyRustPlatform = super.makeRustPlatform { - cargo = rustNightly; - rustc = rustNightly; - }; + # Use the standard stable rust platform provided by nixpkgs + stableRustPlatform = super.rustPlatform; in { - halloy = nightlyRustPlatform.buildRustPackage rec { + halloy = stableRustPlatform.buildRustPackage rec { pname = "halloy"; version = "2025.6"; @@ -28,20 +15,6 @@ in sha256 = "sha256-a95PmVEx4j9euqh+z9MvzvwfmWCGydeZjDCfYLOM4tI="; }; - RUSTC_BOOTSTRAP = 1; - - RUSTFLAGS = "-Z allow-features=edition2024,avx512_target_feature,stdarch_x86_avx512,doc_cfg"; - - postPatch = '' - find . -name '*.rs' -exec sed -i '1i #![feature(avx512_target_feature,stdarch_x86_avx512,doc_cfg)]' {} \; - - find . -name Cargo.toml -exec sh -c ' - if ! grep -q "cargo-features" {}; then - sed -i "1i cargo-features = [\"edition2024\"]" {} - fi - ' \; - ''; - cargoLock = { lockFile = src + "/Cargo.lock"; outputHashes = {