Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1435ace4e490
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b155ff6a5dee
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 13, 2017

  1. remove missing attribute 'lens-family-th_0_4_1_0' 

    $ nix-env -f '<nixpkgs>' -qaPA pkgs.haskell.packages.ghc7103 -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/master.tar.gz
error: attribute ‘lens-family-th_0_4_1_0’ missing, at /nix/store/l7kr5m1h1rp16fh7d1m47caj2yj6xz4m-master.tar.gz/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix:161:20
    @wizzup
    wizzup committed Nov 13, 2017
    Copy the full SHA
    03cce16 View commit details

  2. remove missing attribute 'cabal-helper_0_6_3_1' 

    $ nix-shell -p haskell.packages.ghc7103.ghc-mod -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/master.tar.gz
error: attribute ‘cabal-helper_0_6_3_1’ missing, at /nix/store/l7kr5m1h1rp16fh7d1m47caj2yj6xz4m-master.tar.gz/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix:211:53
    @wizzup
    wizzup committed Nov 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Zuoqiu-Yingyi Yingyi / 颖逸
    GPG key ID: 833DAD5428FF18A8
    Verified
    Learn about vigilant mode
    Copy the full SHA
    587219b View commit details

  3. Merge pull request #31603 from wizzup/fix-missing-haskell-attr 

    configuration-ghc-7.10.x.nix: Remove missing attributes.
    @peti
    peti authored Nov 13, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b155ff6 View commit details
Showing with 0 additions and 6 deletions.
  1. +0 −6 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
6 changes: 0 additions & 6 deletions pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file
Original file line number Diff line number Diff line change
@@ -157,9 +157,6 @@ self: super: {
haddock-api = self.haddock-api_2_16_1;
haddock-library = self.haddock-library_1_2_1;

# lens-family-th >= 0.5.0.0 is GHC 8.0 only
lens-family-th = self.lens-family-th_0_4_1_0;

# The tests in vty-ui do not build, but vty-ui itself builds.
vty-ui = enableCabalFlag super.vty-ui "no-tests";

@@ -207,9 +204,6 @@ self: super: {
# also tests require bytestring>=0.10.8.1
cereal = dontCheck (addBuildDepend super.cereal self.fail);

# Moved out from common as no longer the case for GHC8
ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };

# The test suite requires Cabal 1.24.x or later to compile.
comonad = dontCheck super.comonad;
semigroupoids = dontCheck super.semigroupoids;