From 73aae883291f3b256009ffdec497cc8826b89a8a Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Thu, 5 Nov 2020 21:33:11 -0500 Subject: [PATCH 1/8] haskell-overlays: update some, dependent-sum, reflex, etc --- ChangeLog.md | 9 +++++++++ haskell-overlays/reflex-packages/default.nix | 13 ++++++++----- .../dep/dependent-sum-aeson-orphans/default.nix | 2 ++ .../dep/dependent-sum-aeson-orphans/github.json | 8 ++++++++ .../dep/dependent-sum-aeson-orphans/thunk.nix | 9 +++++++++ .../reflex-packages/dep/patch/default.nix | 8 +------- .../reflex-packages/dep/patch/github.json | 6 +++--- .../reflex-packages/dep/patch/thunk.nix | 9 +++++++++ .../reflex-packages/dep/reflex/github.json | 6 +++--- 9 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix create mode 100644 haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json create mode 100644 haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix create mode 100644 haskell-overlays/reflex-packages/dep/patch/thunk.nix diff --git a/ChangeLog.md b/ChangeLog.md index fd4c268cf..797235447 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -12,6 +12,15 @@ This project's release branch is `master`. This log is written from the perspect * gargoyle-postgresql-nix to 0.3.0.0 * aeson-gadt-th to 0.2.4 * reflex-ghci to 0.1.5.0 + * constraints-extras to 0.3.0.2 + * some to 1.0.1 + * prim-uniq to 0.2 + * aeson-gadt-th to 0.2.4 + * dependent-map to 0.4 + * dependent-sum to 0.7.1.0 + * dependent-sum-template to 0.1.0.3 + * dependent-sum-aeson-orphans to 0.3.0.0 + * reflex to 0.7.2.0 * New Pins * gargoyle-postgresql-connect 0.1.0.0 diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index ed5c41226..979b42c2e 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -175,12 +175,15 @@ in sha256 = "0csmxyxkxqgx0v2vwphz80515nqz1hpw5v7391fqpjm7bfgy47k4"; } + "/hspec-webdriver") {}; - constraints-extras = self.callHackage "constraints-extras" "0.3.0.1" {}; - aeson-gadt-th = self.callCabal2nix "aeson-gadt-th" self._dep.aeson-gadt-th {}; - dependent-map = self.callHackage "dependent-map" "0.3" {}; - dependent-sum = self.callHackage "dependent-sum" "0.6.2.0" {}; - dependent-sum-template = self.callHackage "dependent-sum-template" "0.1.0.0" {}; + constraints-extras = self.callHackage "constraints-extras" "0.3.0.2" {}; + some = self.callHackage "some" "1.0.1" {}; + prim-uniq = self.callHackage "prim-uniq" "0.2" {}; + aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.4" {}; + dependent-map = self.callHackage "dependent-map" "0.4.0.0" {}; + dependent-sum = self.callHackage "dependent-sum" "0.7.1.0" {}; + dependent-sum-template = self.callHackage "dependent-sum-template" "0.1.0.3" {}; dependent-sum-universe-orphans = self.callCabal2nix "dependent-sum-universe-orphans" self._dep.dependent-sum-universe-orphans {}; + dependent-sum-aeson-orphans = self.callCabal2nix "dependent-sum-aeson-orphans" self._dep.dependent-sum-aeson-orphans {}; # Need to use `--subpath` because LICENSE in each dir is a symlink to the repo root. universe = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe" {}; diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix new file mode 100644 index 000000000..2b4d4ab11 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/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/dependent-sum-aeson-orphans/github.json b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json new file mode 100644 index 000000000..62e96d389 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json @@ -0,0 +1,8 @@ +{ + "owner": "obsidiansystems", + "repo": "dependent-sum-aeson-orphans", + "branch": "release/0.3.0.0", + "private": false, + "rev": "f0ab96d2f773393d232fde9ae5e6c29c406ac283", + "sha256": "1spmi8fd177yqacq504511w1wyjyjff3l9dh31yp8w117hjwxas5" +} diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix new file mode 100644 index 000000000..bbf2dc18f --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/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 diff --git a/haskell-overlays/reflex-packages/dep/patch/default.nix b/haskell-overlays/reflex-packages/dep/patch/default.nix index 0cf822e33..2b4d4ab11 100644 --- a/haskell-overlays/reflex-packages/dep/patch/default.nix +++ b/haskell-overlays/reflex-packages/dep/patch/default.nix @@ -1,8 +1,2 @@ # 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; - }; -in import (fetch (builtins.fromJSON (builtins.readFile ./github.json))) +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 index e8ca00374..57906577d 100644 --- a/haskell-overlays/reflex-packages/dep/patch/github.json +++ b/haskell-overlays/reflex-packages/dep/patch/github.json @@ -1,8 +1,8 @@ { "owner": "reflex-frp", "repo": "patch", - "branch": "master", + "branch": "release/0.0.3.2", "private": false, - "rev": "25f202b4c05fe7f319a606667bb6873e1d386f56", - "sha256": "1afaxvi8fmn16kmkid8dx0xxdpa7scz8anbh1csbbzd33z3dmijl" + "rev": "e7be372b658997329dc7a34835bc48d33306f8e6", + "sha256": "1fm0nx74cs1jzvjjy9bzcif6hxhbidxaq4gw0r8q4cii2jc959vz" } 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 diff --git a/haskell-overlays/reflex-packages/dep/reflex/github.json b/haskell-overlays/reflex-packages/dep/reflex/github.json index 19fbfdcc4..717cb2325 100644 --- a/haskell-overlays/reflex-packages/dep/reflex/github.json +++ b/haskell-overlays/reflex-packages/dep/reflex/github.json @@ -1,8 +1,8 @@ { "owner": "reflex-frp", "repo": "reflex", - "branch": "release/0.7.1.0", + "branch": "release/0.7.2.0", "private": false, - "rev": "122d7361e31bbceb2cfd75df117c3bcc80673a93", - "sha256": "1kbanrqrwji1yxisj4pjv1vqcq357j2ksl03whqrksgprdmbvxnv" + "rev": "f507c19eca59bde68eacfc6ad572014a334a2a8f", + "sha256": "1c9wp1hakjayb2rhs6fs44i99da0ngy5m5dc42ny7105f69bqjsb" } From fd5acecb50474f795734db9fb924cc3b2fd2b508 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 09:19:15 -0500 Subject: [PATCH 2/8] Bump reflex, reflex-dom, reflex-vty, patch --- ChangeLog.md | 3 +++ haskell-overlays/reflex-packages/default.nix | 2 +- haskell-overlays/reflex-packages/dep/patch/github.json | 4 ++-- .../reflex-packages/dep/reflex-dom/github.json | 6 +++--- .../reflex-packages/dep/reflex-vty/default.nix | 2 ++ .../reflex-packages/dep/reflex-vty/github.json | 8 ++++++++ .../reflex-packages/dep/reflex-vty/thunk.nix | 9 +++++++++ haskell-overlays/reflex-packages/dep/reflex/github.json | 6 +++--- 8 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 haskell-overlays/reflex-packages/dep/reflex-vty/default.nix create mode 100644 haskell-overlays/reflex-packages/dep/reflex-vty/github.json create mode 100644 haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix diff --git a/ChangeLog.md b/ChangeLog.md index 8317fa523..c1500549d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -21,6 +21,9 @@ This project's release branch is `master`. This log is written from the perspect * dependent-sum-template to 0.1.0.3 * dependent-sum-aeson-orphans to 0.3.0.0 * reflex to 0.7.2.0 + * reflex-vty to 0.1.4.1 + * patch to 0.0.3.2 + * reflex-dom to 0.6.1.0 * New Pins * gargoyle-postgresql-connect 0.1.0.0 diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index 979b42c2e..86a50d661 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -101,7 +101,7 @@ in ## Terminal / Conventional OS ## - reflex-vty = self.callHackage "reflex-vty" "0.1.4.0" {}; + reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {}; reflex-process = self.callHackage "reflex-process" "0.3.0.0" {}; reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.1" {}; diff --git a/haskell-overlays/reflex-packages/dep/patch/github.json b/haskell-overlays/reflex-packages/dep/patch/github.json index 57906577d..5bac20131 100644 --- a/haskell-overlays/reflex-packages/dep/patch/github.json +++ b/haskell-overlays/reflex-packages/dep/patch/github.json @@ -3,6 +3,6 @@ "repo": "patch", "branch": "release/0.0.3.2", "private": false, - "rev": "e7be372b658997329dc7a34835bc48d33306f8e6", - "sha256": "1fm0nx74cs1jzvjjy9bzcif6hxhbidxaq4gw0r8q4cii2jc959vz" + "rev": "fa75664626d85182ec518c70143b2a703d726422", + "sha256": "1ipm1m7fmbf32zn8npgqra5h1i0wrnlyhk9q0k4yvjrblllp2xxp" } diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json index 88b0e788c..f817ae865 100644 --- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json +++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json @@ -1,8 +1,8 @@ { "owner": "reflex-frp", "repo": "reflex-dom", - "branch": "release/0.6.0.0", + "branch": "release/0.6.1.0", "private": false, - "rev": "9c696a0f382321c72237c206699efda2e30faef4", - "sha256": "1s9706p93f5dsx4rf4rgn2izlgq19lqczc5vfq79p4ayxhmlj41z" + "rev": "fc7d4fd7788339f247158fef8042272758337d71", + "sha256": "1y9gb3s7cms1jchfwh26ys2q7s2zcilqixx5rd55wrzcp8kyplca" } diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix b/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix new file mode 100644 index 000000000..2b4d4ab11 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-vty/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/reflex-vty/github.json b/haskell-overlays/reflex-packages/dep/reflex-vty/github.json new file mode 100644 index 000000000..02b7cf842 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-vty/github.json @@ -0,0 +1,8 @@ +{ + "owner": "reflex-frp", + "repo": "reflex-vty", + "branch": "release/0.1.4.1", + "private": false, + "rev": "918fb074b04190f0b61bb5674a689416257b5896", + "sha256": "17gsha9rychwh1gnd5wcjgbrcsz3nljsvm29v9mi561sdfp7nzfa" +} diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix new file mode 100644 index 000000000..bbf2dc18f --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-vty/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 diff --git a/haskell-overlays/reflex-packages/dep/reflex/github.json b/haskell-overlays/reflex-packages/dep/reflex/github.json index 717cb2325..a78a7c67e 100644 --- a/haskell-overlays/reflex-packages/dep/reflex/github.json +++ b/haskell-overlays/reflex-packages/dep/reflex/github.json @@ -1,8 +1,8 @@ { "owner": "reflex-frp", "repo": "reflex", - "branch": "release/0.7.2.0", + "branch": "release/0.8.0.0", "private": false, - "rev": "f507c19eca59bde68eacfc6ad572014a334a2a8f", - "sha256": "1c9wp1hakjayb2rhs6fs44i99da0ngy5m5dc42ny7105f69bqjsb" + "rev": "3369fceadb132a980ab1ccbed7471ba36a9ef642", + "sha256": "0wy41ya0g6klw7ps8ki2cqb9mm1y4d21jm98dd5niahbdldzkhl2" } From b61102ee502b71642e3dbe0bcad1e0b6c24da850 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 11:18:43 -0500 Subject: [PATCH 3/8] Bump reflex-fsnotify --- ChangeLog.md | 1 + haskell-overlays/reflex-packages/default.nix | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index c1500549d..45fe20093 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -24,6 +24,7 @@ This project's release branch is `master`. This log is written from the perspect * reflex-vty to 0.1.4.1 * patch to 0.0.3.2 * reflex-dom to 0.6.1.0 + * reflex-fsnotify to 0.2.1.2 * New Pins * gargoyle-postgresql-connect 0.1.0.0 diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index 86a50d661..8feb79433 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -103,7 +103,11 @@ in reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {}; reflex-process = self.callHackage "reflex-process" "0.3.0.0" {}; - reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.1" {}; + reflex-fsnotify = self.callHackageDirect + { pkg = "reflex-fsnotify"; + ver = "0.2.1.2"; + sha256 = "1xnrgxsdkjxp2gls9yw4snkcw4zvgkw4viigiylqpfzhp50vlspp"; + } {}; ## ## Tooling From 2a321e2734733ae4ebe006746b10a682a8022303 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 11:28:10 -0500 Subject: [PATCH 4/8] Bump reflex-process --- ChangeLog.md | 1 + haskell-overlays/reflex-packages/default.nix | 8 ++------ .../reflex-packages/dep/reflex-fsnotify/default.nix | 2 ++ .../reflex-packages/dep/reflex-fsnotify/github.json | 8 ++++++++ .../reflex-packages/dep/reflex-fsnotify/thunk.nix | 9 +++++++++ .../reflex-packages/dep/reflex-process/default.nix | 2 ++ .../reflex-packages/dep/reflex-process/github.json | 8 ++++++++ .../reflex-packages/dep/reflex-process/thunk.nix | 9 +++++++++ 8 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix create mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json create mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix create mode 100644 haskell-overlays/reflex-packages/dep/reflex-process/default.nix create mode 100644 haskell-overlays/reflex-packages/dep/reflex-process/github.json create mode 100644 haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix diff --git a/ChangeLog.md b/ChangeLog.md index 45fe20093..36cf97add 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -25,6 +25,7 @@ This project's release branch is `master`. This log is written from the perspect * patch to 0.0.3.2 * reflex-dom to 0.6.1.0 * reflex-fsnotify to 0.2.1.2 + * reflex-process to 0.3.1.0 * New Pins * gargoyle-postgresql-connect 0.1.0.0 diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index 8feb79433..476522128 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -102,12 +102,8 @@ in ## reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {}; - reflex-process = self.callHackage "reflex-process" "0.3.0.0" {}; - reflex-fsnotify = self.callHackageDirect - { pkg = "reflex-fsnotify"; - ver = "0.2.1.2"; - sha256 = "1xnrgxsdkjxp2gls9yw4snkcw4zvgkw4viigiylqpfzhp50vlspp"; - } {}; + reflex-process = self.callCabal2nix "reflex-process" self._dep.reflex-process {}; + reflex-fsnotify = self.callCabal2nix "reflex-fsnotify" self._dep.reflex-fsnotify {}; ## ## Tooling diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix new file mode 100644 index 000000000..2b4d4ab11 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/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/reflex-fsnotify/github.json b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json new file mode 100644 index 000000000..fce895167 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json @@ -0,0 +1,8 @@ +{ + "owner": "reflex-frp", + "repo": "reflex-fsnotify", + "branch": "release/0.2.1.2", + "private": false, + "rev": "cca674623b797dd423421dec0f1da952a1d1f36d", + "sha256": "1q7mmdba2lrc8pgnqf8fif3zjprk8h5kj8l1g6gnmzqc5566qqq1" +} diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix new file mode 100644 index 000000000..bbf2dc18f --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/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 diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/default.nix b/haskell-overlays/reflex-packages/dep/reflex-process/default.nix new file mode 100644 index 000000000..2b4d4ab11 --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-process/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/reflex-process/github.json b/haskell-overlays/reflex-packages/dep/reflex-process/github.json new file mode 100644 index 000000000..f3a21825e --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-process/github.json @@ -0,0 +1,8 @@ +{ + "owner": "reflex-frp", + "repo": "reflex-process", + "branch": "release/0.3.1.0", + "private": false, + "rev": "b5a6bba575db63547586454dd64493a0b5c39312", + "sha256": "11ipj3nqzyw98yvsh9lf0rwmy3z49r2mmm03j73bd5zll95qrjv9" +} diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix new file mode 100644 index 000000000..bbf2dc18f --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-process/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 From 3dfa52ed6be8060e524ab8e20c65ae7603050bed Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 11:30:49 -0500 Subject: [PATCH 5/8] Update reflex-dom --- haskell-overlays/reflex-packages/dep/reflex-dom/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json index f817ae865..19bfc15d0 100644 --- a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json +++ b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json @@ -3,6 +3,6 @@ "repo": "reflex-dom", "branch": "release/0.6.1.0", "private": false, - "rev": "fc7d4fd7788339f247158fef8042272758337d71", - "sha256": "1y9gb3s7cms1jchfwh26ys2q7s2zcilqixx5rd55wrzcp8kyplca" + "rev": "02c61ecff6ed6e1bda4a68b24d6c2e04c70a31e2", + "sha256": "1m54blk368n5ljj1iyicas2ksl1f0x7i5gkqpy1l6yjq3f8r9awy" } From b3f97138a069c65cffd977a0de9f97226da53f62 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 11:35:04 -0500 Subject: [PATCH 6/8] Bump reflex-ghci to 0.1.5.1 --- ChangeLog.md | 2 +- .../reflex-packages/dep/reflex-ghci/default.nix | 3 ++- .../reflex-packages/dep/reflex-ghci/github.json | 6 ++++-- .../reflex-packages/dep/reflex-ghci/thunk.nix | 9 +++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix diff --git a/ChangeLog.md b/ChangeLog.md index 36cf97add..53202d432 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -11,7 +11,7 @@ This project's release branch is `master`. This log is written from the perspect * gargoyle-postgresql to 0.2.0.1 * gargoyle-postgresql-nix to 0.3.0.0 * aeson-gadt-th to 0.2.4 - * reflex-ghci to 0.1.5.0 + * reflex-ghci to 0.1.5.1 * constraints-extras to 0.3.0.2 * some to 1.0.1 * prim-uniq to 0.2 diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix b/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix index d42886c4e..2b4d4ab11 100644 --- a/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix +++ b/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix @@ -1 +1,2 @@ -import ((import {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json))) +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json b/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json index 1cd4697cc..0e5b53d93 100644 --- a/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json +++ b/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json @@ -1,6 +1,8 @@ { "owner": "reflex-frp", "repo": "reflex-ghci", - "rev": "d891f241608e75698d664c76a2a2538cc054e225", - "sha256": "144i759wh7iis61kqhsqbqjyzavhrk8v289w90a8byfc0wpz31qx" + "branch": "release/0.1.5.1", + "private": false, + "rev": "37b11873a5434c87b0d86842ffabbbcf37282634", + "sha256": "07vgljxyvg0vrpn3qr2cspahpk6f5hlxmy96ik3pn1l8fljgmnvk" } diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix new file mode 100644 index 000000000..bbf2dc18f --- /dev/null +++ b/haskell-overlays/reflex-packages/dep/reflex-ghci/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 From bf1ac75cc250865a99e48f9b623bb211d7b704b0 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 12:59:38 -0500 Subject: [PATCH 7/8] nixpkgs-overlays: bump all-cabal-hashes again --- ChangeLog.md | 2 +- nixpkgs-overlays/all-cabal-hashes/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 53202d432..e0052bad0 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,7 +5,7 @@ This project's release branch is `master`. This log is written from the perspect ## Unreleased * Bump - * all-cabal-hashes ("Update from Hackage at 2020-11-05T15:13:14Z") + * all-cabal-hashes ("Update from Hackage at 2020-11-06T16:55:57Z") * which to 0.2.0.0 * gargoyle to 0.1.1.0 * gargoyle-postgresql to 0.2.0.1 diff --git a/nixpkgs-overlays/all-cabal-hashes/default.nix b/nixpkgs-overlays/all-cabal-hashes/default.nix index ecdb4b844..b9b59efcb 100644 --- a/nixpkgs-overlays/all-cabal-hashes/default.nix +++ b/nixpkgs-overlays/all-cabal-hashes/default.nix @@ -1,8 +1,8 @@ self: _: { all-cabal-hashes = self.fetchurl { - url = https://github.com/commercialhaskell/all-cabal-hashes/archive/9fc1b1a8ef87c10ef0f9f95072b3e00558d98eaa.tar.gz; - sha256 = "06m0s72xkshq2kyi9fd2pn253ji02jyxll771wjf011wways1917"; + url = https://github.com/commercialhaskell/all-cabal-hashes/archive/f9af738d0a5095d79aa4dadfba12435c480c23c8.tar.gz; + sha256 = "1npwbwf0972bvbwgxf75viqcyak8kapbyx8d54n1ybx77f6cs903"; }; } From 12ae3129e266c81810bb7d5cc7daf1e80e63375e Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 6 Nov 2020 13:05:25 -0500 Subject: [PATCH 8/8] reflex-packages: remove unnecessary thunks --- haskell-overlays/reflex-packages/default.nix | 16 +++++++--------- .../reflex-packages/dep/aeson-gadt-th/git.json | 6 ------ .../dep/dependent-sum-aeson-orphans/default.nix | 2 -- .../dep/dependent-sum-aeson-orphans/github.json | 8 -------- .../dep/dependent-sum-aeson-orphans/thunk.nix | 9 --------- .../reflex-packages/dep/patch/default.nix | 2 -- .../reflex-packages/dep/patch/github.json | 8 -------- .../reflex-packages/dep/patch/thunk.nix | 9 --------- .../dep/reflex-fsnotify/default.nix | 2 -- .../dep/reflex-fsnotify/github.json | 8 -------- .../dep/reflex-fsnotify/thunk.nix | 9 --------- .../reflex-packages/dep/reflex-ghci/default.nix | 2 -- .../reflex-packages/dep/reflex-ghci/github.json | 8 -------- .../reflex-packages/dep/reflex-ghci/thunk.nix | 9 --------- .../dep/reflex-process/default.nix | 2 -- .../dep/reflex-process/github.json | 8 -------- .../reflex-packages/dep/reflex-process/thunk.nix | 9 --------- .../reflex-packages/dep/reflex-vty/default.nix | 2 -- .../reflex-packages/dep/reflex-vty/github.json | 8 -------- .../reflex-packages/dep/reflex-vty/thunk.nix | 9 --------- .../reflex-packages/dep/which/github.json | 6 ------ 21 files changed, 7 insertions(+), 135 deletions(-) delete mode 100644 haskell-overlays/reflex-packages/dep/aeson-gadt-th/git.json delete mode 100644 haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix delete mode 100644 haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json delete mode 100644 haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix delete mode 100644 haskell-overlays/reflex-packages/dep/patch/default.nix delete mode 100644 haskell-overlays/reflex-packages/dep/patch/github.json delete mode 100644 haskell-overlays/reflex-packages/dep/patch/thunk.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-ghci/github.json delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-process/default.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-process/github.json delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-vty/default.nix delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-vty/github.json delete mode 100644 haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix delete mode 100644 haskell-overlays/reflex-packages/dep/which/github.json diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index 476522128..746f50852 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -101,15 +101,15 @@ in ## Terminal / Conventional OS ## - reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {}; - reflex-process = self.callCabal2nix "reflex-process" self._dep.reflex-process {}; - reflex-fsnotify = self.callCabal2nix "reflex-fsnotify" self._dep.reflex-fsnotify {}; + reflex-vty = self.callHackage "reflex-vty" "0.1.4.1" {}; + reflex-process = self.callHackage "reflex-process" "0.3.1.0" {}; + reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.2" {}; ## ## Tooling ## - reflex-ghci = self.callCabal2nix "reflex-ghci" self._dep.reflex-ghci {}; + reflex-ghci = self.callHackage "reflex-ghci" "0.1.5.1" {}; ## ## GHCJS and JSaddle @@ -154,17 +154,15 @@ in librarySystemDepends = (drv.librarySystemDepends or []) ++ [ nixpkgs.postgresql_10 ]; }); gargoyle-postgresql-connect = self.callCabal2nixWithOptions "gargoyle-postgresql-connect" gargoyleSrc "--subpath gargoyle-postgresql-connect" {}; - which = self.callCabal2nix "which" self._dep.which {}; # Updated to 0.2 + which = self.callHackage "which" "0.2" {}; ## ## Misc other dependencies ## haskell-gi-overloading = dontHaddock (self.callHackage "haskell-gi-overloading" "0.0" {}); - monoidal-containers = self.callHackage "monoidal-containers" "0.6.0.1" {}; - - patch = self.callCabal2nix "patch" self._dep.patch {}; + patch = self.callHackage "patch" "0.0.3.2" {}; # Not on Hackage yet # Version 1.2.1 not on Hackage yet @@ -183,7 +181,7 @@ in dependent-sum = self.callHackage "dependent-sum" "0.7.1.0" {}; dependent-sum-template = self.callHackage "dependent-sum-template" "0.1.0.3" {}; dependent-sum-universe-orphans = self.callCabal2nix "dependent-sum-universe-orphans" self._dep.dependent-sum-universe-orphans {}; - dependent-sum-aeson-orphans = self.callCabal2nix "dependent-sum-aeson-orphans" self._dep.dependent-sum-aeson-orphans {}; + dependent-sum-aeson-orphans = self.callHackage "dependent-sum-aeson-orphans" "0.3.0.0" {}; # Need to use `--subpath` because LICENSE in each dir is a symlink to the repo root. universe = self.callCabal2nixWithOptions "universe" universeRepo "--subpath universe" {}; diff --git a/haskell-overlays/reflex-packages/dep/aeson-gadt-th/git.json b/haskell-overlays/reflex-packages/dep/aeson-gadt-th/git.json deleted file mode 100644 index 2157e5df7..000000000 --- a/haskell-overlays/reflex-packages/dep/aeson-gadt-th/git.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "url": "https://github.com/obsidiansystems/aeson-gadt-th.git", - "rev": "990e26cf076478d06f7c31e409723b43a8bfe685", - "sha256": "0kcd0wzsrlswa07h6z2lc6fx29xykazaqyi1jpb5k026r3hjk5yr", - "fetchSubmodules": false -} diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json deleted file mode 100644 index 62e96d389..000000000 --- a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "obsidiansystems", - "repo": "dependent-sum-aeson-orphans", - "branch": "release/0.3.0.0", - "private": false, - "rev": "f0ab96d2f773393d232fde9ae5e6c29c406ac283", - "sha256": "1spmi8fd177yqacq504511w1wyjyjff3l9dh31yp8w117hjwxas5" -} diff --git a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix b/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix deleted file mode 100644 index bbf2dc18f..000000000 --- a/haskell-overlays/reflex-packages/dep/dependent-sum-aeson-orphans/thunk.nix +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/haskell-overlays/reflex-packages/dep/patch/default.nix b/haskell-overlays/reflex-packages/dep/patch/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/haskell-overlays/reflex-packages/dep/patch/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index 5bac20131..000000000 --- a/haskell-overlays/reflex-packages/dep/patch/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "reflex-frp", - "repo": "patch", - "branch": "release/0.0.3.2", - "private": false, - "rev": "fa75664626d85182ec518c70143b2a703d726422", - "sha256": "1ipm1m7fmbf32zn8npgqra5h1i0wrnlyhk9q0k4yvjrblllp2xxp" -} diff --git a/haskell-overlays/reflex-packages/dep/patch/thunk.nix b/haskell-overlays/reflex-packages/dep/patch/thunk.nix deleted file mode 100644 index bbf2dc18f..000000000 --- a/haskell-overlays/reflex-packages/dep/patch/thunk.nix +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json deleted file mode 100644 index fce895167..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "reflex-frp", - "repo": "reflex-fsnotify", - "branch": "release/0.2.1.2", - "private": false, - "rev": "cca674623b797dd423421dec0f1da952a1d1f36d", - "sha256": "1q7mmdba2lrc8pgnqf8fif3zjprk8h5kj8l1g6gnmzqc5566qqq1" -} diff --git a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix deleted file mode 100644 index bbf2dc18f..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix b/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-ghci/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json b/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json deleted file mode 100644 index 0e5b53d93..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-ghci/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "reflex-frp", - "repo": "reflex-ghci", - "branch": "release/0.1.5.1", - "private": false, - "rev": "37b11873a5434c87b0d86842ffabbbcf37282634", - "sha256": "07vgljxyvg0vrpn3qr2cspahpk6f5hlxmy96ik3pn1l8fljgmnvk" -} diff --git a/haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix deleted file mode 100644 index bbf2dc18f..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-ghci/thunk.nix +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/default.nix b/haskell-overlays/reflex-packages/dep/reflex-process/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-process/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/github.json b/haskell-overlays/reflex-packages/dep/reflex-process/github.json deleted file mode 100644 index f3a21825e..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-process/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "reflex-frp", - "repo": "reflex-process", - "branch": "release/0.3.1.0", - "private": false, - "rev": "b5a6bba575db63547586454dd64493a0b5c39312", - "sha256": "11ipj3nqzyw98yvsh9lf0rwmy3z49r2mmm03j73bd5zll95qrjv9" -} diff --git a/haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix deleted file mode 100644 index bbf2dc18f..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-process/thunk.nix +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix b/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix deleted file mode 100644 index 2b4d4ab11..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/github.json b/haskell-overlays/reflex-packages/dep/reflex-vty/github.json deleted file mode 100644 index 02b7cf842..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-vty/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "reflex-frp", - "repo": "reflex-vty", - "branch": "release/0.1.4.1", - "private": false, - "rev": "918fb074b04190f0b61bb5674a689416257b5896", - "sha256": "17gsha9rychwh1gnd5wcjgbrcsz3nljsvm29v9mi561sdfp7nzfa" -} diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix deleted file mode 100644 index bbf2dc18f..000000000 --- a/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix +++ /dev/null @@ -1,9 +0,0 @@ -# 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 diff --git a/haskell-overlays/reflex-packages/dep/which/github.json b/haskell-overlays/reflex-packages/dep/which/github.json deleted file mode 100644 index 18a5413f7..000000000 --- a/haskell-overlays/reflex-packages/dep/which/github.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "owner": "obsidiansystems", - "repo": "which", - "rev": "29ec2b4675872afffeee9d4a6f37f4057d52ec7d", - "sha256": "1pm155p4ncbd61lsaicg6s6d6zv5h98c9dl5x675bnlhymk8zq9b" -}