Merge pull request #123229 from superherointj/nixpkgs-toplevel-allpackages-editorformat
top-level: refactor of all-packages to comply w/ editorconfig-checker
This commit is contained in:
commit
9b92a81723
|
@ -5145,10 +5145,9 @@ in
|
||||||
|
|
||||||
gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
|
gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
|
||||||
|
|
||||||
gnused = if !stdenv.hostPlatform.isWindows then
|
gnused = if !stdenv.hostPlatform.isWindows
|
||||||
callPackage ../tools/text/gnused { } # broken on Windows
|
then callPackage ../tools/text/gnused { } # broken on Windows
|
||||||
else
|
else gnused_422;
|
||||||
gnused_422;
|
|
||||||
# This is an easy work-around for [:space:] problems.
|
# This is an easy work-around for [:space:] problems.
|
||||||
gnused_422 = callPackage ../tools/text/gnused/422.nix { };
|
gnused_422 = callPackage ../tools/text/gnused/422.nix { };
|
||||||
|
|
||||||
|
@ -20397,9 +20396,8 @@ in
|
||||||
|
|
||||||
mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
|
mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
|
||||||
|
|
||||||
/* compiles but has to be integrated into the kernel somehow
|
# compiles but has to be integrated into the kernel somehow
|
||||||
Let's have it uncommented and finish it..
|
# Let's have it uncommented and finish it..
|
||||||
*/
|
|
||||||
ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
|
ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };
|
||||||
|
|
||||||
netatop = callPackage ../os-specific/linux/netatop { };
|
netatop = callPackage ../os-specific/linux/netatop { };
|
||||||
|
@ -20461,7 +20459,6 @@ in
|
||||||
configFile = "kernel";
|
configFile = "kernel";
|
||||||
inherit kernel;
|
inherit kernel;
|
||||||
}) zfsStable zfsUnstable;
|
}) zfsStable zfsUnstable;
|
||||||
|
|
||||||
zfs = zfsStable;
|
zfs = zfsStable;
|
||||||
|
|
||||||
can-isotp = callPackage ../os-specific/linux/can-isotp { };
|
can-isotp = callPackage ../os-specific/linux/can-isotp { };
|
||||||
|
@ -20709,7 +20706,8 @@ in
|
||||||
inherit (darwin.apple_sdk.frameworks) AppKit Security;
|
inherit (darwin.apple_sdk.frameworks) AppKit Security;
|
||||||
};
|
};
|
||||||
|
|
||||||
nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
|
nettools = if stdenv.isLinux
|
||||||
|
then callPackage ../os-specific/linux/net-tools { }
|
||||||
else unixtools.nettools;
|
else unixtools.nettools;
|
||||||
|
|
||||||
nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };
|
nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { };
|
||||||
|
@ -20909,7 +20907,8 @@ in
|
||||||
|
|
||||||
prayer = callPackage ../servers/prayer { };
|
prayer = callPackage ../servers/prayer { };
|
||||||
|
|
||||||
procps = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
|
procps = if stdenv.isLinux
|
||||||
|
then callPackage ../os-specific/linux/procps-ng { }
|
||||||
else unixtools.procps;
|
else unixtools.procps;
|
||||||
|
|
||||||
procdump = callPackage ../os-specific/linux/procdump { };
|
procdump = callPackage ../os-specific/linux/procdump { };
|
||||||
|
@ -22060,7 +22059,6 @@ in
|
||||||
ucs-fonts = callPackage ../data/fonts/ucs-fonts
|
ucs-fonts = callPackage ../data/fonts/ucs-fonts
|
||||||
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
{ inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
|
||||||
|
|
||||||
|
|
||||||
ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
|
ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
|
||||||
|
|
||||||
ultralist = callPackage ../applications/misc/ultralist { };
|
ultralist = callPackage ../applications/misc/ultralist { };
|
||||||
|
@ -25105,9 +25103,8 @@ in
|
||||||
|
|
||||||
plank = callPackage ../applications/misc/plank { };
|
plank = callPackage ../applications/misc/plank { };
|
||||||
|
|
||||||
playonlinux = callPackage ../applications/misc/playonlinux {
|
playonlinux = callPackage ../applications/misc/playonlinux
|
||||||
stdenv = stdenv_32bit;
|
{ stdenv = stdenv_32bit; };
|
||||||
};
|
|
||||||
|
|
||||||
pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
|
pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
|
||||||
|
|
||||||
|
@ -29444,8 +29441,8 @@ in
|
||||||
elan = callPackage ../applications/science/logic/elan {};
|
elan = callPackage ../applications/science/logic/elan {};
|
||||||
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
|
mathlibtools = with python3Packages; toPythonApplication mathlibtools;
|
||||||
|
|
||||||
leo2 = callPackage ../applications/science/logic/leo2 {
|
leo2 = callPackage ../applications/science/logic/leo2
|
||||||
ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;};
|
{ ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml; };
|
||||||
|
|
||||||
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};
|
leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix {};
|
||||||
|
|
||||||
|
@ -30241,7 +30238,8 @@ in
|
||||||
|
|
||||||
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
|
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
|
||||||
|
|
||||||
/* Evaluate a NixOS configuration using this evaluation of Nixpkgs.
|
/*
|
||||||
|
Evaluate a NixOS configuration using this evaluation of Nixpkgs.
|
||||||
|
|
||||||
With this function you can write, for example, a package that
|
With this function you can write, for example, a package that
|
||||||
depends on a custom virtual machine image.
|
depends on a custom virtual machine image.
|
||||||
|
|
Loading…
Reference in a new issue