Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.

Commit 866becf

Browse files
committed
update inputs
1 parent 9f58544 commit 866becf

File tree

8 files changed

+727
-1166
lines changed

8 files changed

+727
-1166
lines changed

back/flake.lock

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

back/flake.nix

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,26 @@
11
{
22
description = "Try-phi back end";
33
inputs = {
4-
nixpkgs_.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=source-flake/nixpkgs;
4+
nixpkgs_.url = github:deemp/flakes/e306bf22309d95557ab569a2672184a64fb3f7d2?dir=source-flake/nixpkgs;
55
nixpkgs.follows = "nixpkgs_/nixpkgs";
6-
flake-utils_.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=source-flake/flake-utils;
6+
flake-utils_.url = github:deemp/flakes/e306bf22309d95557ab569a2672184a64fb3f7d2?dir=source-flake/flake-utils;
77
flake-utils.follows = "flake-utils_/flake-utils";
8-
haskell-tools.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=language-tools/haskell;
9-
devshell.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=devshell;
10-
drv-tools.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=drv-tools;
11-
vscode-extensions_.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=source-flake/vscode-extensions;
12-
vscode-extensions.follows = "vscode-extensions_/vscode-extensions";
13-
my-codium.url = github:deemp/flakes/8ee5d35e592860636adb57cee3e27c98de04202a?dir=codium;
8+
haskell-tools.url = github:deemp/flakes/e306bf22309d95557ab569a2672184a64fb3f7d2?dir=language-tools/haskell;
9+
devshell.url = github:deemp/flakes/e306bf22309d95557ab569a2672184a64fb3f7d2?dir=devshell;
10+
drv-tools.url = github:deemp/flakes/e306bf22309d95557ab569a2672184a64fb3f7d2?dir=drv-tools;
11+
codium.url = github:deemp/flakes/e306bf22309d95557ab569a2672184a64fb3f7d2?dir=codium;
1412
};
1513

1614
outputs =
17-
{ self
18-
, nixpkgs
19-
, flake-utils
20-
, haskell-tools
21-
, devshell
22-
, drv-tools
23-
, vscode-extensions
24-
, my-codium
25-
, ...
26-
}:
27-
flake-utils.lib.eachDefaultSystem (system:
15+
inputs:
16+
inputs.flake-utils.lib.eachDefaultSystem (system:
2817
let
29-
pkgs = nixpkgs.legacyPackages.${system};
30-
inherit (my-codium.functions.${system}) writeSettingsJSON mkCodium;
31-
inherit (devshell.functions.${system}) mkShell mkCommands;
32-
inherit (drv-tools.functions.${system}) mkShellApps mkBin;
33-
inherit (haskell-tools.functions.${system}) haskellTools;
34-
inherit (my-codium.configs.${system}) extensions settingsNix;
18+
pkgs = inputs.nixpkgs.legacyPackages.${system};
19+
inherit (inputs.codium.functions.${system}) writeSettingsJSON mkCodium;
20+
inherit (inputs.devshell.functions.${system}) mkShell mkCommands;
21+
inherit (inputs.drv-tools.functions.${system}) mkShellApps mkBin;
22+
inherit (inputs.haskell-tools.functions.${system}) toolsGHC;
23+
inherit (inputs.codium.configs.${system}) extensions settingsNix;
3524

3625
packageName = "try-phi-back";
3726
override =
@@ -57,12 +46,21 @@
5746
};
5847
};
5948

60-
inherit (haskellTools "902" override (ps: [ ps."${packageName}" ps.eo-utils ps.phi-utils ps.language-utils ]) [ ])
49+
inherit (toolsGHC {
50+
version = "902";
51+
inherit override;
52+
packages = ps: [
53+
ps.${packageName}
54+
ps.eo-utils
55+
ps.phi-utils
56+
ps.language-utils
57+
];
58+
})
6159
cabal hpack callCabal justStaticExecutable
6260
callCabal2nix haskellPackages hls implicit-hie;
6361

6462
exeName = "back";
65-
back = justStaticExecutable exeName haskellPackages."${packageName}";
63+
back = justStaticExecutable exeName haskellPackages.${packageName};
6664

6765
localImageName = "back";
6866
backImage = pkgs.dockerTools.buildLayeredImage {

0 commit comments

Comments
 (0)