chore: format with alejandra

This commit is contained in:
steveej 2023-02-07 18:24:28 +01:00
parent 05f0cbdfb4
commit 89f5f65f2d
181 changed files with 2720 additions and 2560 deletions

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;

View file

@ -2,17 +2,13 @@
# The code is copied from the NUR repository [0].
#
# [0]: https://github.com/nix-community/nur-packages-template/blob/2610a5b60bd926cea3e6395511da8f0d14c613b9/overlay.nix
self: super:
let
self: super: let
isReserved = n: n == "lib" || n == "overlays" || n == "modules";
nameValuePair = n: v: {
name = n;
value = v;
};
nurAttrs = import ../pkgs { pkgs = super; };
in builtins.listToAttrs (map (n: nameValuePair n nurAttrs.${n})
(builtins.filter (n: !isReserved n) (builtins.attrNames nurAttrs)))
nurAttrs = import ../pkgs {pkgs = super;};
in
builtins.listToAttrs (map (n: nameValuePair n nurAttrs.${n})
(builtins.filter (n: !isReserved n) (builtins.attrNames nurAttrs)))

View file

@ -1,7 +1,5 @@
self: super:
let
nixpkgs-master = import <nixpkgs-master> { };
self: super: let
nixpkgs-master = import <nixpkgs-master> {};
inherit (nixpkgs-master) crun;
crun_10_6_0 = crun.overrideAttrs (oldAttrs: rec {
@ -12,8 +10,7 @@ let
sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1";
};
});
in {
inherit (nixpkgs-master) podman conmon slirp4netns;
posh = self.callPackage ../pkgs/posh.nix { };
posh = self.callPackage ../pkgs/posh.nix {};
}