Skip to content

Commit 4b43336

Browse files
Merge request #731 default.nix: switch to the GHC 8.10.1, now executable gets build
Switching Nix dev env and its CI to GHC 8.10. To avoid contribution loop problems, since we pin Nixpkgs in default.nix - it is logical by default CI to follow the supported way of building. The downsides are: * Maintainer would need to solve Nix issues by himself, when wants to update the Nixpkgs revision, or play a wait and pick rev game with Nixpkgs. * On the rev update, the `Nix-shell & Hoogle` CI build needs to rebuild the whole Haskell stack from the bottom up, so the rev update process takes a lot of wait time (hours), and also should be done from the repo internal branch to save the already built parts of the stack during rev testing. Also one CI build was not terminating, so switched to the new rev.
2 parents 098ae18 + c8c9990 commit 4b43336

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.github/workflows/Optional-Nix-dev-env-macOS.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ on:
1313

1414

1515
env:
16-
rev: "nixos-unstable"
16+
# rev: "nixos-unstable" # 2020-09-29: NOTE: HNix default.nix currently pins the rev
1717
cachixAccount: "hnix"
1818
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
1919

2020

2121
jobs:
2222
build10:
23-
name: "NixOS-unstable, default GHC (8.8)"
23+
name: "Default GHC (8.8)"
2424
runs-on: macos-latest
2525
continue-on-error: true
2626
steps:

.github/workflows/Optional-Nix-dev-env-main.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
### and the other part of keys explained in `build.sh`, since those address external procedures aound the builds.
2323
### Additional documentation is in Nixpkgs Haskell.lib: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/lib.nix
2424
###
25-
rev: "nixos-unstable"
25+
# rev: "nixos-unstable" # 2020-09-29: NOTE: HNix default.nix currently pins the rev
2626
cachixAccount: "hnix"
2727
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
2828
allowInconsistentDependencies: "false"
@@ -56,9 +56,8 @@ env:
5656

5757
jobs:
5858

59-
# NOTE: Basic example
6059
build10:
61-
name: "NixOS-unstable channel, strict build, default GHC (8.8)"
60+
name: "Default Nixpkgs GHC (8.8), strict build"
6261
runs-on: ubuntu-latest
6362
# 2020-08-01: NOTE: Due to Nixpkgs brittleness to not block project development Nixpkgs made optional, see commit message for more info
6463
continue-on-error: true
@@ -76,13 +75,13 @@ jobs:
7675
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
7776
- name: Determined Nix-build
7877
env:
79-
rev: "nixos-unstable"
78+
compiler: "default"
8079
buildStrictly: "true"
8180
run: ./build.sh
8281

8382

8483
build20:
85-
name: "Quality build, SDist, Optimizations, Benchmark, Haddock, Completions, GHC 8.10.1"
84+
name: "GHC 8.10.1, quality build, SDist, Optimizations, Benchmark, Haddock, Completions"
8685
runs-on: ubuntu-latest
8786
continue-on-error: true
8887
steps:
@@ -99,7 +98,6 @@ jobs:
9998
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
10099
- name: Determined Nix-build
101100
env:
102-
rev: "nixos-unstable"
103101
compiler: "ghc8101"
104102
buildFromSdist: "true"
105103
linkWithGold: "true"

default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
# Default GHC for Nixpkgs by default, for current default and explicitly supported GHCs https://search.nixos.org/packages?query=ghc&from=0&size=500&channel=unstable, Nixpkgs implicitly supports older minor versions also, until the configuration departs from compatibility with them.
2+
# For current default and explicitly supported GHCs https://search.nixos.org/packages?query=ghc&from=0&size=500&channel=unstable, Nixpkgs implicitly supports older minor versions also, until the configuration departs from compatibility with them.
33
# Compiler in a form ghc8101 <- GHC 8.10.1, just remove spaces and dots
4-
compiler ? "default"
4+
compiler ? "ghc8101"
55

66
# Deafult.nix is a unit package abstraciton that allows to abstract over packages even in monorepos:
77
# Example: pass --arg cabalName --arg packageRoot "./subprojectDir", or map default.nix over a list of tiples for subprojects.
@@ -91,7 +91,7 @@
9191
# , nixos-20.03 # Last stable release, gets almost no updates to recipes, gets only required backports
9292
# ...
9393
# }
94-
, rev ? "daaa0e33505082716beb52efefe3064f0332b521"
94+
, rev ? "0cfe5377e8993052f9b0dd56d058f8008af45bd9"
9595

9696
, pkgs ?
9797
if builtins.compareVersions builtins.nixVersion "2.0" < 0

0 commit comments

Comments
 (0)