Get beads working again
This commit is contained in:
parent
ff5367794d
commit
70f48b9f58
6 changed files with 286 additions and 36 deletions
55
flake.nix
55
flake.nix
|
|
@ -4,12 +4,16 @@
|
|||
inputs = {
|
||||
nixpkgs-25-11.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs-25-11";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
talon-nix.url = "github:nix-community/talon-nix";
|
||||
openclaw-flake.url = "github:openclaw/nix-openclaw";
|
||||
plover-flake.url = "github:openstenoproject/plover-flake";
|
||||
beads-flake.url = "github:steveyegge/beads";
|
||||
beads-flake.inputs.nixpkgs.follows = "nixpkgs-25-11";
|
||||
awww.url = "git+https://codeberg.org/LGFae/awww";
|
||||
niri.url = "github:hunner/niri/hunner/focus-to-workspace";
|
||||
#niri.inputs.nixpkgs.follows = "nixpkgs-25-11";
|
||||
|
|
@ -19,10 +23,12 @@
|
|||
self,
|
||||
nixpkgs-25-11,
|
||||
nixpkgs-unstable,
|
||||
home-manager,
|
||||
sops-nix,
|
||||
nixos-hardware,
|
||||
impermanence,
|
||||
talon-nix,
|
||||
openclaw-flake,
|
||||
plover-flake,
|
||||
beads-flake,
|
||||
awww,
|
||||
|
|
@ -41,6 +47,50 @@
|
|||
|
||||
overlay-local = final: prev: {
|
||||
codex = prev.callPackage ./pkgs/codex/package.nix { };
|
||||
beads =
|
||||
let
|
||||
bdBase =
|
||||
(
|
||||
final.callPackage "${beads-flake}/default.nix" {
|
||||
pkgs = final;
|
||||
self = beads-flake;
|
||||
}
|
||||
).overrideAttrs
|
||||
(old: {
|
||||
vendorHash = "sha256-s9ELOxDHHk+RyImrPxm9DPos7Wb4AFWaNKsrgU4soow=";
|
||||
env = (old.env or { }) // {
|
||||
# Upstream pulls an ICU-backed regex dep; keep Nix build pure-Go.
|
||||
CGO_ENABLED = "0";
|
||||
};
|
||||
postPatch =
|
||||
(old.postPatch or "")
|
||||
+ ''
|
||||
# Upstream source currently references a removed internal package.
|
||||
rm -f cmd/bd/integration_test_stubs_test.go
|
||||
rm -rf examples/monitor-webui
|
||||
'';
|
||||
});
|
||||
in
|
||||
final.stdenv.mkDerivation {
|
||||
pname = "beads";
|
||||
version = bdBase.version;
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ${bdBase}/bin/bd $out/bin/bd
|
||||
|
||||
ln -s bd $out/bin/beads
|
||||
|
||||
mkdir -p $out/share/fish/vendor_completions.d
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
mkdir -p $out/share/zsh/site-functions
|
||||
|
||||
$out/bin/bd completion fish > $out/share/fish/vendor_completions.d/bd.fish
|
||||
$out/bin/bd completion bash > $out/share/bash-completion/completions/bd
|
||||
$out/bin/bd completion zsh > $out/share/zsh/site-functions/_bd
|
||||
'';
|
||||
meta = bdBase.meta;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
@ -68,7 +118,12 @@
|
|||
|
||||
nixosConfigurations.ruil = nixpkgs-25-11.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit openclaw-flake;
|
||||
};
|
||||
modules = [
|
||||
({ ... }: { nixpkgs.overlays = [ openclaw-flake.overlays.default ]; })
|
||||
home-manager.nixosModules.home-manager
|
||||
./hosts/ruil/configuration.nix
|
||||
sops-nix.nixosModules.sops
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue