Skip to content

Commit 4aa4e25

Browse files
ali-abrarali-abrar
authored
Merge pull request #820 from reflex-frp/aa/reflex-0.9.0.1
haskell-overlays: update all-cabal-hashes, reflex-0.9.1.0, reflex-vty…
2 parents 8ae879b + 2c66ff4 commit 4aa4e25

File tree

19 files changed

+85
-44
lines changed

19 files changed

+85
-44
lines changed

‎ChangeLog.md‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,23 @@
22

33
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.
44

5-
## Unreleased
5+
## v1.1.0.0
66

7-
* Bump `some` to 1.0.4
8-
* Bump `dependent-sum-template` to 0.1.2.0
9-
10-
(The thunk for `dependent-sum` is also changed, but there is no corresponding code change so the version is the same. This is just part of separating it from `dependent-sum-template`.)
7+
* *Breaking change*: GHC 8.10.7 is now selected by default. Set `__useNewerCompiler` in default.nix to false if you'd like to keep using GHC 8.6.5.
8+
* Haskell Library Updates
9+
* all-cabal-hashes "Update from Hackage at 2023-05-25T12:06:44Z" ([f297f1f3](https://github.com/commercialhaskell/all-cabal-hashes/commit/f297f1f3fc337e2f94783f254cb6db1ee2022adb))
10+
* reflex 0.9.1.0
11+
* reflex-dom-core 0.8.0.0
12+
* reflex-ghci 0.2.0.0
13+
* reflex-vty 0.4.1.1
14+
* reflex-fsnotify 0.3.0.0
15+
* reflex-process 0.3.2.0
16+
* beam-core 0.10.0.0
17+
* beam-migrate 0.5.2.0
18+
* beam-postgres 0.5.3.0
19+
* beam-automigrate 0.1.3.0
20+
* some 1.0.4
21+
* dependent-sum-template 0.1.2.0
1122

1223
## v1.0.1.0
1324

‎default.nix‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
, useReflexOptimizer ? false
99
, useTextJSString ? true # Use an implementation of "Data.Text" that uses the more performant "Data.JSString" from ghcjs-base under the hood.
1010
, __useTemplateHaskell ? true # Deprecated, just here until we remove feature from reflex and stop CIing it
11-
, __useNewerCompiler ? false
11+
, __useNewerCompiler ? true
1212
, iosSdkVersion ? "16.1"
1313
, nixpkgsOverlays ? []
1414
, haskellOverlays ? [] # TODO deprecate
@@ -182,6 +182,7 @@ let iosSupport = system == "x86_64-darwin";
182182
ios = lib.mapAttrs (_: args: nixpkgsFunc (nixpkgsArgs // args)) rec {
183183
simulator64 = {
184184
crossSystem = lib.systems.examples.iphone64-simulator // {
185+
#isStatic = true;
185186
sdkVer = iosSdkVersion;
186187
inherit xcodeVer;
187188
};
@@ -330,14 +331,13 @@ let iosSupport = system == "x86_64-darwin";
330331
ghcAndroidAarch32-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.android.aarch32.haskell.packages.integer-simple.ghcSplices-8_10).override {
331332
overrides = nixpkgsCross.android.aarch32.haskell.overlays.combined;
332333
});
333-
334-
ghcIosSimulator64 = if __useNewerCompiler then ghcIosSimulator64-8_10 else ghcIosSimulator64-8_6;
335334
ghcIosSimulator64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.simulator64.haskell.packages.integer-simple.ghcSplices-8_6).override {
336335
overrides = nixpkgsCross.ios.simulator64.haskell.overlays.combined;
337336
});
338337
ghcIosSimulator64-8_10 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.simulator64.haskell.packages.integer-simple.ghcSplices-8_10).override {
339338
overrides = nixpkgsCross.ios.simulator64.haskell.overlays.combined;
340339
});
340+
ghcIosSimulator64 = if __useNewerCompiler then ghcIosSimulator64-8_10 else ghcIosSimulator64-8_6;
341341
ghcIosAarch64 = if __useNewerCompiler then ghcIosAarch64-8_10 else ghcIosAarch64-8_6;
342342
ghcIosAarch64-8_6 = makeRecursivelyOverridableBHPToo ((makeRecursivelyOverridable nixpkgsCross.ios.aarch64.haskell.packages.integer-simple.ghcSplices-8_6).override {
343343
overrides = nixpkgsCross.ios.aarch64.haskell.overlays.combined;
@@ -397,6 +397,8 @@ in let this = rec {
397397
ghc8_6
398398
ghc8_10
399399
ghcIosSimulator64
400+
ghcIosSimulator64-8_6
401+
ghcIosSimulator64-8_10
400402
ghcIosAarch64
401403
ghcIosAarch64-8_6
402404
ghcIosAarch64-8_10
@@ -593,7 +595,7 @@ in let this = rec {
593595
};
594596

595597
# Deprecated reexports. These were made for `./scripts/*`, but are reexported
596-
# here for backwards compatability.
598+
# here for backwards compatibility.
597599
legacy = {
598600
# Added 2019-12, will be removed 2020-06.
599601
inherit

‎examples/project/reflex-project-skeleton/github.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"owner": "obsidiansystems",
33
"repo": "reflex-project-skeleton",
4+
"branch": "master",
45
"private": false,
5-
"fetchSubmodules": false,
6-
"rev": "30d29322d74e98d189b755c3d25fffecfee32fe1",
7-
"sha256": "14vcmi3bdmlcj228wj0hzjyqmixyfrd0ch8qzp2655kzik7dbgga"
6+
"rev": "62a1c81f094bf39e694b03ac5aecc5ab13605955",
7+
"sha256": "0cahpv5s2jcwb6qhyl7d35f4vj340hv0cki39vf1zhpcxnymamkv"
88
}

‎examples/project/reflex-project-skeleton/thunk.nix‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
33
if !fetchSubmodules && !private then builtins.fetchTarball {
44
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5-
} else (import <nixpkgs> {}).fetchFromGitHub {
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
69
inherit owner repo rev sha256 fetchSubmodules private;
710
};
811
json = builtins.fromJSON (builtins.readFile ./github.json);

‎haskell-overlays/reflex-packages/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ in
110110

111111
reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {};
112112
reflex-process = self.callCabal2nix "reflex-process" self._dep.reflex-process {};
113-
reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.2" {};
113+
reflex-fsnotify = self.callCabal2nix "reflex-fsnotify" self._dep.reflex-fsnotify {};
114114

115115
##
116116
## Tooling

‎haskell-overlays/reflex-packages/dep/patch/github.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"owner": "reflex-frp",
33
"repo": "patch",
4-
"branch": "release/0.0.8.0",
4+
"branch": "release/0.0.8.2",
55
"private": false,
6-
"rev": "054b12f99973c4636a2784c1db2c19e92f868492",
7-
"sha256": "01c9vwyd0l9llqpqggkiggzwc32l4wfwkjqh1wyasxkw7y7zs97z"
6+
"rev": "35af1b3a032858bafd6fd5cfc07523f1d4208b5d",
7+
"sha256": "002h0n8ii834lj69gmbrkjgd99ajpyp97gbpq1hr3k0b3ckpwa4i"
88
}

‎haskell-overlays/reflex-packages/dep/reflex-dom/github.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"owner": "reflex-frp",
33
"repo": "reflex-dom",
4-
"branch": "release/reflex-dom-core/0.7.0.3",
4+
"branch": "release/reflex-dom-core/0.8.0.0",
55
"private": false,
6-
"rev": "3b379600f8d74ce732ef54d62fb0a48ffbd559f9",
7-
"sha256": "17d1h2fygnk95h07fs8js2hkxm3jzfw5jzd4hd7f1j9vc6sc2plz"
6+
"rev": "f14e954310115cd0d2d1679e1059a3e588ad4762",
7+
"sha256": "0fdil74zq7d6drc1lzx3nfdsajqfw5p3llqkakvh6ga207s8ll97"
88
}

‎haskell-overlays/reflex-packages/dep/reflex-fsnotify/default.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
import (import ./thunk.nix)

‎haskell-overlays/reflex-packages/dep/reflex-fsnotify/github.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"owner": "reflex-frp",
3+
"repo": "reflex-fsnotify",
4+
"branch": "release/0.3.0.0",
5+
"private": false,
6+
"rev": "f75d5f4ae0a50c47fe245fc0c46d2d0fa5dbf8e8",
7+
"sha256": "19l8b4psd9lhdkd51f9arg6y5l1gdjwx5pq9r6jbabib2i7dkn4m"
8+
}

‎haskell-overlays/reflex-packages/dep/reflex-fsnotify/thunk.nix‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DO NOT HAND-EDIT THIS FILE
2+
let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+
if !fetchSubmodules && !private then builtins.fetchTarball {
4+
url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+
} else (import (builtins.fetchTarball {
6+
url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
7+
sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
8+
}) {}).fetchFromGitHub {
9+
inherit owner repo rev sha256 fetchSubmodules private;
10+
};
11+
json = builtins.fromJSON (builtins.readFile ./github.json);
12+
in fetch json

0 commit comments

Comments
 (0)