Skip to content

Commit 01b4570

Browse files
seanhessseanhess
committed
Merge branch 'main' of github.com:seanhess/web-view
2 parents 8cbba0d + 4722971 commit 01b4570

5 files changed

Lines changed: 77 additions & 93 deletions

File tree

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ If you want to get a feel for atomic-css without cloning the project run `nix ru
9090
Import Flake
9191
------------
9292

93-
You can import this flake's overlay to add `atomic-css` to `overriddenHaskellPackages` and which provides a ghc966 and ghc982 package set that satisfy `atomic-css`'s dependencies.
93+
You can import this flake's overlay to add `atomic-css` to `overriddenHaskellPackages` and which provides a ghc967 and ghc984 package set that satisfy `atomic-css`'s dependencies.
9494

9595
```nix
9696
{
@@ -108,7 +108,7 @@ You can import this flake's overlay to add `atomic-css` to `overriddenHaskellPac
108108
inherit system;
109109
overlays = [ atomic-css.overlays.default ];
110110
};
111-
haskellPackagesOverride = pkgs.overriddenHaskellPackages.ghc966.override (old: {
111+
haskellPackagesOverride = pkgs.overriddenHaskellPackages.ghc967.override (old: {
112112
overrides = pkgs.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev: {
113113
# your overrides here
114114
});
@@ -142,13 +142,13 @@ ghcid --command="cabal repl test lib:atomic-css" --run=Main.main --warnings --re
142142

143143
### Nix
144144

145-
- `nix flake check` will build the library, example executable and devShell with ghc-9.8.2 and ghc-9.6.6
145+
- `nix flake check` will build the library, example executable and devShell with ghc-9.8.4 and ghc-9.6.7
146146
- This is what the CI on GitHub runs
147-
- `nix run` or `nix run .#ghc982-example` to start the example project with GHC 9.8.2
148-
- `nix run .#ghc966-example` to start the example project with GHC 9.6.6
149-
- `nix develop` or `nix develop .#ghc982-shell` to get a shell with all dependencies installed for GHC 9.8.2.
150-
- `nix develop .#ghc966-shell` to get a shell with all dependencies installed for GHC 9.6.6.
151-
- `nix build`, `nix build .#ghc982-atomic-css` and `nix build .#ghc966-atomic-css` builds the library with the `overriddenHaskellPackages`
147+
- `nix run` or `nix run .#ghc984-example` to start the example project with GHC 9.8.4
148+
- `nix run .#ghc967-example` to start the example project with GHC 9.6.7
149+
- `nix develop` or `nix develop .#ghc984-shell` to get a shell with all dependencies installed for GHC 9.8.4.
150+
- `nix develop .#ghc967-shell` to get a shell with all dependencies installed for GHC 9.6.7.
151+
- `nix build`, `nix build .#ghc984-atomic-css` and `nix build .#ghc967-atomic-css` builds the library with the `overriddenHaskellPackages`
152152
- If you want to import this flake, use the overlay
153153
- `nix flake update nixpkgs` will update the Haskell package sets and development tools
154154

‎atomic-css.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22

3-
-- This file has been generated from package.yaml by hpack version 0.37.0.
3+
-- This file has been generated from package.yaml by hpack version 0.38.3.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -17,8 +17,8 @@ license: BSD-3-Clause
1717
license-file: LICENSE
1818
build-type: Simple
1919
tested-with:
20-
GHC == 9.8.2
21-
, GHC == 9.6.6
20+
GHC == 9.8.4
21+
, GHC == 9.6.7
2222
extra-source-files:
2323
embed/reset.css
2424
extra-doc-files:

‎flake.lock‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 50 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,17 @@
4949

5050
overlay = final: prev: {
5151
overriddenHaskellPackages = {
52-
ghc982 = (prev.overriddenHaskellPackages.ghc982 or prev.haskell.packages.ghc982).override (old: {
52+
ghc984 = (prev.overriddenHaskellPackages.ghc984 or prev.haskell.packages.ghc984).override (old: {
5353
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (
5454
hfinal: hprev: {
5555
"${packageName}" = hfinal.callCabal2nix packageName src { };
56-
skeletest = hprev.skeletest.overrideAttrs (old: {
57-
meta = old.meta // {
58-
broken = false;
59-
};
60-
});
61-
Diff = hfinal.callHackage "Diff" "0.5" { };
6256
}
6357
);
6458
});
65-
ghc966 = (prev.overriddenHaskellPackages.ghc966 or prev.haskell.packages.ghc966).override (old: {
59+
ghc967 = (prev.overriddenHaskellPackages.ghc967 or prev.haskell.packages.ghc967).override (old: {
6660
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (
6761
hfinal: hprev: {
6862
"${packageName}" = hfinal.callCabal2nix packageName src { };
69-
attoparsec-aeson = hfinal.callHackage "attoparsec-aeson" "2.2.0.0" { };
70-
skeletest = hprev.skeletest.overrideAttrs (old: {
71-
meta = old.meta // {
72-
broken = false;
73-
};
74-
});
75-
Diff = hfinal.callHackage "Diff" "0.5" { };
76-
aeson = hfinal.callHackage "aeson" "2.2.2.0" { };
7763
}
7864
);
7965
});
@@ -102,8 +88,8 @@
10288
};
10389

10490
ghcVersions = [
105-
"966"
106-
"982"
91+
"967"
92+
"984"
10793
];
10894

10995
ghcPkgs = builtins.listToAttrs (
@@ -125,7 +111,7 @@
125111
hlint.enable = true;
126112
fourmolu.enable = true;
127113
hpack.enable = true;
128-
nixfmt-rfc-style.enable = true;
114+
nixfmt.enable = true;
129115
flake-checker = {
130116
enable = true;
131117
args = [ "--no-telemetry" ];
@@ -171,60 +157,58 @@
171157
value = pkgs.runCommand "ghc${version}-check-example" {
172158
buildInputs = [
173159
(exe version)
174-
] ++ self.devShells.${system}."ghc${version}-shell".buildInputs;
160+
]
161+
++ self.devShells.${system}."ghc${version}-shell".buildInputs;
175162
} "type example; CABAL_CONFIG=/dev/null cabal --dry-run repl; touch $out";
176163
}) ghcVersions
177164
);
178165

179-
apps =
180-
{
181-
default = self.apps.${system}."ghc966-${examplesName}";
182-
}
183-
// builtins.listToAttrs (
184-
map (version: {
166+
apps = {
167+
default = self.apps.${system}."ghc967-${examplesName}";
168+
}
169+
// builtins.listToAttrs (
170+
map (version: {
171+
name = "ghc${version}-${examplesName}";
172+
value = {
173+
type = "app";
174+
program = "${exe version}/bin/example";
175+
};
176+
}) ghcVersions
177+
);
178+
179+
packages = {
180+
default = self.packages.${system}."ghc984-${packageName}";
181+
}
182+
// builtins.listToAttrs (
183+
builtins.concatMap (version: [
184+
{
185185
name = "ghc${version}-${examplesName}";
186-
value = {
187-
type = "app";
188-
program = "${exe version}/bin/example";
189-
};
190-
}) ghcVersions
191-
);
186+
value = ghcPkgs."ghc${version}".${examplesName};
187+
}
188+
{
189+
name = "ghc${version}-${packageName}";
190+
value = ghcPkgs."ghc${version}".${packageName};
191+
}
192+
]) ghcVersions
193+
);
192194

193-
packages =
194-
{
195-
default = self.packages.${system}."ghc982-${packageName}";
196-
}
197-
// builtins.listToAttrs (
198-
builtins.concatMap (version: [
199-
{
200-
name = "ghc${version}-${examplesName}";
201-
value = ghcPkgs."ghc${version}".${examplesName};
202-
}
203-
{
204-
name = "ghc${version}-${packageName}";
205-
value = ghcPkgs."ghc${version}".${packageName};
195+
devShells = {
196+
default = self.devShells.${system}.ghc984-shell;
197+
}
198+
// builtins.listToAttrs (
199+
map (version: {
200+
name = "ghc${version}-shell";
201+
value = ghcPkgs."ghc${version}".shellFor (
202+
shellCommon version
203+
// {
204+
packages = p: [
205+
p.${packageName}
206+
p.${examplesName}
207+
];
206208
}
207-
]) ghcVersions
208-
);
209-
210-
devShells =
211-
{
212-
default = self.devShells.${system}.ghc982-shell;
213-
}
214-
// builtins.listToAttrs (
215-
map (version: {
216-
name = "ghc${version}-shell";
217-
value = ghcPkgs."ghc${version}".shellFor (
218-
shellCommon version
219-
// {
220-
packages = p: [
221-
p.${packageName}
222-
p.${examplesName}
223-
];
224-
}
225-
);
226-
}) ghcVersions
227-
);
209+
);
210+
}) ghcVersions
211+
);
228212
}
229213
);
230214
}

‎package.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ghc-options:
2828
- -fdefer-typed-holes
2929

3030
tested-with:
31-
- GHC == 9.8.2
32-
- GHC == 9.6.6
31+
- GHC == 9.8.4
32+
- GHC == 9.6.7
3333

3434
default-extensions:
3535
- OverloadedStrings

0 commit comments

Comments
 (0)