Formatting update on flake.nix; nix flake update

This commit is contained in:
James Eversole 2024-10-13 12:51:17 -05:00
parent ff0677c53e
commit 0c54a92057
2 changed files with 44 additions and 46 deletions

6
flake.lock generated
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728764407, "lastModified": 1728840985,
"narHash": "sha256-J4kaIxwjrGVQkLA6njCFH09xj2oCf/VWFircIy7b65k=", "narHash": "sha256-WUjdtdrRa/mPH6x918uI0nTVPidrTgkBn2VdvuOOtZo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4ada35702a7146e1df24f8d6987a1d7c1a5a4707", "rev": "d7a38a56893692ae64ca565e9b03bc6c5cae47cb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -7,56 +7,54 @@
}; };
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system: let
let pkgs = nixpkgs.legacyPackages.${system};
pkgs = nixpkgs.legacyPackages.${system}; packageName = "HELPS";
packageName = "HELPS"; containerPackageName = "${packageName}-container";
containerPackageName = "${packageName}-container";
haskellPackages = pkgs.haskellPackages; haskellPackages = pkgs.haskellPackages;
enableSharedExecutables = false; enableSharedExecutables = false;
enableSharedLibraries = false; enableSharedLibraries = false;
HELPS = pkgs.haskell.lib.justStaticExecutables self.packages.${system}.default; HELPS = pkgs.haskell.lib.justStaticExecutables self.packages.${system}.default;
in { in {
packages.${packageName} =
haskellPackages.callCabal2nix packageName self rec {};
packages.${packageName} = packages.default = self.packages.${system}.${packageName};
haskellPackages.callCabal2nix packageName self rec {}; defaultPackage = self.packages.${system}.default;
packages.default = self.packages.${system}.${packageName}; devShells.default = pkgs.mkShell {
defaultPackage = self.packages.${system}.default; buildInputs = with pkgs; [
ghcid
cabal-install
ghc
];
inputsFrom = builtins.attrValues self.packages.${system};
};
devShell = self.devShells.${system}.default;
devShells.default = pkgs.mkShell { packages.${containerPackageName} = pkgs.dockerTools.buildImage {
buildInputs = with pkgs; [ name = "HELPS";
ghcid
cabal-install copyToRoot = pkgs.buildEnv {
ghc name = "image-root";
paths = [ HELPS ];
pathsToLink = [ "/bin" ];
};
tag = "latest";
config = {
Cmd = [
"/bin/Purr"
]; ];
inputsFrom = builtins.attrValues self.packages.${system}; WorkingDir = "/app";
}; ExposedPorts = {
devShell = self.devShells.${system}.default; "3000/tcp" = {};
packages.${containerPackageName} = pkgs.dockerTools.buildImage {
name = "HELPS";
copyToRoot = pkgs.buildEnv {
name = "image-root";
paths = [ HELPS ];
pathsToLink = [ "/bin" ];
};
tag = "latest";
config = {
Cmd = [
"/bin/Purr"
];
WorkingDir = "/app";
ExposedPorts = {
"3000/tcp" = {};
};
extraCommands = ''
'';
}; };
extraCommands = ''
'';
}; };
}); };
});
} }