steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

format and change

Browse source
This commit is contained in:
steveej 2023-02-07 18:23:51 +01:00
parent 882ff4e5e9
commit 28c116337c
181 changed files with 2748 additions and 2578 deletions
Download patch file Download diff file Expand all files Collapse all files

28
nix/overlays/overrides.nix
View file

@ -1,16 +1,12 @@
# This overlay is used for overriding upstream packages.
self: super:
let
self: super: let
sources = import ../../nix/sources.nix;
nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
nixpkgs-master = import <nixpkgs-master> {inherit (super) config;};
nixpkgs-unstable =
import <channels-nixos-unstable> { inherit (super) config; };
import <channels-nixos-unstable> {inherit (super) config;};
pr-holochain-launcher-bin =
import sources.pr-holochain-launcher-bin { inherit (super) config; };
import sources.pr-holochain-launcher-bin {inherit (super) config;};
in {
inherit nixpkgs-master;
inherit nixpkgs-unstable;
@ -18,7 +14,7 @@ in {
# alacritty = nixpkgs-master.alacritty;
alacritty = super.stdenv.mkDerivation {
name = "alacritty-custom";
buildInputs = [ super.makeWrapper ];
buildInputs = [super.makeWrapper];
phases = "installPhase";
installPhase = ''
makeWrapper ${super.alacritty}/bin/alacritty $out/bin/alacritty \
@ -27,13 +23,13 @@ in {
};
qtile = super.qtile.overrideAttrs (oldAttrs: {
propagatedBuildInputs = oldAttrs.passthru.unwrapped.propagatedBuildInputs
++ (with self.python3Packages;
[
# python-wifi
# iwlib
keyring
]);
propagatedBuildInputs =
oldAttrs.passthru.unwrapped.propagatedBuildInputs
++ (with self.python3Packages; [
# python-wifi
# iwlib
keyring
]);
});
inherit (pr-holochain-launcher-bin) holochain-launcher;