From 5290be956bedc84c0237d15cd69d8c99fc5ec771 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Thu, 2 May 2024 16:52:24 +0100 Subject: [PATCH] style: sort packages in .nix files --- devshell.nix | 47 ++++++++++++++++++++++++----------------------- package.nix | 27 +++++++++++++-------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/devshell.nix b/devshell.nix index 19320c1..207226c 100644 --- a/devshell.nix +++ b/devshell.nix @@ -2,22 +2,22 @@ mkShell, cdrtools, curl, - lsb-release, - ncurses, git, gnugrep, gnused, jq, + lsb-release, + ncurses, nixpkgs-fmt, procps, python3, qemu, socat, + spice-gtk, swtpm, unzip, usbutils, util-linux, - wget, xdg-user-dirs, xrandr, zsync, @@ -26,26 +26,27 @@ mkShell { strictDeps = true; nativeBuildInputs = [ - cdrtools - curl - lsb-release - git - gnugrep - gnused - jq - nixpkgs-fmt - procps - python3 - qemu - socat - swtpm - unzip - usbutils - util-linux - wget - xdg-user-dirs - xrandr - zsync + cdrtools, + curl, + git, + gnugrep, + gnused, + jq, + lsb-release, + ncurses, + nixpkgs-fmt, + procps, + python3, + qemu, + socat, + spice-gtk, + swtpm, + unzip, + usbutils, + util-linux, + xdg-user-dirs, + xrandr, + zsync, ]; buildInputs = []; diff --git a/package.nix b/package.nix index 6eee34a..d9354d4 100644 --- a/package.nix +++ b/package.nix @@ -1,35 +1,34 @@ { lib , fetchFromGitHub -, stdenv +, installShellFiles , makeWrapper -, qemu +, stdenv +, testers +, cdrtools , curl , gnugrep , gnused +, jq , lsb-release , ncurses -, jq , procps , python3 -, cdrtools -, usbutils -, util-linux +, qemu , socat , spice-gtk , swtpm , unzip +, usbutils +, util-linux , xdg-user-dirs , xrandr , zsync , OVMF , OVMFFull -, quickemu -, testers -, installShellFiles }: let runtimePaths = [ - qemu + cdrtools curl gnugrep gnused @@ -38,12 +37,12 @@ let ncurses procps python3 - cdrtools - usbutils - util-linux - unzip + qemu socat swtpm + unzip + usbutils + util-linux xdg-user-dirs xrandr zsync