From 669bf7f423c619183f63705e796208d3d7aa6cdf Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Thu, 13 Apr 2023 16:15:41 +1000 Subject: [PATCH] correctly import llamacpp --- flake.lock | 58 ++++++++++++++++++++++++++++++++++++++---------------- flake.nix | 2 +- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 309e2a61..3fd52015 100644 --- a/flake.lock +++ b/flake.lock @@ -210,6 +210,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -260,6 +275,27 @@ "type": "github" } }, + "llamacpp": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1681311976, + "narHash": "sha256-vxtBq4PeYkRWML6IJhbhDhdyBfaLSzCg1rNu2ozuPAk=", + "owner": "ggerganov", + "repo": "llama.cpp", + "rev": "e7f6997f897a18b6372a6460e25c5f89e1469f1d", + "type": "github" + }, + "original": { + "owner": "ggerganov", + "repo": "llama.cpp", + "type": "github" + } + }, "nix-matrix-appservices": { "inputs": { "devshell": "devshell", @@ -344,21 +380,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1662446902, - "narHash": "sha256-Dmsd3jSG2ldZUlhFaIwunqgMf14EEK7ylXpw+OPDLxE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3bfaf06b12253ddaafe64a67f4ed39b547d41667", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1677243766, @@ -376,7 +397,9 @@ }, "poonam": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "vimwiki-cli": "vimwiki-cli" }, "locked": { @@ -402,6 +425,7 @@ "eww": "eww", "hardware": "hardware", "home-manager": "home-manager", + "llamacpp": "llamacpp", "nix-matrix-appservices": "nix-matrix-appservices", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", @@ -414,7 +438,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 65231c2e..14fd4d0a 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ tidalcycles.url = "github:mitchmindtree/tidalcycles.nix"; tidalcycles.inputs.nixpkgs.follows = "unstable"; llamacpp.url = "github:ggerganov/llama.cpp"; - llamacpp.inputs.nixpkgs.url.follows = "unstable"; + llamacpp.inputs.nixpkgs.follows = "unstable"; # TODO hundred rabbits software # TODO needs secrets # dhyan.url = "git+ssh://gitea@git.sealight.xyz/aynish/dhyan?ref=main";