Skip to content
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.

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

Move back to nixpkgs checkout #356

Merged
merged 1 commit into from
Jul 23, 2018
Merged

Move back to nixpkgs checkout #356

merged 1 commit into from
Jul 23, 2018

Conversation

mboes
Copy link
Member

@mboes mboes commented Jul 21, 2018

We no longer need to pull bazel from cachix, now that
NixOS/nixpkgs#42735 has been merged and has
hit the cache.nixos.org cache.

@mboes mboes requested a review from mrkkrp July 21, 2018 17:54
tests/ghc.nix Outdated

with pkgs;

let haskellPackages = pkgs.haskell.packages.ghc822.override {
overrides = with pkgs.haskell.lib; self: super: rec {
lens-labels = super.lens-labels_0_2_0_1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not to delete the whole override if we don't actually change anything with it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Wasn't thinking!

@@ -4,8 +4,8 @@ with pkgs;

let haskellPackages = pkgs.haskell.packages.ghc822.override {
overrides = with pkgs.haskell.lib; self: super: rec {
lens-labels = super.lens-labels_0_2_0_1;
proto-lens = super.proto-lens_0_3_1_0;
lens-labels = super.lens-labels;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same here.

We no longer need to pull bazel from cachix, now that
NixOS/nixpkgs#42735 has been merged and has
hit the cache.nixos.org cache.
@mboes mboes merged commit d338774 into master Jul 23, 2018
@mboes mboes deleted the bazel-from-nixpkgs branch July 23, 2018 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants