git.iko.soy/obelisk
on master help sign in
Remove trailing whitespace
commitcbcf3c31fd063da948bd08bc835784404efc458f authorJohn Ericson <John.Ericson@Obsidian.Systems> dateMon 30 Dec 2019, 10:43 (7 years ago) parent070cde8
5 files changed+14−14
compare with master
unifiedsplit
README.md+1−1 lib/asset/README.md+10−10 lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+1−1 lib/route/src/Obelisk/Route.hs+1−1 lib/tabulation/src/Data/Tabulation.hs+1−1
README.md+1−1
@@ -152,7 +152,7 @@ For further information see [the Haskell section](https://nixos.org/nixpkgs/manu
152152
153153### Running over https
154154
155−To run your app locally over https, update the protocol in `config/common/route` to `https`, and then use `ob run` as normal.
155+To run your app locally over https, update the protocol in `config/common/route` to `https`, and then use `ob run` as normal.
156156
157157Since Obelisk generates a self-signed certificate for running https, the browser will issue a warning about using an invalid certificate. On Chrome, you can go to `chrome://flags/#allow-insecure-localhost` to enable invalid certificates for localhost.
158158
lib/asset/README.md+10−10
@@ -1,7 +1,7 @@
11## obelisk-asset
22
3−The 'assets.nix' file contains nix expressions that are a mutually
4−recursive set of attributes used to create static asset directories
3+The 'assets.nix' file contains nix expressions that are a mutually
4+recursive set of attributes used to create static asset directories
55with hashable file encodings. This file should be incorporated within
66your project's 'default.nix' file. (See ./example/default.nix , line 2)
77```
@@ -10,20 +10,20 @@ your project's 'default.nix' file. (See ./example/default.nix , line 2)
1010```
1111
1212The 'mkAssets' and 'mkAssetsWith' functions within 'assets.nix' only
13−need to be passed an encoding('zopfliEncodings', 'gzipEncodings',
13+need to be passed an encoding('zopfliEncodings', 'gzipEncodings',
1414'noEncodings') and a static directory of your choice as arguments.
1515
16−In this example, 'mkAssets' is used on a directory that has a .png
16+In this example, 'mkAssets' is used on a directory that has a .png
1717file inside of it. (See ./example/default.nix, line 11)
1818```
19−myAssets = assets.mkAssets ./static;
19+myAssets = assets.mkAssets ./static;
2020```
2121
22−Once you have successfully incorporated 'assets.nix' into your
23−project's nix file(s), use nix-build to generate a symlink of
24−your 'mkAssets' expression. The following command from
25−example/run-example (line 3) will generate an immutable symlink
26−that holds hashed static assets.
22+Once you have successfully incorporated 'assets.nix' into your
23+project's nix file(s), use nix-build to generate a symlink of
24+your 'mkAssets' expression. The following command from
25+example/run-example (line 3) will generate an immutable symlink
26+that holds hashed static assets.
2727```bash
2828nix-build -o static.assets -A myAssets
2929```
lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+1−1
@@ -27,7 +27,7 @@ library
2727 build-depends: directory
2828
2929 build-depends:
30− base,
30+ base,
3131 base64-bytestring,
3232 bytestring,
3333 containers,
lib/route/src/Obelisk/Route.hs+1−1
@@ -881,7 +881,7 @@ instance (GCompare br, GCompare fr) => GCompare (FullRoute br fr) where
881881 gcompare (FullRoute_Frontend x) (FullRoute_Frontend y) = gcompare x y
882882
883883instance (UniverseSome br, UniverseSome fr) => UniverseSome (FullRoute br fr) where
884− universeSome = [Some (FullRoute_Backend x) | Some x <- universeSome]
884+ universeSome = [Some (FullRoute_Backend x) | Some x <- universeSome]
885885 ++ [Some (FullRoute_Frontend x) | Some x <- universeSome]
886886
887887-- | Build the typical top level application route encoder from a route for handling 404's,
lib/tabulation/src/Data/Tabulation.hs+1−1
@@ -8,7 +8,7 @@ import Control.Lens
88-- | This is a class for record types whose fields can be enumerated by an associated GADT. It's closely related to the concept of a representable functor, except without the functor part, and the fields are not all the same type.
99class HasFields a where
1010 type Field a :: * -> *
11−
11+
1212 fieldLens :: Field a x -> Lens' a x
1313 tabulateFieldsA :: Applicative f => (forall x. Field a x -> f x) -> f a
1414