commit 21f7bd1df67d69e8f54ba3332b5c8625d4550b42
parent cb01d4d83b825d4d7089c73bc884bdd4bdc39b3e
Author: vin <vin@vineetk.net>
Date: Tue, 18 Mar 2025 01:27:17 -0400
all: update nix flake inputs to use follows and add llama-cpp input
Diffstat:
| M | flake.lock | | | 105 | +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ |
| M | flake.nix | | | 15 | +++++++++++++-- |
2 files changed, 78 insertions(+), 42 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -4,7 +4,9 @@
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
"systems": "systems"
},
"locked": {
@@ -115,6 +117,24 @@
"type": "github"
}
},
+ "flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib_2"
+ },
+ "locked": {
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -156,6 +176,27 @@
"type": "github"
}
},
+ "llama-cpp": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1742259085,
+ "narHash": "sha256-95kracZRp8nsFy8AEG4q3j+hXjgKpfA5S3w4gBOuxwM=",
+ "owner": "ggml-org",
+ "repo": "llama.cpp",
+ "rev": "a53f7f7b8859f3e634415ab03e1e295b9861d7e6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ggml-org",
+ "repo": "llama.cpp",
+ "type": "github"
+ }
+ },
"nix-filter": {
"locked": {
"lastModified": 1687178632,
@@ -173,16 +214,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1703013332,
- "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
- "owner": "NixOS",
+ "lastModified": 1742230170,
+ "narHash": "sha256-BEny83HblVcCGgSG3NHljafuWQE6+yP8XNUIydsIyoA=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
+ "rev": "0f80da4f5e0dbe1f917f6f3643a262bae7dbb34e",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
+ "owner": "nixos",
+ "ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
@@ -220,51 +261,32 @@
"type": "github"
}
},
- "nixpkgs-stable": {
+ "nixpkgs-lib_2": {
"locked": {
- "lastModified": 1742136038,
- "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
- "type": "github"
+ "lastModified": 1730504152,
+ "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
- "owner": "nixos",
- "ref": "nixos-24.11",
- "repo": "nixpkgs",
- "type": "github"
+ "type": "tarball",
+ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
- "nixpkgs_2": {
+ "nixpkgs-stable": {
"locked": {
- "lastModified": 1742230170,
- "narHash": "sha256-BEny83HblVcCGgSG3NHljafuWQE6+yP8XNUIydsIyoA=",
+ "lastModified": 1742136038,
+ "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0f80da4f5e0dbe1f917f6f3643a262bae7dbb34e",
+ "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable-small",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1732014248,
- "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
- "owner": "NixOS",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
- "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-unstable",
- "type": "indirect"
}
},
"root": {
@@ -272,7 +294,8 @@
"agenix": "agenix",
"everblush-gtk": "everblush-gtk",
"home-manager": "home-manager_2",
- "nixpkgs": "nixpkgs_2",
+ "llama-cpp": "llama-cpp",
+ "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"simple-nixos-mailserver": "simple-nixos-mailserver"
}
@@ -281,7 +304,9 @@
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": [
+ "nixpkgs-stable"
+ ],
"nixpkgs-24_11": "nixpkgs-24_11"
},
"locked": {
diff --git a/flake.nix b/flake.nix
@@ -16,9 +16,20 @@
inputs.nixpkgs.follows = "nixpkgs";
};
- simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
+ simple-nixos-mailserver = {
+ url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
+ inputs.nixpkgs.follows = "nixpkgs-stable";
+ };
- agenix.url = "github:ryantm/agenix";
+ agenix = {
+ url = "github:ryantm/agenix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+ llama-cpp = {
+ url = "github:ggml-org/llama.cpp";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
};
outputs = { self, home-manager, nixpkgs, nixpkgs-stable, everblush-gtk, agenix, simple-nixos-mailserver, ... }@inputs: {
