input-output-hk/foliage
1
1
Fork 0
mirror of https://github.com/input-output-hk/foliage.git synced 2024-10-26 12:51:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update flake

Browse Source
This commit is contained in:
Andrea Bedini 2023-01-09 11:01:02 +08:00
parent 4bb1b290a9
commit 1c861b3b6c
2 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
flake.lock
View File

@ -189,21 +189,6 @@
}
},
"flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -218,7 +203,7 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_2": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@ -233,7 +218,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -248,7 +233,7 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_4": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@ -323,7 +308,7 @@
"cabal-36": "cabal-36",
"cardano-shell": "cardano-shell",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
"hackage": "hackage",
"hpc-coveralls": "hpc-coveralls",
@ -428,7 +413,7 @@
},
"n2c": {
"inputs": {
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"haskell-nix",
"tullia",
@ -508,7 +493,7 @@
},
"nix2container": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
@ -736,7 +721,10 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": [
"haskell-nix",
"flake-utils"
],
"haskell-nix": "haskell-nix",
"nixpkgs": [
"haskell-nix",
@ -765,7 +753,7 @@
"blank": "blank",
"devshell": "devshell",
"dmerge": "dmerge",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"makes": [
"haskell-nix",
"tullia",

32
flake.nix
View File

@ -5,7 +5,7 @@
inputs = {
nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
haskell-nix.url = "github:input-output-hk/haskell.nix";
flake-utils.url = "github:numtide/flake-utils";
flake-utils.follows = "haskell-nix/flake-utils";
};
outputs = { self, nixpkgs, flake-utils, haskell-nix }:
@ -18,7 +18,7 @@
overlays = [ haskell-nix.overlay ];
};
static-pkgs = if pkgs.stdenv.hostPlatform.isLinux then
pkgs-static-where-possible = if pkgs.stdenv.hostPlatform.isLinux then
if pkgs.stdenv.hostPlatform.isAarch64 then
pkgs.pkgsCross.aarch64-multiplatform-musl
else
@ -26,28 +26,20 @@
else
pkgs;
mkFoliage = haskell-nix:
let
project = haskell-nix.cabalProject {
src = ./.;
compiler-nix-name = "ghc924";
shell.tools = {
cabal = { };
hlint = { };
haskell-language-server = { };
};
modules = [{
packages.foliage.components.exes.foliage.dontStrip = false;
}];
};
in project.foliage.components.exes.foliage;
project = pkgs-static-where-possible.haskell-nix.cabalProject {
src = ./.;
compiler-nix-name = "ghc924";
shell.tools = {
cabal = { };
hlint = { };
haskell-language-server = { };
};
};
in rec {
packages = rec {
default = foliage;
foliage = mkFoliage pkgs.haskell-nix;
} // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
foliage-static = mkFoliage static-pkgs.haskell-nix;
foliage = project.foliage.components.exes.foliage;
};
hydraJobs = packages;