Cleanup old flake mkShell

GiorgosXou · Apr 4, 2024 · 664d79d · 664d79d
1 parent b60124a
commit 664d79d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 39 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,25 +3,36 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils }:
-    utils.lib.eachDefaultSystem (system:
-      with import nixpkgs { inherit system; }; {
-        devShells.default = mkShell {
-          LD_LIBRARY_PATH = lib.makeLibraryPath [ncurses6];
-          venvDir = "venv";
-          buildInputs = [
-            pkgs.gnumake
-            pkgs.python310Full
-            pkgs.ncurses6
-            pkgs.python310Packages.venvShellHook
-          ];
-          postVenvCreation = ''
-            pip install -r requirements.txt
-            pip install -e .
-          '';
-        };
-      });
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachSystem [
+      "aarch64-darwin"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ]
+      (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          devShells.default = pkgs.mkShell {
+            LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ pkgs.ncurses ];
+            packages =
+              let
+                py-env = pkgs.python310.withPackages (p: [
+                  p.send2trash
+                  p.unicurses
+                ]);
+              in
+              [
+                py-env
+                pkgs.gnumake
+              ];
+          };
+
+          formatter = pkgs.nixpkgs-fmt;
+        });
 }