Nix: development shel, direnv and compatibility

.envrc

@@ -0,0 +1 @@
+use_flake

.gitignore

@@ -3,6 +3,7 @@
 .cache/
 .vs/
 .vscode/
+.direnv/
 .DS_Store
 
 build/
@@ -18,6 +19,7 @@ models/*
 
 /main
 /quantize
+/result
 
 arm_neon.h
 compile_commands.json

default.nix

@@ -0,0 +1,10 @@
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).defaultNix

flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1676283394,
@@ -33,6 +49,7 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }

flake.nix

@@ -1,15 +1,19 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
     flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
           inherit system;
         };
-        python = with pkgs; python310.withPackages (ps: with python310Packages; [
+        llama-python = with pkgs; python310.withPackages (ps: with python310Packages; [
           torch
           numpy
           sentencepiece
@@ -18,19 +22,26 @@
       {
         packages.default = pkgs.stdenv.mkDerivation {
           name = "llama.cpp";
-          buildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [
+          buildInputs = with pkgs; lib.optionals stdenv.isDarwin [
-            pkgs.darwin.apple_sdk.frameworks.Accelerate
+            darwin.apple_sdk.frameworks.Accelerate
           ];
           src = ./.;
           installPhase = ''
             mkdir -p $out/bin
             mv main $out/bin/llama-cpp
             mv quantize $out/bin/llama-cpp-quantize
-            echo "#!${python}/bin/python" > $out/bin/convert-pth-to-ggml
+            echo "#!${llama-python}/bin/python" > $out/bin/convert-pth-to-ggml
             cat convert-pth-to-ggml.py >> $out/bin/convert-pth-to-ggml
             chmod +x $out/bin/convert-pth-to-ggml
           '';
         };
+        devShells.default = pkgs.mkShell {
+          packages = with pkgs; [
+            llama-python
+          ] ++ lib.optionals stdenv.isDarwin [
+            darwin.apple_sdk.frameworks.Accelerate
+          ];
+        };
       }
     );
 }

shell.nix

@@ -0,0 +1,10 @@
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).shellNix