Compare commits

..

No commits in common. "8119738ddca116789d267cca348a799b9bf19df4" and "6ec3bd2378bec61b383c2198ceb2b73515e6cde6" have entirely different histories.

3 changed files with 5 additions and 36 deletions

View file

@ -1,9 +1,8 @@
{ buildDunePackage
, lib
, core
, core_unix
, findlib
, lib
, nix-filter
, ocaml
, ppx_yojson_conv
, ppx_yojson_conv_lib
@ -14,19 +13,7 @@
buildDunePackage {
pname = "flake_env";
version = "0.1";
src = nix-filter {
root = ./.;
include = [
"bin"
"lib"
./dune-project
./flake.nix
./default.nix
./flake.lock
./flake_env.opam
./direnvrc
];
};
src = ./.;
duneVersion = "3";
postPatch = ''
substituteInPlace direnvrc --replace "@flake_env@" "$out/bin/flake_env"

16
flake.lock generated
View file

@ -20,21 +20,6 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1701697642,
"narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "c843418ecfd0344ecb85844b082ff5675e02c443",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1702272962,
@ -54,7 +39,6 @@
"root": {
"inputs": {
"flake-parts": "flake-parts",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs"
}
}

View file

@ -6,12 +6,9 @@
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
nix-filter = {
url = "github:numtide/nix-filter";
};
};
outputs = inputs @ { flake-parts, nix-filter, ... }:
outputs = inputs @ { flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; }
({ lib, ... }: {
systems = [
@ -23,7 +20,7 @@
];
perSystem = { config, pkgs, self', ... }: {
packages = {
flake_env = pkgs.ocamlPackages.callPackage ./default.nix { inherit nix-filter; };
flake_env = pkgs.ocamlPackages.callPackage ./default.nix { };
default = config.packages.flake_env;
};
devShells.default = pkgs.mkShell {
@ -35,6 +32,7 @@
pkgs.ocamlPackages.ocaml-lsp
pkgs.ocamlPackages.ocamlformat
pkgs.ocamlPackages.ocamlformat-rpc-lib
pkgs.ocamlPackages.utop
];
};
};