refactor: clean up nixFastBuild

This commit is contained in:
matt1432 2024-10-28 08:18:00 -04:00
parent c2bb1a264a
commit 6bb2b3c8c2
4 changed files with 31 additions and 23 deletions
devices
nos/modules/docker/media/prowlarr/images
servivi/modules
flake.lock
legacyPackages/firefox-addons

View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage rec {
imageName = "21hsmw/flaresolverr";
imageDigest = "sha256:a85e675e7b4e980e142d58e440dd3e1b6fa6bc10aabcc612727f81e34c28db80";
sha256 = "1wn32jl4za7y4sj5ljz5m87z46maz65c4ckznz84mp15f008c5y4";
imageDigest = "sha256:506b7f26aaf10e8c07ab22f74a7eea31eca66e263fe52d570b7bc0ef29952db9";
sha256 = "1ll5f62r69hzizli0irpp1z1r4hmv9ps3pqzb1s8klvjrdgaxd22";
finalImageName = imageName;
finalImageTag = "nodriver";
}

View file

@ -7,7 +7,7 @@
inherit (config.vars) mainUser;
inherit (config.sops) secrets;
nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
nix-fast-build-pkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
nix-eval-jobs =
pkgs.nix-eval-jobs.override {
nix = config.nix.package;
@ -16,19 +16,23 @@
nix = config.nix.package;
};
};
nixFastBuild = pkgs.writeShellApplication {
name = "nixFastBuild";
runtimeInputs = with pkgs; [gnugrep nix-fast-build-pkg];
text = ''
cd "$FLAKE" || return
nix-fast-build -f .#nixFastChecks
'';
};
in {
services.nix-serve = {
enable = true;
secretKeyFile = secrets.binary-cache-key.path;
};
environment.systemPackages = [
nix-fast-buildPkg
];
home-manager.users.${mainUser}.programs.bash.shellAliases = {
nix-fast-build = "nix-fast-build -f $FLAKE/.#nixFastChecks";
};
environment.systemPackages = [nix-fast-build-pkg nixFastBuild];
# Populate cache
systemd = {
@ -41,7 +45,7 @@ in {
path =
[
nix-fast-buildPkg
nix-fast-build-pkg
config.nix.package
]
++ (builtins.attrValues {
@ -55,12 +59,16 @@ in {
script = ''
cd /tmp
if [[ -d ./nix-clone ]]; then
rm -r ./nix-clone
fi
git clone https://git.nelim.org/matt1432/nixos-configs.git nix-clone
cd nix-clone
nix-fast-build -f .#nixFastChecks
cd ..
rm -r nix-clone

18
flake.lock generated
View file

@ -963,11 +963,11 @@
"material-symbols-src": {
"flake": false,
"locked": {
"lastModified": 1730046006,
"narHash": "sha256-Ro0UTfaOVYgF7vz+ngxt0u1f4je1oJaog9yB3kDwqDs=",
"lastModified": 1730096827,
"narHash": "sha256-uQ/i7eQSgElewiUF8Yus0QrcMI73DiusEw0w1E2X0Iw=",
"owner": "beecho01",
"repo": "material-symbols",
"rev": "f1de6edf84c6f6094a3830a67ff979ec98ed326b",
"rev": "95a0f1b40c6bba4e02e25c8d91ec97a241b49466",
"type": "github"
},
"original": {
@ -1419,11 +1419,11 @@
]
},
"locked": {
"lastModified": 1730068416,
"narHash": "sha256-ZblJXYHsAwAHPUnER5toHpOMtIrDAVytzzgI4B2rXJ8=",
"lastModified": 1730110926,
"narHash": "sha256-sZlIVytrqqXN6runKjsmgCr8IlazVDS+1RCHkd48jcI=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "8d5faa9440349976c84b7b55d05e3e5dcfabdcc1",
"rev": "92f52b6fcb181e9604f09180fd9dd1292c5a80a3",
"type": "github"
},
"original": {
@ -1979,11 +1979,11 @@
"tuya-local-src": {
"flake": false,
"locked": {
"lastModified": 1730032580,
"narHash": "sha256-2xmcIZJyJMFVad8fYgNdzIq5nFWDtgX3iRVJRdyTlMM=",
"lastModified": 1730114795,
"narHash": "sha256-yfxd+iaPp5r/P4r9ZBBdqWg/m8VaFrMlc4aAX7NdnoQ=",
"owner": "make-all",
"repo": "tuya-local",
"rev": "b7a596f44753d5f0bacd6c27680c2f7f0bb4032a",
"rev": "2e52bf8b78c0bc0fe3338495720fa3c78e748357",
"type": "github"
},
"original": {

View file

@ -204,10 +204,10 @@
};
"return-youtube-dislikes" = buildFirefoxXpiAddon {
pname = "return-youtube-dislikes";
version = "3.0.0.17";
version = "3.0.0.18";
addonId = "{762f9885-5a13-4abd-9c77-433dcd38b8fd}";
url = "https://addons.mozilla.org/firefox/downloads/file/4342747/return_youtube_dislikes-3.0.0.17.xpi";
sha256 = "c9115baa653c22390089fd6f028c88b9ca9c56f25112ff13e497caba984df841";
url = "https://addons.mozilla.org/firefox/downloads/file/4371820/return_youtube_dislikes-3.0.0.18.xpi";
sha256 = "2d33977ce93276537543161f8e05c3612f71556840ae1eb98239284b8f8ba19e";
meta = with lib; {
description = "Returns ability to see dislike statistics on youtube";
license = licenses.gpl3;