atagen/meat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ocaml overlay back, create justfile

Browse Source
This commit is contained in:
atagen 2024-12-06 15:20:25 +11:00 committed by atagen
parent fa2b70cfdb
commit 32347132cc
2 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
flake.lock generated
View File

@ -73,7 +73,7 @@
"lix"
],
"nixpkgs": [
"nixpkgs"
"nixpkgs-oc"
]
},
"locked": {
@ -122,19 +122,37 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs-oc": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1733229606,
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
"lastModified": 1733437725,
"narHash": "sha256-ridu0NcO4Dr2TsHqPE+kh58xTHcXg7IHq/FF74KrP/g=",
"owner": "nix-ocaml",
"repo": "nix-overlays",
"rev": "03b85ffd6c37255829d475f3584f8d8a1556d5f2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"owner": "nix-ocaml",
"repo": "nix-overlays",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1733380312,
"narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a772498086eac57d97065a980a21fc0f304e3192",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a772498086eac57d97065a980a21fc0f304e3192",
"type": "github"
}
},
@ -144,7 +162,7 @@
"lix": "lix",
"lix-module": "lix-module",
"nh": "nh",
"nixpkgs": "nixpkgs_2"
"nixpkgs-oc": "nixpkgs-oc"
}
},
"systems": {

46
flake.nix
View File

@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-oc.url = "github:nix-ocaml/nix-overlays";
flake-utils.url = "github:numtide/flake-utils";
@ -13,18 +13,23 @@
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs-oc";
inputs.lix.follows = "lix";
};
};
nixConfig = {
extra-substituters = "https://anmonteiro.nix-cache.workers.dev";
extra-trusted-public-keys = "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=";
};
outputs = inputs @ {
self,
nixpkgs,
nixpkgs-oc,
flake-utils,
...
}: let
inherit (inputs) nixpkgs;
inherit (inputs) nixpkgs-oc;
lix-overlay = inputs.lix-module.overlays.default;
lix-module = inputs.lix-module.nixosModules.default;
nh-overlay = inputs.nh.overlays.default;
@ -32,11 +37,12 @@
in
flake-utils.lib.eachDefaultSystem (
system: let
pkgs = import nixpkgs {
pkgs = import nixpkgs-oc {
inherit system;
overlays = [
lix-overlay
nh-overlay
nixpkgs-oc.overlays.default
];
modules = [lix-module];
extra-substituters = "https://anmonteiro.nix-cache.workers.dev";
@ -73,6 +79,31 @@
in
mkShell {
buildInputs = minimal ++ dev ++ [lix nh];
shellHook = let
justFile = ''
default:
@just --list
@build:
nix build .#debug --offline
@release:
nix build --offline
@test:
printf "\\n\\n\\t************ running nix+dune tests ************\\n\\n\\n"
nix flake check --offline
nix build .#tests --offline
printf "\\n\\n\\t************ running visual test ************\\n\\n\\n"
echo one two three four | CULRS="(255,0,0);(0,0,255);#00FF00" CULR_ORDER="1;0;2" result/bin/culr
@push:
git commit -a
git push
'';
in ''
printf '${justFile}' > justfile
'';
};
packages.default = pkgs.callPackage ./nix/default.nix {
@ -86,8 +117,9 @@
// {
nixosModules.meat = import ./nix/module.nix {
meatOverlays = [
self.overlays.meat
nixpkgs-oc.overlays.default
nh-overlay
self.overlays.meat
];
lixModule = lix-module;
};
@ -95,7 +127,7 @@
overlays.meat = final: prev: let
ocaml-deps = let
inherit
(prev.ocamlPackages)
(final.ocamlPackages)
dune_3
ocaml
;