git.iko.soy/obelisk
on master help sign in
Merge branch 'develop' into ts-static-serve-ranges
commit293d5149db72bb9fcaf3511b7f2131d65890fbb2 authorElliot Cameron <3noch@users.noreply.github.com> dateMon 9 Mar 2020, 11:25 (7 years ago) parent9683e661ecc90f
4 files changed+37−8
compare with master
unifiedsplit
ChangeLog.md+14 default.nix+7−8 dep/gitignore.nix/default.nix+8 dep/gitignore.nix/github.json+8
ChangeLog.md+14
@@ -36,6 +36,20 @@ This project's release branch is `master`. This log is written from the perspect
3636
3737## v0.3.0.0 - 2019-12-20
3838
39+* Change the structure of Obelisk routes to use a designated
40+ `FullRoute` type. This combines frontend and backend routes into one
41+ structure. This is a **breaking** change which requires Obelisk apps
42+ to take specific migrations. They are:
43+ * Rewrite the implementation of `_backend_routeEncoder` in
44+ `Backend` to use `mkFullRouteEncoder` instead of
45+ `handleEncoder`. Specifically, the backend and frontend cases of
46+ the top-level `pathComponentEncoder` become the second and third
47+ arguments of `mkFullRouteEncoder` respectively, while the
48+ missing route becomes the first argument. An example of how to
49+ do this is available in [a reflex-examples
50+ commit](https://github.com/reflex-frp/reflex-examples/commits/28f566c3e7dc615578dc74297b7c620c1f13683e).
51+ * Replace type constructions of `InL` with `FullRoute_Backend` and
52+ `InR` with `FullRoute_Frontend`.
3953* Generalised `pathSegmentEncoder`, added `pathFieldEncoder`.
4054* Added some `Prism`s to the encoder library for manipulating `DSum`s.
4155* Add `ob doc` command, which lists paths to haddock documentation for specified packages.
default.nix+7−8
@@ -5,10 +5,13 @@
55, reflex-platform-func ? import ./dep/reflex-platform
66}:
77let
8− cleanSource = builtins.filterSource (name: _: let baseName = builtins.baseNameOf name; in !(
9− builtins.match "^\\.ghc\\.environment.*" baseName != null ||
10− baseName == "cabal.project.local"
11− ));
8+ reflex-platform = getReflexPlatform system;
9+ inherit (reflex-platform) hackGet nixpkgs;
10+ pkgs = nixpkgs;
11+
12+ inherit (import dep/gitignore.nix { inherit (nixpkgs) lib; }) gitignoreSource;
13+
14+ cleanSource = src: gitignoreSource (pkgs.lib.cleanSource src);
1215
1316 commandRuntimeDeps = pkgs: with pkgs; [
1417 coreutils
@@ -104,10 +107,6 @@ let
104107 ];
105108 };
106109
107− reflex-platform = getReflexPlatform system;
108− inherit (reflex-platform) hackGet nixpkgs;
109− pkgs = nixpkgs;
110−
111110 # The haskell environment used to build Obelisk itself, e.g. the 'ob' command
112111 ghcObelisk = reflex-platform.ghc;
113112
dep/gitignore.nix/default.nixnew file+8
@@ -0,0 +1,8 @@
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 <nixpkgs> {}).fetchFromGitHub {
6+ inherit owner repo rev sha256 fetchSubmodules private;
7+ };
8+in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))
dep/gitignore.nix/github.jsonnew file+8
@@ -0,0 +1,8 @@
1+{
2+ "owner": "hercules-ci",
3+ "repo": "gitignore.nix",
4+ "branch": "master",
5+ "private": false,
6+ "rev": "7415c4feb127845553943a3856cbc5cb967ee5e0",
7+ "sha256": "1zd1ylgkndbb5szji32ivfhwh04mr1sbgrnvbrqpmfb67g2g3r9i"
8+}