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: 88ad7c8ef621
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 154ff7ecc152
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 20, 2021

  1. haskellPackages.diagrams-core: restrict to < 1.5.0 

    diagrams-core has adjusted to the Optional deprecation and monoid-extras
0.6, but the rest of the diagrams-* libraries haven't yet. Until that
happens we also need to pin it to an older version.
    @sternenseemann
    sternenseemann committed May 20, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    154ff7e View commit details
Showing with 26 additions and 3 deletions.
  1. +6 −3 pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
  2. +20 −0 pkgs/development/haskell-modules/hackage-packages.nix
9 changes: 6 additions & 3 deletions pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file
Original file line number Diff line number Diff line change
@@ -77,10 +77,13 @@ default-package-overrides:
- gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 #
# 2021-05-11: the diagrams libraries still depends on pre 0.6,
# e. g. https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin presumably until base 4.15
# 2021-05-11: not all diagrams libraries have adjusted to
# monoid-extras 0.6 yet, keep them pinned to lower versions
# until we can do a full migration, see
# https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin at most until base 4.15
- monoid-extras < 0.6
- diagrams-core < 1.5.0
# 2021-05-11: Pin for hls 1.1.0
- ghcide == 1.2.*
- hls-plugin-api == 1.1.0.0
20 changes: 20 additions & 0 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.