all: apply nixpkgs-fmt

This commit is contained in:
xeals 2022-10-26 10:50:59 +11:00
parent 46b331a413
commit a70a0e914b
Signed by: xeals
GPG Key ID: A498C7AF27EC6B5C
6 changed files with 68 additions and 50 deletions

View File

@ -21,9 +21,10 @@ let
]; ];
}; };
generateCommon = lib.makeOverridable ({ generateCommon = lib.makeOverridable (
common ? ./manual-common-packages.nix { common ? ./manual-common-packages.nix
}: let }:
let
imported = import common { imported = import common {
inherit (self) callPackage; inherit (self) callPackage;
@ -35,7 +36,10 @@ let
jetbrainsPlugins = super // overrides; jetbrainsPlugins = super // overrides;
in jetbrainsPlugins // { inherit commonBuild; }); in
jetbrainsPlugins // { inherit commonBuild; }
);
in generateCommon { } in
generateCommon { }

View File

@ -9,9 +9,10 @@ let
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ]; jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
}; };
generateIdea = lib.makeOverridable ({ generateIdea = lib.makeOverridable (
idea ? ./manual-idea-packages.nix { idea ? ./manual-idea-packages.nix
}: let }:
let
imported = import idea { imported = import idea {
inherit (self) callPackage; inherit (self) callPackage;
@ -23,7 +24,10 @@ let
ideaPlugins = super // overrides; ideaPlugins = super // overrides;
in ideaPlugins // { inherit ideaBuild; }); in
ideaPlugins // { inherit ideaBuild; }
);
in generateIdea { } in
generateIdea { }

View File

@ -5,12 +5,19 @@
, python3Packages , python3Packages
, lame , lame
, aacSupport ? false, faac , aacSupport ? false
, alacSupport ? false, libav , faac
, flacSupport ? false, flac , alacSupport ? false
, m4aSupport ? false, mp4Support ? false, fdk-aac-encoder , libav
, oggSupport ? false, vorbisTools , flacSupport ? false
, opusSupport ? false, opusTools , flac
, m4aSupport ? false
, mp4Support ? false
, fdk-aac-encoder
, oggSupport ? false
, vorbisTools
, opusSupport ? false
, opusTools
}: }:
assert aacSupport -> faac.meta.available; assert aacSupport -> faac.meta.available;

View File

@ -3,7 +3,8 @@
, fetchFromGitHub , fetchFromGitHub
, python3 , python3
, ffmpeg }: , ffmpeg
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ytarchive"; pname = "ytarchive";

View File

@ -20,8 +20,9 @@ let
inherit lib; inherit lib;
}; };
in lib.makeScope newScope (self: lib.makeOverridable ({ in
jetbrainsPlugins ? mkJetbrainsPlugins self lib.makeScope newScope (self: lib.makeOverridable
({ jetbrainsPlugins ? mkJetbrainsPlugins self
, ideaPlugins ? mkIdeaPlugins self , ideaPlugins ? mkIdeaPlugins self
}: ({ } }: ({ }
// jetbrainsPlugins // { inherit jetbrainsPlugins; } // jetbrainsPlugins // { inherit jetbrainsPlugins; }
@ -30,4 +31,5 @@ in lib.makeScope newScope (self: lib.makeOverridable ({
inherit variant; inherit variant;
jetbrainsWithPlugins = jetbrainsWithPlugins self variant; jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
}) })
) { }) )
{ })