Skip to content

Commit 104f2c1

Browse files
deempdeemp
committed
fix: update flakes
1 parent ca3a387 commit 104f2c1

File tree

4 files changed

+74
-113
lines changed

4 files changed

+74
-113
lines changed

‎back/flake.nix

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33

44
inputs = { };
55

6-
outputs =
7-
inputs:
8-
let
9-
inputs_ =
10-
let flakes = (import ../.).outputs.inputs.flakes; in
11-
{
12-
inherit (flakes.source-flake) flake-utils nixpkgs;
13-
inherit (flakes) drv-tools devshell codium;
14-
haskell-tools = flakes.language-tools.haskell;
15-
};
16-
17-
outputs = outputs_ { } // { inputs = inputs_; outputs = outputs_; };
18-
19-
outputs_ =
20-
inputs__:
21-
let inputs = inputs_ // inputs__; in
22-
inputs.flake-utils.lib.eachDefaultSystem (system:
6+
outputs = inputs:
7+
let flakes = (import ../.).outputs.inputs.flakes; in
8+
flakes.makeFlake {
9+
inputs = { inherit (flakes.all) flake-utils nixpkgs drv-tools devshell codium haskell-tools; };
10+
perSystem = { inputs, system }:
2311
let
2412
pkgs = inputs.nixpkgs.legacyPackages.${system};
2513
inherit (inputs.codium.lib.${system}) writeSettingsJSON mkCodium;
@@ -29,18 +17,17 @@
2917
inherit (inputs.codium.lib.${system}) extensions settingsNix extensionsCommon settingsCommonNix;
3018

3119
packageName = "try-phi-back";
32-
override =
33-
{
34-
overrides = self: super: {
35-
eo-utils = self.callCabal2nix "eo-utils" ./eo-utils { };
36-
phi-utils = self.callCabal2nix "phi-utils" ./phi-utils { };
37-
language-utils = self.callCabal2nix "language-utils" ./language-utils { inherit (self) phi-utils eo-utils; };
38-
"${packageName}" =
39-
pkgs.haskell.lib.overrideCabal
40-
(self.callCabal2nix packageName ./${packageName} { inherit (self) language-utils phi-utils eo-utils; })
41-
(x: { librarySystemDepends = [ pkgs.zlib ] ++ (x.librarySystemDepends or [ ]); });
42-
};
20+
override = {
21+
overrides = self: super: {
22+
eo-utils = self.callCabal2nix "eo-utils" ./eo-utils { };
23+
phi-utils = self.callCabal2nix "phi-utils" ./phi-utils { };
24+
language-utils = self.callCabal2nix "language-utils" ./language-utils { inherit (self) phi-utils eo-utils; };
25+
"${packageName}" =
26+
pkgs.haskell.lib.overrideCabal
27+
(self.callCabal2nix packageName ./${packageName} { inherit (self) language-utils phi-utils eo-utils; })
28+
(x: { librarySystemDepends = [ pkgs.zlib ] ++ (x.librarySystemDepends or [ ]); });
4329
};
30+
};
4431

4532
inherit (toolsGHC {
4633
version = "928";
@@ -138,9 +125,9 @@
138125
inherit packages devShells;
139126

140127
image = backImage;
141-
});
142-
in
143-
outputs;
128+
};
129+
};
130+
144131

145132
nixConfig = {
146133
extra-substituters = [

‎flake.lock

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

‎flake.nix

Lines changed: 46 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,58 @@
11
{
22
inputs.flakes.url = "github:deemp/flakes";
33

4-
outputs =
5-
inputs:
6-
let
7-
inputs_ =
8-
let flakes = inputs.flakes.flakes; in
9-
{
10-
inherit (flakes.source-flake) flake-utils nixpkgs;
11-
inherit (flakes) drv-tools flakes-tools workflows devshell codium;
12-
inherit flakes;
13-
};
14-
15-
outputs = outputs_ { } // { inputs = inputs_; outputs = outputs_; };
16-
17-
outputs_ =
18-
inputs__:
19-
let inputs = inputs_ // inputs__; in
20-
inputs.flake-utils.lib.eachDefaultSystem (system:
21-
let
22-
pkgs = inputs.nixpkgs.legacyPackages.${system};
23-
inherit (inputs.codium.lib.${system}) writeSettingsJSON mkCodium;
24-
inherit (inputs.drv-tools.lib.${system}) mkShellApps getExe;
25-
inherit (inputs.flakes-tools.lib.${system}) mkFlakesTools;
26-
inherit (inputs.codium.lib.${system}) extensions settingsNixCommon extensionsCommon;
27-
inherit (inputs.devshell.lib.${system}) mkShell mkRunCommands;
4+
outputs = inputs: inputs.flakes.makeFlake {
5+
inputs = {
6+
inherit (inputs.flakes.all) flake-utils nixpkgs drv-tools flakes-tools workflows devshell codium;
7+
inherit (inputs) flakes;
8+
};
9+
perSystem = { inputs, system }:
10+
let
11+
pkgs = inputs.nixpkgs.legacyPackages.${system};
12+
inherit (inputs.codium.lib.${system}) writeSettingsJSON mkCodium;
13+
inherit (inputs.drv-tools.lib.${system}) mkShellApps getExe;
14+
inherit (inputs.flakes-tools.lib.${system}) mkFlakesTools;
15+
inherit (inputs.codium.lib.${system}) extensions settingsNixCommon extensionsCommon;
16+
inherit (inputs.devshell.lib.${system}) mkShell mkRunCommands;
2817

29-
backDir = "back";
30-
frontDir = "front";
31-
scripts = mkShellApps {
32-
back = {
33-
text = "cd ${backDir} && nix run";
34-
description = "Run backend";
35-
};
36-
front = {
37-
text = "cd ${frontDir} && nix run";
38-
description = "Run frontend";
39-
};
18+
backDir = "back";
19+
frontDir = "front";
20+
scripts = mkShellApps {
21+
back = {
22+
text = "cd ${backDir} && nix run";
23+
description = "Run backend";
4024
};
25+
front = {
26+
text = "cd ${frontDir} && nix run";
27+
description = "Run frontend";
28+
};
29+
};
4130

42-
packages = {
43-
inherit (mkFlakesTools { dirs = [ "front" "back" "." ]; root = ./.; }) pushToCachix updateLocks;
44-
45-
writeSettings = writeSettingsJSON settingsNixCommon;
46-
codium = mkCodium { extensions = extensionsCommon; };
31+
packages = {
32+
inherit (mkFlakesTools { dirs = [ "front" "back" "." ]; root = ./.; }) pushToCachix updateLocks;
4733

48-
writeWorkflows = import ./nix-files/workflow.nix {
49-
name = "ci";
50-
inherit backDir frontDir system;
51-
inherit (inputs) workflows;
52-
};
53-
} // scripts;
34+
writeSettings = writeSettingsJSON settingsNixCommon;
35+
codium = mkCodium { extensions = extensionsCommon; };
5436

55-
devShells.default = mkShell {
56-
commands =
57-
mkRunCommands "ide" { "codium ." = packages.codium; inherit (packages) writeSettings; }
58-
++ mkRunCommands "infra" { inherit (packages) writeWorkflows pushToCachix updateLocks; }
59-
++ mkRunCommands "project" { inherit (packages) back front; }
60-
;
37+
writeWorkflows = import ./nix-files/workflow.nix {
38+
name = "ci";
39+
inherit backDir frontDir system;
40+
inherit (inputs) workflows;
6141
};
62-
in
63-
{
64-
inherit packages devShells;
65-
});
66-
in
67-
outputs;
42+
} // scripts;
43+
44+
devShells.default = mkShell {
45+
commands =
46+
mkRunCommands "ide" { "codium ." = packages.codium; inherit (packages) writeSettings; }
47+
++ mkRunCommands "infra" { inherit (packages) writeWorkflows pushToCachix updateLocks; }
48+
++ mkRunCommands "project" { inherit (packages) back front; }
49+
;
50+
};
51+
in
52+
{
53+
inherit packages devShells;
54+
};
55+
};
6856

6957
nixConfig = {
7058
extra-substituters = [

‎front/flake.nix

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,11 @@
33

44
inputs = { };
55

6-
outputs =
7-
inputs:
8-
let
9-
inputs_ =
10-
let flakes = (import ../.).outputs.inputs.flakes; in
11-
{
12-
inherit (flakes.source-flake) flake-utils nixpkgs;
13-
inherit (flakes) drv-tools devshell codium;
14-
purescript-tools = flakes.language-tools.purescript;
15-
};
16-
17-
outputs = outputs_ { } // { inputs = inputs_; outputs = outputs_; };
18-
19-
outputs_ =
20-
inputs__:
21-
let inputs = inputs_ // inputs__; in
22-
23-
inputs.flake-utils.lib.eachDefaultSystem (system:
6+
outputs = inputs:
7+
let flakes = (import ../.).outputs.inputs.flakes; in
8+
flakes.makeFlake {
9+
inputs = { inherit (flakes.all) flake-utils nixpkgs drv-tools devshell codium purescript-tools; };
10+
perSystem = { inputs, system }:
2411
let
2512
pkgs = inputs.nixpkgs.legacyPackages.${system};
2613
pursPkgs = inputs.purescript-tools.packages.${system};
@@ -67,9 +54,8 @@
6754
in
6855
{
6956
inherit packages devShells;
70-
});
71-
in
72-
outputs;
57+
};
58+
};
7359

7460
nixConfig = {
7561
extra-substituters = [

0 commit comments

Comments
 (0)