Changed flake to use flake-utils and build for all targets
All checks were successful
ci/woodpecker/push/build Pipeline was successful

This commit is contained in:
2025-12-27 18:14:25 +03:00
parent 456fca8df5
commit 45423c9ce1
2 changed files with 41 additions and 5 deletions

34
flake.lock generated
View File

@@ -1,5 +1,23 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1764950072,
@@ -18,8 +36,24 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View File

@@ -2,24 +2,26 @@
description = "a lisp interpreter/compiler in ocaml";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = {self, nixpkgs}:
outputs = {self, nixpkgs, flake-utils}:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.x86_64-linux;
pkgs = nixpkgs.legacyPackages.${system};
devInputs = with pkgs.ocamlPackages; [merlin];
ocamlPkgs = with pkgs.ocamlPackages; [menhir dune_3];
nativeInputs = with pkgs; ocamlPkgs ++ [ocaml];
in
{
packages.x86_64-linux.default = pkgs.ocamlPackages.buildDunePackage {
packages.default = pkgs.ocamlPackages.buildDunePackage {
pname = "ollisp";
version = "0.0.1";
src = pkgs.lib.cleanSource ./.;
nativeBuildInputs = nativeInputs;
};
devShells.x86_64-linux.default = pkgs.mkShell {
devShells.default = pkgs.mkShell {
nativeBuildInputs = nativeInputs ++ devInputs;
};
};
});
}