Skip to content

Commit e766971

Browse files
authored
Merge pull request #1191 from pepeiborra/nix-8.10.3
Update nixpkgs to ghc 8.10.3
2 parents 63218d1 + 275a039 commit e766971

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ jobs:
2121
- uses: cachix/cachix-action@v8
2222
with:
2323
name: haskell-language-server
24-
authToken: '${{ secrets.HLS_CACHIX_AUTH_TOKEN }}'
24+
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
2525
- run: nix-shell --argstr compiler ${{ matrix.ghc }} --run "cabal update && cabal build"

nix/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let
66
mkDerivation = args: super.mkDerivation (args //
77
{
88
# skip running tests for Hackage packages
9-
doCheck = args.pname != "ghcide" && args.pname != "haskell-language-server";
9+
doCheck = args.pname == "ghcide" || args.pname == "haskell-language-server";
1010
# relax upper bounds
1111
jailbreak = args.pname != "jailbreak-cabal";
1212
});
@@ -38,6 +38,7 @@ let
3838
# relax upper bounds on ghc 8.10.x versions (and skip running tests)
3939
ghc8101 = extended (pkgs.haskell.packages.ghc8101.override sharedOverrides);
4040
ghc8102 = extended (pkgs.haskell.packages.ghc8102.override sharedOverrides);
41+
ghc8103 = extended (pkgs.haskell.packages.ghc8103.override sharedOverrides);
4142
};
4243
};
4344
};

nix/sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"homepage": "https://github.com/NixOS/nixpkgs",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "cbf707b2af4cd66bdcdd84b2bddfb627194b39c0",
33-
"sha256": "1bj55jkgdzx7lv6dvy26l354c7vsxaa1jipm99axgqqax905m8sa",
32+
"rev": "8911c99c2f1bf44210be7ff35314430f02f0f33d",
33+
"sha256": "06mi91yxidjyyrc7q5dbi1j8bxi2iird0ivqcnb4kiglpw0ivpkr",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/cbf707b2af4cd66bdcdd84b2bddfb627194b39c0.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/8911c99c2f1bf44210be7ff35314430f02f0f33d.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
}
3838
}

0 commit comments

Comments
 (0)