rrix
/
arcology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove app.nix references

main
Ryan Rix 2022-11-28 19:50:22 -08:00
parent 1427a05fdc
commit 67e3efc471
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arcology-poetry.org
View File

@ -69,10 +69,10 @@ arcology-fastapi = 'arcology.server:start'
The [[id:20211218T222408.578567][arcology inotify-watcher]] is invoked simply, right? it's just a little thing, doesn't even need command line arguments since it's configured in the environment. Same with the [[id:arcology/fastapi][Arcology FastAPI]] server!
* Nix Derivations
** =poetry2nix= will package the Arcology application up based on Poetry =TOML= in =app.nix=
** =poetry2nix= will package the Arcology application up based on Poetry =TOML= in =default.nix=
:PROPERTIES:
:ID: arcology/nix/poetry2nix
:ROAM_ALIASES: arcology/app.nix
:ROAM_ALIASES: arcology/default.nix
:END:
The Poetry application is factored out so that it can be used in the [[id:arcology/nix/shell][=nix-shell= below]]. Using =poetry2nix= to extract the package information from =pyproject.toml= is a pretty simple affair with [[https://github.com/nix-community/poetry2nix][=poetry2nix=]] bundled with [[id:c75d20e6-8888-4c5a-ac97-5997e2f1c711][nixpkgs]].
@ -193,7 +193,7 @@ This imports =myApp= from [[id:arcology/nix/poetry2nix][above]] so that it has a
{ pkgs ? import <nixpkgs> {} }:
let
myApp = import ./app.nix { inherit pkgs; };
myApp = import ./default.nix { inherit pkgs; };
myAppEnv = myApp.editableEnv;
in pkgs.mkShell {
packages = [
@ -227,8 +227,8 @@ This gets me to having a thing i can =nix-shell= in to and have dependencies ava
}:
let
env = (import ./app.nix { inherit pkgs; inherit python; }).dependencyEnv;
app = import ./default.nix { inherit pkgs; inherit python; };
env = app.dependencyEnv;
myEmacs = (import /home/rrix/arroyo-nix/pkgs/emacs.nix { inherit pkgs; });
in pkgs.dockerTools.buildLayeredImage {
name = "arcology";
@ -339,11 +339,10 @@ In the spirit of [[id:20220116T143655.499306][Hey Smell This]] I'll provide a fl
rec {
devShell = import ./shell.nix { inherit pkgs; };
packages = flake-utils.lib.flattenTree {
arcology = import ./app.nix { inherit pkgs; };
arcology-with-assets = import ./default.nix { inherit pkgs; };
arcology = import ./default.nix { inherit pkgs; };
docker = import ./docker.nix { inherit pkgs; };
};
defaultPackage = packages.arcology-with-assets;
defaultPackage = packages.arcology;
apps.arcology-fastapi = flake-utils.lib.mkApp {
drv = packages.arcology-with-assets;
exePath = "/bin/arcology-fastapi";

2
docker.nix
View File

@ -10,8 +10,8 @@
}:
let
env = (import ./app.nix { inherit pkgs; inherit python; }).dependencyEnv;
app = import ./default.nix { inherit pkgs; inherit python; };
env = app.dependencyEnv;
myEmacs = (import /home/rrix/arroyo-nix/pkgs/emacs.nix { inherit pkgs; });
in pkgs.dockerTools.buildLayeredImage {
name = "arcology";

5
flake.nix
View File

@ -11,11 +11,10 @@
rec {
devShell = import ./shell.nix { inherit pkgs; };
packages = flake-utils.lib.flattenTree {
arcology = import ./app.nix { inherit pkgs; };
arcology-with-assets = import ./default.nix { inherit pkgs; };
arcology = import ./default.nix { inherit pkgs; };
docker = import ./docker.nix { inherit pkgs; };
};
defaultPackage = packages.arcology-with-assets;
defaultPackage = packages.arcology;
apps.arcology-fastapi = flake-utils.lib.mkApp {
drv = packages.arcology-with-assets;
exePath = "/bin/arcology-fastapi";

2
shell.nix
View File

@ -1,7 +1,7 @@
{ pkgs ? import <nixpkgs> {} }:
let
myApp = import ./app.nix { inherit pkgs; };
myApp = import ./default.nix { inherit pkgs; };
myAppEnv = myApp.editableEnv;
in pkgs.mkShell {
packages = [