From d7ac88762db111a7962c4e14b5f4e37ab85ccac7 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 24 Aug 2025 18:55:06 -0600 Subject: tree-wide: reformat using alejandra after enabling trivionomicon --- pkgs/default.nix | 118 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 58 deletions(-) (limited to 'pkgs/default.nix') diff --git a/pkgs/default.nix b/pkgs/default.nix index 82927a4..93d34b8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,31 +1,30 @@ final: prev: with prev.lib; let inherit (final) callPackage fetchpatch; -in -{ - lib = callPackage ./lib { }; +in { + lib = callPackage ./lib {}; - athena-bccr = callPackage ./athena-bccr { }; - btclone = callPackage ./btclone { }; - gem5 = callPackage ./gem5.nix { gem5ISA = "x86"; }; - git-aliases = callPackage ./git-aliases.nix { }; - increment-zone-serials = callPackage ./increment-zone-serials { }; - kbuild-standalone = callPackage ./kbuild-standalone.nix { }; - mssql-tools = callPackage ./mssql-tools.nix { }; - oregano = callPackage ./oregano { }; - pass-bcr = callPackage ./pass-bcr { }; - pass-tail = callPackage ./pass-tail { }; - rqlite = callPackage ./rqlite.nix { }; - rv8 = callPackage ./rv8.nix { }; - scripts = callPackage ./scripts { }; - simple-scalar = callPackage ./simple-scalar { }; - spliit = callPackage ./spliit { }; - tmux-lift = callPackage ./tmux-lift { }; - tmux-open = callPackage ./tmux-open { }; - tmux-pass = callPackage ./tmux-pass.nix { }; + athena-bccr = callPackage ./athena-bccr {}; + btclone = callPackage ./btclone {}; + gem5 = callPackage ./gem5.nix {gem5ISA = "x86";}; + git-aliases = callPackage ./git-aliases.nix {}; + increment-zone-serials = callPackage ./increment-zone-serials {}; + kbuild-standalone = callPackage ./kbuild-standalone.nix {}; + mssql-tools = callPackage ./mssql-tools.nix {}; + oregano = callPackage ./oregano {}; + pass-bcr = callPackage ./pass-bcr {}; + pass-tail = callPackage ./pass-tail {}; + rqlite = callPackage ./rqlite.nix {}; + rv8 = callPackage ./rv8.nix {}; + scripts = callPackage ./scripts {}; + simple-scalar = callPackage ./simple-scalar {}; + spliit = callPackage ./spliit {}; + tmux-lift = callPackage ./tmux-lift {}; + tmux-open = callPackage ./tmux-open {}; + tmux-pass = callPackage ./tmux-pass.nix {}; st = prev.st.override { - conf = import ./st.nix { }; + conf = import ./st.nix {}; patches = [ (fetchpatch { @@ -35,55 +34,58 @@ in ]; }; - override = { - home-assistant-custom-components = prev.home-assistant-custom-components // { - dreame_vacuum = final.home-assistant.python.pkgs.callPackage ./dreame-vacuum.nix { }; - smartthinq_sensors = final.home-assistant.python.pkgs.callPackage ./smartthinq-sensors.nix { }; - }; + override = + { + home-assistant-custom-components = + prev.home-assistant-custom-components + // { + dreame_vacuum = final.home-assistant.python.pkgs.callPackage ./dreame-vacuum.nix {}; + smartthinq_sensors = final.home-assistant.python.pkgs.callPackage ./smartthinq-sensors.nix {}; + }; - home-assistant-custom-lovelace-modules = prev.home-assistant-custom-lovelace-modules // { - xiaomi-vacuum-map-card = final.callPackage ./lovelace-xiaomi-vacuum-map-card { }; - }; + home-assistant-custom-lovelace-modules = + prev.home-assistant-custom-lovelace-modules + // { + xiaomi-vacuum-map-card = final.callPackage ./lovelace-xiaomi-vacuum-map-card {}; + }; - # Tomado de all-packages.nix - msmtp = callPackage ./msmtp { - inherit (final.darwin.apple_sdk.frameworks) Security; - autoreconfHook = final.buildPackages.autoreconfHook269; - }; + # Tomado de all-packages.nix + msmtp = callPackage ./msmtp { + inherit (final.darwin.apple_sdk.frameworks) Security; + autoreconfHook = final.buildPackages.autoreconfHook269; + }; - postfix = callPackage ./postfix { inherit (prev) postfix; }; - xandikos = final.python3Packages.callPackage ./xandikos { inherit (prev) xandikos; }; - } // ( - let - makePyOverrides = version: - let + postfix = callPackage ./postfix {inherit (prev) postfix;}; + xandikos = final.python3Packages.callPackage ./xandikos {inherit (prev) xandikos;}; + } + // ( + let + makePyOverrides = version: let name = "python3${toString version}"; - in - { + in { inherit name; value = prev.${name}.override { packageOverrides = nextPy: prevPy: { - cocotb = nextPy.callPackage ./cocotb { inherit (prevPy) cocotb; }; - cocotbext-wishbone = nextPy.callPackage ./cocotb/exts/wishbone.nix { }; - find-libpython = nextPy.callPackage ./find-libpython.nix { }; - hdl-convertor = nextPy.callPackage ./hdl-convertor { }; - hdl-convertor-ast = nextPy.callPackage ./hdl-convertor/ast.nix { }; - iced-x86 = nextPy.callPackage ./iced-x86 { }; + cocotb = nextPy.callPackage ./cocotb {inherit (prevPy) cocotb;}; + cocotbext-wishbone = nextPy.callPackage ./cocotb/exts/wishbone.nix {}; + find-libpython = nextPy.callPackage ./find-libpython.nix {}; + hdl-convertor = nextPy.callPackage ./hdl-convertor {}; + hdl-convertor-ast = nextPy.callPackage ./hdl-convertor/ast.nix {}; + iced-x86 = nextPy.callPackage ./iced-x86 {}; }; }; }; - pyVersionRange' = start: end: - let + pyVersionRange' = start: end: let next = end + 1; in - if prev ? "python3${toString next}" - then pyVersionRange' start next - else range start end; + if prev ? "python3${toString next}" + then pyVersionRange' start next + else range start end; - pyVersionRange = start: pyVersionRange' start start; - in - listToAttrs (map makePyOverrides (pyVersionRange 9)) - ); + pyVersionRange = start: pyVersionRange' start start; + in + listToAttrs (map makePyOverrides (pyVersionRange 9)) + ); } -- cgit v1.2.3