Skip to content

Commit 53cf60c

Browse files
authored
Use nixpkgs 22.05 for scripts (#1632)
This should daily updates which are failing with: ``` error: unrecognised flag '--accept-flake-config' ``` See https://buildkite.com/input-output-hk/haskell-dot-nix-nightly-updates/builds/1318#0182f20e-bd2b-4840-a930-af2815df793c This change also updates to the newer mkdocs in nixpkgs 22.05 and updates the check-path-support to use a combination of nixpkgs and ghc that should be in the hydra cache.
1 parent e1b76b2 commit 53cf60c

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

build.nix

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
let
66
haskellNix = (import ./default.nix {});
77
in
8-
{ nixpkgs ? haskellNix.sources.nixpkgs-2111
8+
{ nixpkgs ? haskellNix.sources.nixpkgs-2205
99
, nixpkgsArgs ? haskellNix.nixpkgsArgs
1010
, pkgs ? import nixpkgs nixpkgsArgs
1111
, evalPackages ? import nixpkgs nixpkgsArgs
@@ -76,10 +76,14 @@ in rec {
7676
];
7777
};
7878
check-materialization-concurrency = pkgs.buildPackages.callPackage ./scripts/check-materialization-concurrency/check.nix {};
79-
check-path-support = pkgs.buildPackages.callPackage ./scripts/check-path-support.nix {
80-
# TODO remove this when nixpkgs-2205 is released and used for `pkgs`
81-
# check-path-support fails unless we have nix 2.4 or newer.
82-
inherit (import haskellNix.sources.nixpkgs-unstable {}) nix;
79+
# Forcing nixpkgs-unstable here because this test makes a script
80+
# that when run will build `aeson` (used by `tests/cabal-simple`)
81+
# and we currently do not build that on hydra for nixpkgs-2205 (used by `pkgs`).
82+
# Using nixpkgs-unstable should allow buildkite to find what it needs
83+
# in the hydra cache when it runs the script.
84+
check-path-support = (import haskellNix.sources.nixpkgs-unstable nixpkgsArgs)
85+
.buildPackages.callPackage ./scripts/check-path-support.nix {
86+
inherit compiler-nix-name;
8387
};
8488
};
8589

mkdocs.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ site_name: Alternative Haskell Infrastructure for Nixpkgs
1313
theme: readthedocs
1414
site_url: null
1515
repo_url: https://github.com/input-output-hk/haskell.nix
16-
permalink: true
1716
markdown_extensions:
1817
- admonition
1918
- footnotes
2019
- tables
2120
- toc:
2221
permalink: true
2322

24-
# this is called `nav` in more recent mkdocs versions. Mine
25-
# right now is 0.17.5
26-
pages:
23+
nav:
2724
- 'Introduction': index.md
2825
- 'Motivation': motivation.md
2926
- 'Architecture': architecture.md

scripts/check-path-support.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, lib, writeScript, coreutils, gnutar, gzip, nix, gitMinimal }:
1+
{ stdenv, lib, writeScript, coreutils, gnutar, gzip, nix, gitMinimal, compiler-nix-name }:
22

33
with lib;
44

@@ -9,5 +9,5 @@ writeScript "check-path-supprot.sh" ''
99
1010
export PATH="${makeBinPath [ coreutils gnutar gzip nix gitMinimal ]}"
1111
12-
nix-build -E '((import ./. {}).pkgs.haskell-nix.cabalProject { compiler-nix-name = "ghc865"; src = ./test/cabal-simple; }).cabal-simple.components.library'
12+
nix-build -E '((import ./. {}).pkgs.haskell-nix.cabalProject { compiler-nix-name = "${compiler-nix-name}"; src = ./test/cabal-simple; }).cabal-simple.components.library'
1313
''

0 commit comments

Comments
 (0)