colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

lift pkg patching out of the toplevel machine definitions

Browse Source
This commit is contained in:
colin 2022-05-21 00:23:29 -07:00
parent e252f8623c
commit 298e7bc8ec
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
flake.nix
View File

@ -24,32 +24,7 @@
};
outputs = { self, nixpkgs, pkgs-gitea, pkgs-mobile, mobile-nixos, home-manager }: {
nixosConfigurations.uninsane = nixpkgs.lib.nixosSystem {
pkgs = import nixpkgs {
system = "aarch64-linux";
config.allowUnfree = true;
overlays = [
(self: super: {
pkgs-gitea.system = "aarch64-linux"; # extraneous?
#### customized packages
# nixos-unstable pleroma is too far out-of-date for our db
pleroma = super.callPackage ./pkgs/pleroma { };
# jackett doesn't allow customization of the bind address: this will probably always be here.
jackett = self.callPackage ./pkgs/jackett { pkgs = super; };
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
# systemd = import ./pkgs/systemd { pkgs = super; };
#### nixos-unstable packages
# gitea: 1.16.5 contains a fix which makes manual user approval *actually* work.
# https://github.com/go-gitea/gitea/pull/19119
# safe to remove after 1.16.5 (or 1.16.7 if we need db compat?)
gitea = pkgs-gitea.legacyPackages.aarch64-linux.gitea;
# try a newer rpi4 u-boot
# ubootRaspberryPi4_64bit = pkgs.unstable.ubootRaspberryPi4_64bit;
ubootRaspberryPi4_64bit = self.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = super; };
})
];
};
pkgs = self.packages.aarch_64-linux.pkgs;
system = "aarch64-linux";
modules = [
./configuration.nix
@ -116,7 +91,31 @@
};
packages = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all (system:
{
pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [
(self: super: {
#### customized packages
# nixos-unstable pleroma is too far out-of-date for our db
pleroma = super.callPackage ./pkgs/pleroma { };
# jackett doesn't allow customization of the bind address: this will probably always be here.
jackett = self.callPackage ./pkgs/jackett { pkgs = super; };
# fix abrupt HDD poweroffs as during reboot. patching systemd requires rebuilding nearly every package.
# systemd = import ./pkgs/systemd { pkgs = super; };
#### nixos-unstable packages
# gitea: 1.16.5 contains a fix which makes manual user approval *actually* work.
# https://github.com/go-gitea/gitea/pull/19119
# safe to remove after 1.16.5 (or 1.16.7 if we need db compat?)
gitea = pkgs-gitea.legacyPackages."${system}".gitea;
# patch rpi uboot with something that fixes USB HDD boot
ubootRaspberryPi4_64bit = self.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = super; };
})
];
};
}
);