diff --git a/flake.nix b/flake.nix index 7f12e710..a4e3e328 100644 --- a/flake.nix +++ b/flake.nix @@ -92,7 +92,7 @@ # ci herc = let hciSystem = "x86_64-linux"; - hciPkgs = import nixpkgs { system = hciSystem; }; + hciPkgs = import nixpkgs { system = hciSystem; overlays = overlays; }; effects = hercules-ci-effects.lib.withPkgs hciPkgs; mc = mcFn hciPkgs; lang = langFn hciPkgs; diff --git a/nix/squiggle-mc.nix b/nix/squiggle-mc.nix index 1db46975..51cae6c6 100644 --- a/nix/squiggle-mc.nix +++ b/nix/squiggle-mc.nix @@ -1,8 +1,8 @@ { pkgs }: -with pkgs.rustPlatform; rec { +rec { rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; - pkg = buildRustPackage { + pkg = pkgs.rustPlatform.buildRustPackage { pname = "quri_squiggle_mc"; version = "0.0.1"; src = ../packages/mc; @@ -35,7 +35,7 @@ with pkgs.rustPlatform; rec { test = pkgs.stdenv.mkDerivation { name = "squiggle-mc-test"; - src = mc-pkg + "/pkg"; + src = pkg + "/pkg"; buildInputs = with pkgs; [ cargo ]; buildPhase = "cargo test"; installPhase = "mkdir -p $out";