yorick
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor cleanup

master
Yorick van Pelt 2023-09-24 22:26:11 +02:00
parent 4f60bf4168
commit a5abf4c545
Signed by: yorick
GPG Key ID: D8D3CC6D951384DE
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/machines/pennyworth/default.nix
View File

@ -20,6 +20,7 @@ in {
../../roles/datakami.nix
../../services/backup.nix
../../services/email.nix
# TODO: check if this can be removed when nixpkgs#251597 is merged
../../services/calibre-web.nix
];

11
pkgs/default.nix
View File

@ -32,12 +32,9 @@
'';
});
wayland-push-to-talk-fix = self.callPackage ./wayland-push-to-talk-fix.nix {};
y-deployer = self.callPackage ../deployer/package.nix {
inherit (self.nix-npm-buildpackage) buildYarnPackage;
};
marvin-tracker = self.callPackage ./marvin-tracker {
inherit (self.nix-npm-buildpackage) buildYarnPackage;
};
y-deployer = self.callPackage ../deployer/package.nix {};
inherit (self.nix-npm-buildpackage) buildYarnPackage;
marvin-tracker = self.callPackage ./marvin-tracker {};
grott = self.callPackage ./grott.nix {};
python3 = super.python3.override {
packageOverrides = pyself: pysuper: {
@ -63,6 +60,7 @@
})
];
});
# remove once https://github.com/NixOS/nixpkgs/pull/251597 is merged
calibre-web = super.calibre-web.overridePythonAttrs (o: {
propagatedBuildInputs = o.propagatedBuildInputs ++ [ self.python3.pkgs.jsonschema ];
});
@ -71,7 +69,6 @@
headers = "sha256-ZxvJrPrQX0UUy6LkXZcCXhUkRj6FLv40d7N65eGRRcY=";
};
notion-desktop = self.callPackage ./notion-desktop {
inherit (self.nix-npm-buildpackage) buildYarnPackage;
electron_26 = self.electron_27;
};
dashy = self.callPackage ./dashy.nix {