Skip to content

Commit 1e69bb4

Browse files
committed
nix: Address warnings from "nix flake check"
1 parent 8d05aeb commit 1e69bb4

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

flake.nix

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,22 @@
77
git-ignore-nix.inputs.nixpkgs.follows = "nixpkgs";
88
};
99
outputs = { self, flake-utils, nixpkgs, git-ignore-nix }:
10-
let
11-
overlay = final: prev: {
10+
flake-utils.lib.eachDefaultSystem (system: let
11+
pkgs = import nixpkgs {
12+
inherit system;
13+
overlays = [ self.overlays.default ];
14+
config.allowBroken = true;
15+
};
16+
in {
17+
devShells.default = pkgs.haskellPackages.shellFor {
18+
packages = p: [ p.gtk-strut ];
19+
nativeBuildInputs = with pkgs.haskellPackages; [
20+
cabal-install hlint ghcid ormolu implicit-hie haskell-language-server
21+
];
22+
};
23+
packages.default = pkgs.haskellPackages.gtk-strut;
24+
}) // {
25+
overlays.default = final: prev: {
1226
haskellPackages = prev.haskellPackages.override (old: {
1327
overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
1428
(hself: hsuper: {
@@ -19,17 +33,5 @@
1933
});
2034
});
2135
};
22-
overlays = [ overlay ];
23-
in flake-utils.lib.eachDefaultSystem (system:
24-
let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; };
25-
in
26-
rec {
27-
devShell = pkgs.haskellPackages.shellFor {
28-
packages = p: [ p.gtk-strut ];
29-
nativeBuildInputs = with pkgs.haskellPackages; [
30-
cabal-install hlint ghcid ormolu implicit-hie haskell-language-server
31-
];
32-
};
33-
defaultPackage = pkgs.haskellPackages.gtk-strut;
34-
}) // { inherit overlay overlays; } ;
36+
};
3537
}

0 commit comments

Comments
 (0)