nixos: bump keepbook and expose keepbook binaries
This commit is contained in:
@@ -1,4 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
|
let
|
||||||
|
keepbook = inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook.overrideAttrs (_: {
|
||||||
|
# Upstream checks currently depend on TS artifacts that are not built in Nix.
|
||||||
|
doCheck = false;
|
||||||
|
});
|
||||||
|
in
|
||||||
{
|
{
|
||||||
nixpkgs.config.allowBroken = true;
|
nixpkgs.config.allowBroken = true;
|
||||||
|
|
||||||
@@ -36,6 +42,7 @@
|
|||||||
ispell
|
ispell
|
||||||
jq
|
jq
|
||||||
just
|
just
|
||||||
|
keepbook
|
||||||
lshw
|
lshw
|
||||||
lsof
|
lsof
|
||||||
magic-wormhole-rs
|
magic-wormhole-rs
|
||||||
|
|||||||
6
nixos/flake.lock
generated
6
nixos/flake.lock
generated
@@ -1318,11 +1318,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771447274,
|
"lastModified": 1771570718,
|
||||||
"narHash": "sha256-W5TTADv4NGn0tpap2nkOTZAxVUGiJI7m2UiKQvfW+WY=",
|
"narHash": "sha256-vmFe1a9gIOLcT8UdE/b+Z9Cb0KQzGQonwtrxcZX9hx8=",
|
||||||
"owner": "colonelpanic8",
|
"owner": "colonelpanic8",
|
||||||
"repo": "keepbook",
|
"repo": "keepbook",
|
||||||
"rev": "d0feb8deed6a439fb0f673ce1b9026afb2240b70",
|
"rev": "c0154c4e701dc3726cc709b15ec01cad1175d4f8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{ config, lib, pkgs, inputs, makeEnable, ... }:
|
{ config, lib, pkgs, inputs, makeEnable, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.myModules."keepbook-sync";
|
cfg = config.myModules."keepbook-sync";
|
||||||
keepbookTray =
|
keepbookTray =
|
||||||
inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook-tray.overrideAttrs (old: {
|
inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook-tray.overrideAttrs (_: {
|
||||||
# Upstream currently includes a contract test that expects a built TS CLI
|
# Upstream currently includes a contract test that expects a built TS CLI
|
||||||
# entrypoint under ts/dist/, but the Nix build does not build the TS
|
# entrypoint under ts/dist/, but the Nix build does not build the TS
|
||||||
# artifacts first. Skip checks to keep the package usable on NixOS.
|
# artifacts first. Skip checks to keep the package usable on NixOS.
|
||||||
@@ -24,6 +24,8 @@
|
|||||||
daemonExec = lib.escapeShellArgs ([ "${keepbookTray}/bin/keepbook-sync-daemon" ] ++ daemonArgs);
|
daemonExec = lib.escapeShellArgs ([ "${keepbookTray}/bin/keepbook-sync-daemon" ] ++ daemonArgs);
|
||||||
|
|
||||||
enabledModule = makeEnable config "myModules.keepbook-sync" false {
|
enabledModule = makeEnable config "myModules.keepbook-sync" false {
|
||||||
|
environment.systemPackages = [ keepbookTray ];
|
||||||
|
|
||||||
home-manager.users.${cfg.user} = {
|
home-manager.users.${cfg.user} = {
|
||||||
systemd.user.services.keepbook-sync-daemon = {
|
systemd.user.services.keepbook-sync-daemon = {
|
||||||
Unit = {
|
Unit = {
|
||||||
|
|||||||
Reference in New Issue
Block a user