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: 65d66ef79947
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a914a49bbfc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 9, 2020

  1. haskellPackages.reflex-dom-core: Remove obsolete patches

    @maralorn
    maralorn committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    692ede0 View commit details

Commits on Nov 10, 2020

  1. Merge pull request #103239 from maralorn/fix-reflex-dom-core 

    haskellPackages.reflex-dom-core: Remove obsolete patches
    @maralorn
    maralorn authored Nov 10, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3a914a4 View commit details
Showing with 1 addition and 19 deletions.
  1. +1 −19 pkgs/development/haskell-modules/configuration-common.nix
20 changes: 1 addition & 19 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1261,25 +1261,7 @@ self: super: {
patch = doJailbreak super.patch;

# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
# Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393
reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [
# Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/388
# Fix upper bounds
(pkgs.fetchpatch {
url = "https://github.com/reflex-frp/reflex-dom/commit/5ef04d8e478f410d2c63603b84af052c9273a533.patch";
sha256 ="0d0b819yh8mqw8ih5asdi9qcca2kmggfsi8gf22akfw1n7xvmavi";
stripLen = 2;
extraPrefix = "";
})
# Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/394
# Bump dependent-map
(pkgs.fetchpatch {
url = "https://github.com/reflex-frp/reflex-dom/commit/695bd17d5dcdb1bf321ee8858670731637f651db.patch";
sha256 ="0llky3i37rakgsw9vqaqmwryv7s91w8ph8xjkh83nxjs14p5zfyk";
stripLen = 2;
extraPrefix = "";
})
])));
reflex-dom-core = doDistribute (unmarkBroken (dontCheck super.reflex-dom-core));

# add unreleased commit fixing version constraint as a patch
# Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved