Rewrite CLI in Python

.devcontainer.json

@@ -2,7 +2,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
-        "bbenoist.Nix"
+        "jnoortheen.nix-ide"
       ]
     }
   },

.envrc

@@ -3,10 +3,6 @@
 # Used by https://direnv.net
 set -euo pipefail
 
-# Use our own last built devenv/nix in CLI
-devenv_bin=$(nix build --print-out-paths --accept-flake-config)
-PATH_add "$devenv_bin/bin"
-
 # External users should use `source_url` to load this file
 source_env ./direnvrc
 

.github/workflows/buildtest.yml

@@ -75,6 +75,7 @@ jobs:
     - run: devenv shell devenv-test-example ${{ matrix.example }}
   direnv:
     name: direnv (${{ join(matrix.os) }})
+    needs: build
     strategy:
       fail-fast: false
       matrix:
@@ -99,7 +100,7 @@ jobs:
           }
         ' ./examples/simple/devenv.yaml.orig > ./examples/simple/devenv.yaml
         nix profile remove '.*'
-        nix profile install . 'nixpkgs#direnv'
+        nix profile install . 'nixpkgs#direnv' nix profile install --accept-flake-config
         mkdir -p ~/.config/direnv/
         cat > ~/.config/direnv/direnv.toml << 'EOF'
         [global]
@@ -109,6 +110,7 @@ jobs:
         direnv exec ./examples/simple true
   fish-zsh:
     name: zsh/fish (${{ join(matrix.os) }})
+    needs: build
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -1,12 +1,13 @@
+# Nix & devenv
 result
-.env*
+/.env*
 .devenv*
 /.cache
 /.pre-commit-config.yaml
-/bin
-/include
-/lib
-pyvenv.cfg
-/.direnv
-/.venv
+
+# examples
 examples/rust/app/target
+
+# Python
+/.venv
+*.pyc

devenv.nix

@@ -1,17 +1,21 @@
 { inputs, pkgs, lib, config, ... }:
 
 {
+  env = {
+    DEVENV_NIX = inputs.nix.packages.${pkgs.stdenv.system}.nix;
+  };
+
   packages = [
-    (import ./src/devenv.nix { inherit pkgs; nix = inputs.nix; })
     pkgs.cairo
     pkgs.xorg.libxcb
     pkgs.yaml2json
   ];
 
   languages.nix.enable = true;
   languages.python.enable = true;
-  languages.python.venv.enable = true;
   languages.python.poetry.enable = true;
+  languages.python.poetry.install.installRootPackage = true;
+  languages.python.poetry.install.groups = [ "docs" ];
 
   devcontainer.enable = true;
   devcontainer.settings.customizations.vscode.extensions = [ "jnoortheen.nix-ide" ];
@@ -21,7 +25,6 @@
 
   # bin/mkdocs serve --config-file mkdocs.insiders.yml
   processes.docs.exec = "mkdocs serve";
-  processes.build.exec = "${pkgs.watchexec}/bin/watchexec -e nix nix build";
 
   scripts.devenv-bump-version.exec = ''
     # TODO: ask for the new version
@@ -51,7 +54,7 @@
       nix flake init --template ''${DEVENV_ROOT}#simple
       nix flake update \
         --override-input devenv ''${DEVENV_ROOT}
-      nix develop --impure --command echo nix-develop started succesfully |& tee ./console
+      nix develop --accept-flake-config --impure --command echo nix-develop started succesfully |& tee ./console
       grep -F 'nix-develop started succesfully' <./console
       grep -F "$(${lib.getExe pkgs.hello})" <./console
 
@@ -71,15 +74,13 @@
       nix flake init --template ''${DEVENV_ROOT}#flake-parts
       nix flake update \
         --override-input devenv ''${DEVENV_ROOT}
-      nix develop --impure --command echo nix-develop started succesfully |& tee ./console
+      nix develop --accept-flake-config --impure --command echo nix-develop started succesfully |& tee ./console
       grep -F 'nix-develop started succesfully' <./console
       grep -F "$(${lib.getExe pkgs.hello})" <./console
       # Test that a container can be built
-      nix build --impure .#container-processes
+      nix build --impure --accept-flake-config .#container-processes
     popd
     rm -rf "$tmp"
-
-    # TODO: test DIRENV_ACTIVE
   '';
   scripts.devenv-test-all-examples.exec = ''
     for dir in $(ls examples); do

flake.nix

@@ -22,14 +22,16 @@
     url = "github:domenkozar/nix/relaxed-flakes";
     inputs.nixpkgs.follows = "nixpkgs";
   };
+  inputs.poetry2nix = {
+    url = "github:nix-community/poetry2nix";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
 
   outputs = { self, nixpkgs, pre-commit-hooks, nix, ... }@inputs:
     let
       systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
       forAllSystems = f: builtins.listToAttrs (map (name: { inherit name; value = f name; }) systems);
-      mkPackage = pkgs: import ./src/devenv.nix {
-        inherit pkgs nix;
-      };
+      mkPackage = pkgs: import ./package.nix { inherit pkgs inputs; };
       mkDevShellPackage = config: pkgs: import ./src/devenv-devShell.nix { inherit config pkgs; };
       mkDocOptions = pkgs:
         let

package.nix

@@ -0,0 +1,29 @@
+{ pkgs, inputs }:
+
+let
+  python = (pkgs.python3.override {
+    readline = null;
+    ncurses = null;
+    gdbm = null;
+    sqlite = null;
+    tzdata = null;
+    stripConfig = true;
+    stripIdlelib = true;
+    stripTests = true;
+    stripTkinter = true;
+    rebuildBytecode = false;
+    stripBytecode = true;
+    includeSiteCustomize = false;
+    enableOptimizations = false;
+    enableLTO = false;
+    mimetypesSupport = false;
+  }).overrideAttrs (_: { pname = "python3-minimal"; });
+in
+(inputs.poetry2nix.legacyPackages.${pkgs.stdenv.system}.mkPoetryApplication {
+  projectDir = ./.;
+  inherit python;
+}).overrideAttrs (old: {
+  makeWrapperArgs = [
+    "--set DEVENV_NIX ${inputs.nix.packages.${pkgs.stdenv.system}.nix}"
+  ];
+})