Skip to content

Commit

Permalink
Fix website, reorganize modules
Browse files Browse the repository at this point in the history
  • Loading branch information
yorickvP committed Jul 4, 2024
1 parent 84378f8 commit 8e862ae
Show file tree
Hide file tree
Showing 20 changed files with 1,540 additions and 180 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ args: package:
dream2nix.lib.evalModules {
packageSets.nixpkgs = pkgs;
modules =
[ ./modules/cog.nix ./modules/weights args (packageModule package) ];
[ ./modules/cog ./modules/weights args (packageModule package) ];
}
2 changes: 2 additions & 0 deletions examples/gte-small/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
cog.build.python_snapshot_date = "2023-10-05";
cog.build.cog_version = "0.8.6";
cognix.includeNix = true;
cognix.fake_pip = true;
}
6 changes: 6 additions & 0 deletions modules/cog/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: "cognix"
state: released
maintainers:
- YorickvP
---
File renamed without changes.
8 changes: 4 additions & 4 deletions modules/cog.nix → modules/cog/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let
# conditional overrides: only active when a lib is in use
pipOverridesModule = { config, lib, ... }:
let
overrides = import ./../overrides.nix;
overrides = import ./../../overrides.nix;
metadata = config.lock.content.fetchPipMetadata.sources;
in {
pip.drvs = lib.mapAttrs (name: info: overrides.${name} or { }) metadata;
Expand Down Expand Up @@ -73,9 +73,9 @@ let
in {
imports = [
dream2nix.modules.dream2nix.core
./cog-interface.nix
./interface.nix
./cuda.nix
./stream-layered-image.nix
../stream-layered-image
./nix.nix
];
config = {
Expand Down Expand Up @@ -161,7 +161,7 @@ in {
dream2nix.modules.dream2nix.pip
pipOverridesModule
(proxyLockModule config.lock.content)
./uv-solver.nix
../pip-uv
];
paths = { inherit (config.paths) projectRoot package; };
name = "cog-docker-env";
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 8e862ae

Please sign in to comment.