pkgs: update top-level attributes from custom library and reformat

This commit is contained in:
Gabriel Arazas 2024-11-17 13:15:12 +08:00
parent fff37df39f
commit 78231a5df2
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360

View File

@ -1,15 +1,13 @@
{ pkgs ? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { } }:
let let inherit (pkgs) lib callPackage python3Packages qt5;
inherit (pkgs) lib callPackage python3Packages qt5; in lib.makeScope pkgs.newScope (self: {
in
lib.makeScope pkgs.newScope (self: {
# My custom nixpkgs extensions. # My custom nixpkgs extensions.
foodogsquaredLib = import ../lib { inherit pkgs; }; foodogsquaredLib = import ../lib { inherit pkgs; };
inherit (self.foodogsquaredLib.builders) inherit (self.foodogsquaredLib.builders)
makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry
buildHugoSite buildFDSEnv; buildHugoSite buildFDSEnv;
inherit (self.foodogsquaredLib.fetchers) fetchInternetArchive; inherit (self.foodogsquaredLib.fetchers) fetchInternetArchive fetchUgeeDriver;
# My custom packages. # My custom packages.
awesome-cli = callPackage ./awesome-cli { }; awesome-cli = callPackage ./awesome-cli { };
@ -34,12 +32,16 @@ lib.makeScope pkgs.newScope (self: {
mopidy-internetarchive = callPackage ./mopidy-internetarchive.nix { }; mopidy-internetarchive = callPackage ./mopidy-internetarchive.nix { };
mopidy-listenbrainz = callPackage ./mopidy-listenbrainz { }; mopidy-listenbrainz = callPackage ./mopidy-listenbrainz { };
nautilus-annotations = callPackage ./nautilus-annotations { }; nautilus-annotations = callPackage ./nautilus-annotations { };
pop-launcher-plugin-brightness = callPackage ./pop-launcher-plugin-brightness { }; pop-launcher-plugin-brightness =
callPackage ./pop-launcher-plugin-brightness { };
pop-launcher-plugin-duckduckgo-bangs = pop-launcher-plugin-duckduckgo-bangs =
callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { }; callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { };
pop-launcher-plugin-jetbrains = callPackage ./pop-launcher-plugin-jetbrains { }; pop-launcher-plugin-jetbrains =
callPackage ./pop-launcher-plugin-jetbrains { };
pigeon-mail = callPackage ./pigeon-mail { }; pigeon-mail = callPackage ./pigeon-mail { };
swh = callPackage ./software-heritage { python3Packages = pkgs.python310Packages; }; swh = callPackage ./software-heritage {
python3Packages = pkgs.python310Packages;
};
speki = callPackage ./speki { }; speki = callPackage ./speki { };
tic-80 = callPackage ./tic-80 { }; tic-80 = callPackage ./tic-80 { };
smile = callPackage ./smile { }; smile = callPackage ./smile { };