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: 1917e6fd9e79
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 50863eb06c8f
Choose a head ref
  • 15 commits
  • 5 files changed
  • 4 contributors

Commits on Dec 4, 2020

  1. Stackage Nightly 2020-12-04

    @peti
    peti committed Dec 4, 2020
    Copy the full SHA
    ad19f4c View commit details

  2. hackage2nix: update list of broken builds to avoid evaluation errors

    @peti
    peti committed Dec 4, 2020
    Copy the full SHA
    c5e7cd6 View commit details

  3. haskell-xmpp: 2.0.1 Mark unbroken

    @jappeace @peti
    jappeace authored and peti committed Dec 4, 2020
    Copy the full SHA
    130c356 View commit details

  4. haskellPackages.arithmoi: mark as not broken

    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    9c7e943 View commit details

  5. haskellPackages.arith-encode: mark as not broken

    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    25f91f0 View commit details

  6. haskellPackages.enumeration: mark as not broken

    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    efa9bdd View commit details

  7. haskellPackages.cantor-pairing: mark as not broken

    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    1a6a2bb View commit details

  8. haskellPackages.quadratic-irrational: mark as not broken

    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    bc2c06c View commit details

  9. haskellPackages.cyclotomic: mark as unbroken

    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    b6cb88d View commit details

  10. haskellPackages.hevm: unbreak

    @arcz @peti
    arcz authored and peti committed Dec 4, 2020
    Copy the full SHA
    3e71b42 View commit details

  11. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.15.5-30-g2441a43 from Hackage revision
commercialhaskell/all-cabal-hashes@acab624.
    @peti
    peti committed Dec 4, 2020
    Copy the full SHA
    5d2288e View commit details

  12. haskellPackages.integer-root: don't check 

    The test-suite depends on smallcheck 1.1 but we package 1.2

This is fixed in the upstream repository but the fix hasn't been released yet
    @Taneb @peti
    Taneb authored and peti committed Dec 4, 2020
    Copy the full SHA
    0e31884 View commit details

  13. haskell: drop the obsolete 'unbuildable' meta package

    @peti
    peti committed Dec 4, 2020
    Copy the full SHA
    6b02cc1 View commit details

  14. haskell: drop the obsolete 'multi-ghc-travis' meta package

    @peti
    peti committed Dec 4, 2020
    Copy the full SHA
    8e2abd0 View commit details

  15. Merge pull request #105867 from NixOS/haskell-updates 

    Update Haskell package set to Stackage Nightly 2020-12-04 (plus other fixes)
    @peti
    peti authored Dec 4, 2020

    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
    50863eb View commit details
9 changes: 1 addition & 8 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -38,11 +38,6 @@ self: super: {
ghcjs-base = null;
ghcjs-prim = null;

# Some packages add this (non-existent) dependency to express that they
# cannot compile in a given configuration. Win32 does this, for example, when
# compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'";

# enable using a local hoogle with extra packagages in the database
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
# $ hoogle server
@@ -327,6 +322,7 @@ self: super: {
http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
ihaskell = dontCheck super.ihaskell;
influxdb = dontCheck super.influxdb;
integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
itanium-abi = dontCheck super.itanium-abi;
katt = dontCheck super.katt;
language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
@@ -442,9 +438,6 @@ self: super: {
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6

# Should not appear in nixpkgs yet (broken anyway)
yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix";

# no haddock since this is an umbrella package.
cloud-haskell = dontHaddock super.cloud-haskell;

Loading