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

avoid possible naming collision

Browse Source
This commit is contained in:
atagen 2024-12-06 14:49:22 +11:00
parent 999a560f5a
commit a678a2ddfc
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
flake.lock generated
View File

@ -19,24 +19,6 @@
}
},
"nixpkgs": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1733437725,
"narHash": "sha256-ridu0NcO4Dr2TsHqPE+kh58xTHcXg7IHq/FF74KrP/g=",
"owner": "nix-ocaml",
"repo": "nix-overlays",
"rev": "03b85ffd6c37255829d475f3584f8d8a1556d5f2",
"type": "github"
},
"original": {
"owner": "nix-ocaml",
"repo": "nix-overlays",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1733380312,
"narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=",
@ -52,10 +34,28 @@
"type": "github"
}
},
"nixpkgs-oc": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1733437725,
"narHash": "sha256-ridu0NcO4Dr2TsHqPE+kh58xTHcXg7IHq/FF74KrP/g=",
"owner": "nix-ocaml",
"repo": "nix-overlays",
"rev": "03b85ffd6c37255829d475f3584f8d8a1556d5f2",
"type": "github"
},
"original": {
"owner": "nix-ocaml",
"repo": "nix-overlays",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
"nixpkgs-oc": "nixpkgs-oc"
}
},
"systems": {

8
flake.nix
View File

@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:nix-ocaml/nix-overlays";
nixpkgs-oc.url = "github:nix-ocaml/nix-overlays";
flake-utils.url = "github:numtide/flake-utils";
};
@ -11,14 +11,14 @@
outputs = {
self,
nixpkgs,
nixpkgs-oc,
flake-utils,
}: let
version = builtins.toString self.lastModified;
in
flake-utils.lib.eachDefaultSystem (
system: let
pkgs = nixpkgs.legacyPackages.${system};
pkgs = nixpkgs-oc.legacyPackages.${system};
# import nixpkgs {
# inherit system;
# };
@ -100,7 +100,7 @@
}
)
// {
nixosModules.culr = import ./nix/module.nix {overlays = [self.overlays.culr self.inputs.nixpkgs.overlays.default];};
nixosModules.culr = import ./nix/module.nix {overlays = [self.overlays.culr nixpkgs-oc.overlays.default];};
overlays.culr = final: prev: let
ocaml-deps = let