fix: cascade of failling becaus of stupid git overlay
This commit is contained in:
parent
d8ad4e916d
commit
6f831d833e
5 changed files with 19 additions and 6 deletions
16
flake.nix
16
flake.nix
|
|
@ -49,8 +49,22 @@
|
|||
}).git;
|
||||
};
|
||||
|
||||
# Overlay to skip syrupy tests (broken in nixpkgs unstable)
|
||||
# Uses pythonPackagesExtensions to apply to all Python versions
|
||||
syrupyOverlay = final: prev: {
|
||||
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
||||
(pyFinal: pyPrev: {
|
||||
syrupy = pyPrev.syrupy.overrideAttrs (old: { doCheck = false; });
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
overlaysList =
|
||||
[ ghostty.overlays.default chaotic.overlays.default gitOverlay ];
|
||||
[ ghostty.overlays.default
|
||||
chaotic.overlays.default
|
||||
gitOverlay
|
||||
syrupyOverlay
|
||||
];
|
||||
|
||||
mkPkgs = system:
|
||||
import nixpkgs {
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ in {
|
|||
"bitwarden"
|
||||
"brave-browser"
|
||||
"firefox"
|
||||
"font-jetbrains-mono"
|
||||
"pgadmin4"
|
||||
"spotify"
|
||||
"vesktop"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
imports = [ ./homebrew.nix ./devtools.nix ];
|
||||
|
||||
nix = {
|
||||
package = pkgs.nixVersions.nix_2_28;
|
||||
extraOptions = ''
|
||||
keep-derivations = true
|
||||
keep-outputs = true
|
||||
|
|
|
|||
|
|
@ -39,11 +39,12 @@
|
|||
|
||||
rsydn.devTools = {
|
||||
enable = lib.mkDefault true;
|
||||
# Note: jetbrains-mono removed - installed via Homebrew cask (font-jetbrains-mono)
|
||||
# due to nixpkgs-unstable syrupy test failures breaking the font's Python build deps
|
||||
packages = with pkgs; [
|
||||
cloudflared
|
||||
fzf
|
||||
htop
|
||||
jetbrains-mono
|
||||
jq
|
||||
jujutsu
|
||||
lazygit
|
||||
|
|
|
|||
|
|
@ -3,6 +3,4 @@
|
|||
let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
llmPkgs = llm-agents.packages.${system};
|
||||
in {
|
||||
opencode = llmPkgs.opencode;
|
||||
}
|
||||
in { opencode = llmPkgs.opencode; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue