Compare commits
2
Commits
ef421306dd
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7adfc8d808 | ||
|
|
858ed2000e |
Generated
+20
-20
@@ -154,16 +154,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774505501,
|
"lastModified": 1785348116,
|
||||||
"narHash": "sha256-7UiRrDptj7yuEFwToOfdunUMz/i3jRLR7CmMoYQjq6k=",
|
"narHash": "sha256-AVycTcomtfvQJ/AHvMg5xu7lVoOzDXxjN+pV7mqUIQ4=",
|
||||||
"owner": "basecamp",
|
"owner": "basecamp",
|
||||||
"repo": "basecamp-cli",
|
"repo": "basecamp-cli",
|
||||||
"rev": "f087e6ef84002503d0dbc75ea1c8c928a8928d9e",
|
"rev": "e1059fb123a03295ce6176272e4bbaf43d7971c6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "basecamp",
|
"owner": "basecamp",
|
||||||
"ref": "v0.7.2",
|
"ref": "v0.8.0-rc.1",
|
||||||
"repo": "basecamp-cli",
|
"repo": "basecamp-cli",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -176,16 +176,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774505501,
|
"lastModified": 1785348116,
|
||||||
"narHash": "sha256-7UiRrDptj7yuEFwToOfdunUMz/i3jRLR7CmMoYQjq6k=",
|
"narHash": "sha256-AVycTcomtfvQJ/AHvMg5xu7lVoOzDXxjN+pV7mqUIQ4=",
|
||||||
"owner": "basecamp",
|
"owner": "basecamp",
|
||||||
"repo": "basecamp-cli",
|
"repo": "basecamp-cli",
|
||||||
"rev": "f087e6ef84002503d0dbc75ea1c8c928a8928d9e",
|
"rev": "e1059fb123a03295ce6176272e4bbaf43d7971c6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "basecamp",
|
"owner": "basecamp",
|
||||||
"ref": "v0.7.2",
|
"ref": "v0.8.0-rc.1",
|
||||||
"repo": "basecamp-cli",
|
"repo": "basecamp-cli",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -651,11 +651,11 @@
|
|||||||
"nur": "nur"
|
"nur": "nur"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785574389,
|
"lastModified": 1785670861,
|
||||||
"narHash": "sha256-APU8O7r0pc741pMoy8a0/TWiAZOKw4LFR6JU5MLLPc4=",
|
"narHash": "sha256-YqqpjjW0zcI/cqtmTM18q8Xi5y/g060ApVLLNw0RXg4=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "79264914662e8d7823c2fc8537038b77b3c6b9ab",
|
"rev": "516f9d74e0be79dfa5fc29c98f2d1e5b04fdf4eb",
|
||||||
"revCount": 103,
|
"revCount": 104,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home"
|
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home"
|
||||||
},
|
},
|
||||||
@@ -677,11 +677,11 @@
|
|||||||
"openspec": "openspec"
|
"openspec": "openspec"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785395945,
|
"lastModified": 1785670526,
|
||||||
"narHash": "sha256-/J1bkZi7tb+DxUN3G9bJBCxaJpG4373L+AjxF8SoX9M=",
|
"narHash": "sha256-tC1CW+Kxh9ZZxJC0y472i0KoieMqNwNi+AiCmS4n7To=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "e3ebb76b1c26ecc3311d65b25fa38d70313b6804",
|
"rev": "69fce234a8607cd3e71233831564b8ceeba70626",
|
||||||
"revCount": 371,
|
"revCount": 374,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
|
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
|
||||||
},
|
},
|
||||||
@@ -700,11 +700,11 @@
|
|||||||
"openspec": "openspec_2"
|
"openspec": "openspec_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785397255,
|
"lastModified": 1785670526,
|
||||||
"narHash": "sha256-eKgjP0pRJbdGLzGhP7QCdcugUr4/0WGhxKwieJNNodk=",
|
"narHash": "sha256-tC1CW+Kxh9ZZxJC0y472i0KoieMqNwNi+AiCmS4n7To=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "1cbde05767dacdbb5e2c07a4b45fa72f8d9307ed",
|
"rev": "69fce234a8607cd3e71233831564b8ceeba70626",
|
||||||
"revCount": 372,
|
"revCount": 374,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
|
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
|
||||||
},
|
},
|
||||||
|
|||||||
+25
-4
@@ -7,7 +7,7 @@
|
|||||||
# This one contains whatever you want to overlay
|
# This one contains whatever you want to overlay
|
||||||
# You can change versions, add patches, set compilation flags, anything really.
|
# You can change versions, add patches, set compilation flags, anything really.
|
||||||
# https://nixos.wiki/wiki/Overlays
|
# https://nixos.wiki/wiki/Overlays
|
||||||
modifications = final: prev: {
|
modifications = _final: _prev: {
|
||||||
# n8n = import ./mods/n8n.nix {inherit prev;};
|
# n8n = import ./mods/n8n.nix {inherit prev;};
|
||||||
|
|
||||||
# brave = prev.brave.override {
|
# brave = prev.brave.override {
|
||||||
@@ -64,15 +64,36 @@
|
|||||||
# recursion that occurs when accessing final/prev.system while the fixed-point
|
# recursion that occurs when accessing final/prev.system while the fixed-point
|
||||||
# is still being computed. Exposed via outputs.lib, not outputs.overlays.
|
# is still being computed. Exposed via outputs.lib, not outputs.overlays.
|
||||||
#
|
#
|
||||||
# Filters out the 16 internal helpers (marked `passthru.hideFromDocs = true`
|
# Use llm-agents' shared-nixpkgs overlay so packages with optional GPU support
|
||||||
|
# (notably qmd) are built against this system's pkgs/config. Using the flake's
|
||||||
|
# pre-built `packages.${system}` set pins them to llm-agents' own nixpkgs,
|
||||||
|
# where allowUnfree is false; qmd.override { cudaSupport = true; } then fails
|
||||||
|
# on CUDA EULA packages during the m3-ares NVIDIA specialisation build.
|
||||||
|
#
|
||||||
|
# Keep the exposed top-level package names aligned with llm-agents' filtered
|
||||||
|
# flake packages, but take the package values from the shared package set.
|
||||||
|
# Filters out internal helpers (marked `passthru.hideFromDocs = true`
|
||||||
# upstream) that would otherwise clobber nixpkgs attributes. Most critically
|
# upstream) that would otherwise clobber nixpkgs attributes. Most critically
|
||||||
# this excludes `buildNpmPackage` — llm-agents' buildNpmPackage is a guarded
|
# this excludes `buildNpmPackage` — llm-agents' buildNpmPackage is a guarded
|
||||||
# re-export whose `__functor`/`override` interaction with makeOverridable
|
# re-export whose `__functor`/`override` interaction with makeOverridable
|
||||||
# breaks any package (e.g. nixpkgs' webcord) that calls
|
# breaks any package (e.g. nixpkgs' webcord) that calls
|
||||||
# `buildNpmPackage.override { nodejs = ...; }`. See numtide/llm-agents.nix
|
# `buildNpmPackage.override { nodejs = ...; }`. See numtide/llm-agents.nix
|
||||||
# commit 40490259 and the wrapper at packages/buildNpmPackage/package.nix.
|
# commit 40490259 and the wrapper at packages/buildNpmPackage/package.nix.
|
||||||
mkLlmAgentsOverlay = system: _final: _prev:
|
mkLlmAgentsOverlay = system: final: prev: let
|
||||||
builtins.removeAttrs (inputs.llm-agents.packages.${system} or {}) [
|
sharedPackages = (inputs.llm-agents.overlays.shared-nixpkgs final prev).llm-agents or {};
|
||||||
|
exposedPackageNames =
|
||||||
|
builtins.filter
|
||||||
|
(name: inputs.nixpkgs.lib.hasAttrByPath [name] sharedPackages)
|
||||||
|
(builtins.attrNames (inputs.llm-agents.packages.${system} or {}));
|
||||||
|
exposedPackages =
|
||||||
|
builtins.listToAttrs
|
||||||
|
(map (name: {
|
||||||
|
inherit name;
|
||||||
|
value = sharedPackages.${name};
|
||||||
|
})
|
||||||
|
exposedPackageNames);
|
||||||
|
in
|
||||||
|
builtins.removeAttrs exposedPackages [
|
||||||
# Internal helpers from packages/* marked hideFromDocs upstream:
|
# Internal helpers from packages/* marked hideFromDocs upstream:
|
||||||
"antigravity"
|
"antigravity"
|
||||||
"auto-claude"
|
"auto-claude"
|
||||||
|
|||||||
Reference in New Issue
Block a user