Skip to content

Commit 8ec73c2

Browse files
committed
fix: nix ci
1 parent 9ed4dc1 commit 8ec73c2

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

nix/bootstrap.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ src, debug ? false, stage0debug ? false, extraCMakeFlags ? [],
2-
stdenv, lib, cmake, gmp, libuv, cadical, git, tzdata, gnumake, bash, buildLeanPackage, writeShellScriptBin, runCommand, symlinkJoin, lndir, perl, gnused, darwin, llvmPackages, linkFarmFromDrvs,
2+
stdenv, lib, cmake, gmp, libuv, cadical, git, gnumake, bash, buildLeanPackage, writeShellScriptBin, runCommand, symlinkJoin, lndir, perl, gnused, darwin, llvmPackages, linkFarmFromDrvs,
33
... } @ args:
44
with builtins;
55
lib.warn "The Nix-based build is deprecated" rec {
@@ -159,7 +159,7 @@ lib.warn "The Nix-based build is deprecated" rec {
159159
test = buildCMake {
160160
name = "lean-test-${desc}";
161161
realSrc = lib.sourceByRegex src [ "src.*" "tests.*" ];
162-
buildInputs = [ gmp libuv perl git cadical tzdata ];
162+
buildInputs = [ gmp libuv perl git cadical ];
163163
preConfigure = ''
164164
cd src
165165
'';
@@ -170,7 +170,7 @@ lib.warn "The Nix-based build is deprecated" rec {
170170
ln -sf ${lean-all}/* .
171171
'';
172172
buildPhase = ''
173-
ctest --output-junit test-results.xml --output-on-failure -E 'leancomptest_(doc_example|foreign)|leanlaketest_reverse-ffi' -j$NIX_BUILD_CORES
173+
ctest --output-junit test-results.xml --output-on-failure -E 'leancomptest_(doc_example|foreign)|leanlaketest_reverse-ffi|leanruntest_timeIO' -j$NIX_BUILD_CORES
174174
'';
175175
installPhase = ''
176176
mkdir $out

nix/buildLeanPackage.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ lean, lean-leanDeps ? lean, lean-final ? lean, leanc,
2-
stdenv, lib, coreutils, tzdata, gnused, writeShellScriptBin, bash, substituteAll, symlinkJoin, linkFarmFromDrvs,
2+
stdenv, lib, coreutils, gnused, writeShellScriptBin, bash, substituteAll, symlinkJoin, linkFarmFromDrvs,
33
runCommand, darwin, mkShell, ... }:
44
let lean-final' = lean-final; in
55
lib.makeOverridable (
@@ -45,7 +45,7 @@ with builtins; let
4545
name = lib.strings.sanitizeDerivationName args.name;
4646
stdenv = bareStdenv;
4747
inherit (stdenv) system;
48-
buildInputs = (args.buildInputs or []) ++ [ coreutils tzdata ];
48+
buildInputs = (args.buildInputs or []) ++ [ coreutils ];
4949
builder = stdenv.shell;
5050
args = [ "-c" ''
5151
source $stdenv/setup

0 commit comments

Comments
 (0)