diff --git a/ChangeLog.md b/ChangeLog.md index d0545e677..05bee2059 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,11 @@ This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released. +## Unreleased + +* Bump + * patch to 0.0.4.0 + ## v0.7.1.0 * Bump diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index b13958d02..622ccc99d 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -162,7 +162,7 @@ in haskell-gi-overloading = dontHaddock (self.callHackage "haskell-gi-overloading" "0.0" {}); monoidal-containers = self.callHackage "monoidal-containers" "0.6.0.1" {}; - patch = self.callHackage "patch" "0.0.3.2" {}; + patch = self.callCabal2nix "patch" self._dep.patch {}; webdriver = self.callHackage "webdriver" "0.9.0.1" {}; diff --git a/haskell-overlays/reflex-packages/dep/patch/default.nix b/haskell-overlays/reflex-packages/dep/patch/default.nix new file mode 100644 index 000000000..2b4d4ab11 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/patch/default.nix @@ -0,0 +1,2 @@ +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/patch/github.json b/haskell-overlays/reflex-packages/dep/patch/github.json new file mode 100644 index 000000000..6bb35fc6c --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/patch/github.json @@ -0,0 +1,8 @@ +{ + "owner": "reflex-frp", + "repo": "patch", + "branch": "release/0.0.4.0", + "private": false, + "rev": "68cf321722b9992bcb402166e833ff4c6088143d", + "sha256": "17zpzxsb3pb4n3xl8lha8jh0bs7m97fpcjp7wlsg390kzjls4kgy" +} diff --git a/haskell-overlays/reflex-packages/dep/patch/thunk.nix b/haskell-overlays/reflex-packages/dep/patch/thunk.nix new file mode 100644 index 000000000..bbf2dc18f --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/patch/thunk.nix @@ -0,0 +1,9 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file