Skip to content

Update nixpkgs to ghc 8.10.3 #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 10, 2021
Merged

Update nixpkgs to ghc 8.10.3 #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8de2ca5
Update nixpkgs to ghc 8.10.3
pepeiborra Jan 3, 2021
fccb9e2
Merge branch 'master' into nix-8.10.3
pepeiborra Jan 10, 2021
275a039
Merge branch 'master' into nix-8.10.3
pepeiborra Jan 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
- uses: cachix/cachix-action@v8
with:
name: haskell-language-server
authToken: '${{ secrets.HLS_CACHIX_AUTH_TOKEN }}'
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
- run: nix-shell --argstr compiler ${{ matrix.ghc }} --run "cabal update && cabal build"
3 changes: 2 additions & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let
mkDerivation = args: super.mkDerivation (args //
{
# skip running tests for Hackage packages
doCheck = args.pname != "ghcide" && args.pname != "haskell-language-server";
doCheck = args.pname == "ghcide" || args.pname == "haskell-language-server";
# relax upper bounds
jailbreak = args.pname != "jailbreak-cabal";
});
Expand Down Expand Up @@ -38,6 +38,7 @@ let
# relax upper bounds on ghc 8.10.x versions (and skip running tests)
ghc8101 = extended (pkgs.haskell.packages.ghc8101.override sharedOverrides);
ghc8102 = extended (pkgs.haskell.packages.ghc8102.override sharedOverrides);
ghc8103 = extended (pkgs.haskell.packages.ghc8103.override sharedOverrides);
};
};
};
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cbf707b2af4cd66bdcdd84b2bddfb627194b39c0",
"sha256": "1bj55jkgdzx7lv6dvy26l354c7vsxaa1jipm99axgqqax905m8sa",
"rev": "8911c99c2f1bf44210be7ff35314430f02f0f33d",
"sha256": "06mi91yxidjyyrc7q5dbi1j8bxi2iird0ivqcnb4kiglpw0ivpkr",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cbf707b2af4cd66bdcdd84b2bddfb627194b39c0.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/8911c99c2f1bf44210be7ff35314430f02f0f33d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}