Skip to content

Commit

Permalink
Merge pull request #703 from reflex-frp/aa-bump-some
Browse files Browse the repository at this point in the history
haskell-overlays: update some, dependent-sum, reflex, etc
  • Loading branch information
ali-abrar authored Nov 6, 2020
2 parents 5f137ea + 12ae312 commit 6a67520
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 58 deletions.
18 changes: 16 additions & 2 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,27 @@ 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
* 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
* 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
* 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
* reflex-process to 0.3.1.0
* New Pins
* gargoyle-postgresql-connect 0.1.0.0

Expand Down
27 changes: 14 additions & 13 deletions haskell-overlays/reflex-packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ in
## Terminal / Conventional OS
##

reflex-vty = self.callHackage "reflex-vty" "0.1.4.0" {};
reflex-process = self.callHackage "reflex-process" "0.3.0.0" {};
reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.1" {};
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
Expand Down Expand Up @@ -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
Expand All @@ -175,12 +173,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.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" {};
Expand Down
6 changes: 0 additions & 6 deletions haskell-overlays/reflex-packages/dep/aeson-gadt-th/git.json

This file was deleted.

8 changes: 0 additions & 8 deletions haskell-overlays/reflex-packages/dep/patch/default.nix

This file was deleted.

8 changes: 0 additions & 8 deletions haskell-overlays/reflex-packages/dep/patch/github.json

This file was deleted.

6 changes: 3 additions & 3 deletions haskell-overlays/reflex-packages/dep/reflex-dom/github.json
Original file line number Diff line number Diff line change
@@ -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": "02c61ecff6ed6e1bda4a68b24d6c2e04c70a31e2",
"sha256": "1m54blk368n5ljj1iyicas2ksl1f0x7i5gkqpy1l6yjq3f8r9awy"
}

This file was deleted.

6 changes: 0 additions & 6 deletions haskell-overlays/reflex-packages/dep/reflex-ghci/github.json

This file was deleted.

6 changes: 3 additions & 3 deletions haskell-overlays/reflex-packages/dep/reflex/github.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"owner": "reflex-frp",
"repo": "reflex",
"branch": "release/0.7.1.0",
"branch": "release/0.8.0.0",
"private": false,
"rev": "122d7361e31bbceb2cfd75df117c3bcc80673a93",
"sha256": "1kbanrqrwji1yxisj4pjv1vqcq357j2ksl03whqrksgprdmbvxnv"
"rev": "3369fceadb132a980ab1ccbed7471ba36a9ef642",
"sha256": "0wy41ya0g6klw7ps8ki2cqb9mm1y4d21jm98dd5niahbdldzkhl2"
}
6 changes: 0 additions & 6 deletions haskell-overlays/reflex-packages/dep/which/github.json

This file was deleted.

4 changes: 2 additions & 2 deletions nixpkgs-overlays/all-cabal-hashes/default.nix
Original file line number Diff line number Diff line change
@@ -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";
};

}

0 comments on commit 6a67520

Please sign in to comment.