.config/nixpkgs: default.nix -> package.nix

23 files changed, 22 insertions, 22 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index 5cc74db..5a1ffa3 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -68,11 +68,11 @@ in
     Terminal = pkgs.buildEnv {
       name = "terminal";
       paths = [
-        (callPackage ./packages/chromexup/default.nix { })
-        (callPackage ./packages/emacs-batch-indent/default.nix { })
-        (callPackage ./packages/pdf2htmlex/default.nix { })
-        (callPackage ./packages/rxvt-unicode/default.nix { })
-        (callPackage ./packages/systemd2nix/default.nix { })
+        (callPackage ./packages/chromexup/package.nix { })
+        (callPackage ./packages/emacs-batch-indent/package.nix { })
+        (callPackage ./packages/pdf2htmlex/package.nix { })
+        (callPackage ./packages/rxvt-unicode/package.nix { })
+        (callPackage ./packages/systemd2nix/package.nix { })
         (pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ]))
         unstable.hugo
         unstable.piper-tts
@@ -179,10 +179,10 @@ in
     Graphical = pkgs.buildEnv {
       name = "graphical";
       paths = [
-        (callPackage ./packages/boomer/default.nix { })
-        (callPackage ./packages/dmenu/default.nix { })
-        (callPackage ./packages/rofi/default.nix { })
-        (callPackage ./packages/sowon/default.nix { })
+        (callPackage ./packages/boomer/package.nix { })
+        (callPackage ./packages/dmenu/package.nix { })
+        (callPackage ./packages/rofi/package.nix { })
+        (callPackage ./packages/sowon/package.nix { })
         (mplayer.override { v4lSupport = true; })
         previous.recoll
         unstable.firefox
@@ -255,8 +255,8 @@ in
     Emulators = pkgs.buildEnv {
       name = "emulators";
       paths = [
-        (callPackage ./packages/ntrviewer/default.nix { })
-        (callPackage ./packages/tiemu/default.nix { })
+        (callPackage ./packages/ntrviewer/package.nix { })
+        (callPackage ./packages/tiemu/package.nix { })
         desmume
         mgba
       ];
@@ -298,7 +298,7 @@ in
     Wayland = pkgs.buildEnv {
       name = "wayland";
       paths = [
-        (callPackage ./packages/wf-shell/default.nix { })
+        (callPackage ./packages/wf-shell/package.nix { })
         wayfire
         weston
         wev
@@ -339,7 +339,7 @@ in
     Fonts = pkgs.buildEnv {
       name = "fonts";
       paths = [
-        (callPackage ./packages/nerdfonts-dejavu-sans-mono/default.nix { })
+        (callPackage ./packages/nerdfonts-dejavu-sans-mono/package.nix { })
         cm_unicode
         cooper-hewitt
         corefonts
@@ -396,7 +396,7 @@ in
     Audio = pkgs.buildEnv {
       name = "audio";
       paths = [
-        (callPackage ./packages/qprompt/default.nix { })
+        (callPackage ./packages/qprompt/package.nix { })
         ardour
         pulseeffects-pw
         pulsemixer
@@ -413,8 +413,8 @@ in
     Android = pkgs.buildEnv {
       name = "android";
       paths = [
-        (callPackage ./packages/mkbootfs/default.nix { })
-        (callPackage ./packages/mkbootimg/default.nix { })
+        (callPackage ./packages/mkbootfs/package.nix { })
+        (callPackage ./packages/mkbootimg/package.nix { })
         edl
         abootimg
       ];
@@ -465,7 +465,7 @@ in
             xdebug.start_with_request=yes
           '';
         })
-        (callPackage ./packages/phar-composer/default.nix { })
+        (callPackage ./packages/phar-composer/package.nix { })
         graphviz
         kcachegrind
         phpPackages.composer
@@ -479,7 +479,7 @@ in
     Lua = pkgs.buildEnv {
       name = "lua";
       paths = [
-        (callPackage ./packages/redbean/default.nix { })
+        (callPackage ./packages/redbean/package.nix { })
         lua
         luaPackages.luacheck
         luaformatter
@@ -568,13 +568,13 @@ in
 
     HTTP = pkgs.buildEnv {
       name = "http";
-      paths = [ caddy apacheHttpd ];
+      paths = [ caddy apacheHttpd httpie ];
     };
 
     CSS = pkgs.buildEnv {
       name = "css";
       paths = [
-        (previous.callPackage ./packages/csstidy/default.nix { })
+        (previous.callPackage ./packages/csstidy/package.nix { })
         nodePackages.stylelint
         csslint
         sassc
@@ -597,8 +597,8 @@ in
     YAML = pkgs.buildEnv {
       name = "yaml";
       paths = [
-        (previous.callPackage ./packages/yaml2nix/default.nix { })
-        (callPackage ./packages/ruamel.yaml.cmd/default.nix { })
+        (previous.callPackage ./packages/yaml2nix/package.nix { })
+        (callPackage ./packages/ruamel.yaml.cmd/package.nix { })
         python39Packages.yamllint
         yj
       ];
diff --git a/.config/nixpkgs/packages/boomer/default.nix b/.config/nixpkgs/packages/boomer/package.nix
index 885de27..885de27 100644
--- a/.config/nixpkgs/packages/boomer/default.nix
+++ b/.config/nixpkgs/packages/boomer/package.nix
diff --git a/.config/nixpkgs/packages/chromexup/default.nix b/.config/nixpkgs/packages/chromexup/package.nix
index c6c4622..c6c4622 100644
--- a/.config/nixpkgs/packages/chromexup/default.nix
+++ b/.config/nixpkgs/packages/chromexup/package.nix
diff --git a/.config/nixpkgs/packages/csstidy/default.nix b/.config/nixpkgs/packages/csstidy/package.nix
index 5ccf7ff..5ccf7ff 100644
--- a/.config/nixpkgs/packages/csstidy/default.nix
+++ b/.config/nixpkgs/packages/csstidy/package.nix
diff --git a/.config/nixpkgs/packages/dmenu/default.nix b/.config/nixpkgs/packages/dmenu/package.nix
index f0f933c..f0f933c 100644
--- a/.config/nixpkgs/packages/dmenu/default.nix
+++ b/.config/nixpkgs/packages/dmenu/package.nix
diff --git a/.config/nixpkgs/packages/emacs-batch-indent/default.nix b/.config/nixpkgs/packages/emacs-batch-indent/package.nix
index 92042af..92042af 100644
--- a/.config/nixpkgs/packages/emacs-batch-indent/default.nix
+++ b/.config/nixpkgs/packages/emacs-batch-indent/package.nix
diff --git a/.config/nixpkgs/packages/mkbootfs/default.nix b/.config/nixpkgs/packages/mkbootfs/package.nix
index b8c6050..b8c6050 100644
--- a/.config/nixpkgs/packages/mkbootfs/default.nix
+++ b/.config/nixpkgs/packages/mkbootfs/package.nix
diff --git a/.config/nixpkgs/packages/mkbootimg/default.nix b/.config/nixpkgs/packages/mkbootimg/package.nix
index 738fd33..738fd33 100644
--- a/.config/nixpkgs/packages/mkbootimg/default.nix
+++ b/.config/nixpkgs/packages/mkbootimg/package.nix
diff --git a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/package.nix
index 866a6af..866a6af 100644
--- a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix
+++ b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/package.nix
diff --git a/.config/nixpkgs/packages/nixpkgs.lib/default.nix b/.config/nixpkgs/packages/nixpkgs.lib/package.nix
index 6f5c4e8..6f5c4e8 100644
--- a/.config/nixpkgs/packages/nixpkgs.lib/default.nix
+++ b/.config/nixpkgs/packages/nixpkgs.lib/package.nix
diff --git a/.config/nixpkgs/packages/ntrviewer/default.nix b/.config/nixpkgs/packages/ntrviewer/package.nix
index af155bf..af155bf 100644
--- a/.config/nixpkgs/packages/ntrviewer/default.nix
+++ b/.config/nixpkgs/packages/ntrviewer/package.nix
diff --git a/.config/nixpkgs/packages/pdf2htmlex/default.nix b/.config/nixpkgs/packages/pdf2htmlex/package.nix
index 82021ef..82021ef 100644
--- a/.config/nixpkgs/packages/pdf2htmlex/default.nix
+++ b/.config/nixpkgs/packages/pdf2htmlex/package.nix
diff --git a/.config/nixpkgs/packages/phar-composer/default.nix b/.config/nixpkgs/packages/phar-composer/package.nix
index 79ee71b..79ee71b 100644
--- a/.config/nixpkgs/packages/phar-composer/default.nix
+++ b/.config/nixpkgs/packages/phar-composer/package.nix
diff --git a/.config/nixpkgs/packages/qprompt/default.nix b/.config/nixpkgs/packages/qprompt/package.nix
index 67a4c83..67a4c83 100644
--- a/.config/nixpkgs/packages/qprompt/default.nix
+++ b/.config/nixpkgs/packages/qprompt/package.nix
diff --git a/.config/nixpkgs/packages/redbean/default.nix b/.config/nixpkgs/packages/redbean/package.nix
index 7ede4c6..7ede4c6 100644
--- a/.config/nixpkgs/packages/redbean/default.nix
+++ b/.config/nixpkgs/packages/redbean/package.nix
diff --git a/.config/nixpkgs/packages/rofi/default.nix b/.config/nixpkgs/packages/rofi/package.nix
index 420d2d2..420d2d2 100644
--- a/.config/nixpkgs/packages/rofi/default.nix
+++ b/.config/nixpkgs/packages/rofi/package.nix
diff --git a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix b/.config/nixpkgs/packages/ruamel.yaml.cmd/package.nix
index 362b4bd..362b4bd 100644
--- a/.config/nixpkgs/packages/ruamel.yaml.cmd/default.nix
+++ b/.config/nixpkgs/packages/ruamel.yaml.cmd/package.nix
diff --git a/.config/nixpkgs/packages/rxvt-unicode/default.nix b/.config/nixpkgs/packages/rxvt-unicode/package.nix
index dd3540c..dd3540c 100644
--- a/.config/nixpkgs/packages/rxvt-unicode/default.nix
+++ b/.config/nixpkgs/packages/rxvt-unicode/package.nix
diff --git a/.config/nixpkgs/packages/sowon/default.nix b/.config/nixpkgs/packages/sowon/package.nix
index 38d06b0..38d06b0 100644
--- a/.config/nixpkgs/packages/sowon/default.nix
+++ b/.config/nixpkgs/packages/sowon/package.nix
diff --git a/.config/nixpkgs/packages/systemd2nix/default.nix b/.config/nixpkgs/packages/systemd2nix/package.nix
index b4c6103..b4c6103 100644
--- a/.config/nixpkgs/packages/systemd2nix/default.nix
+++ b/.config/nixpkgs/packages/systemd2nix/package.nix
diff --git a/.config/nixpkgs/packages/tiemu/default.nix b/.config/nixpkgs/packages/tiemu/package.nix
index f703981..f703981 100644
--- a/.config/nixpkgs/packages/tiemu/default.nix
+++ b/.config/nixpkgs/packages/tiemu/package.nix
diff --git a/.config/nixpkgs/packages/wf-shell/default.nix b/.config/nixpkgs/packages/wf-shell/package.nix
index 46448b9..46448b9 100644
--- a/.config/nixpkgs/packages/wf-shell/default.nix
+++ b/.config/nixpkgs/packages/wf-shell/package.nix
diff --git a/.config/nixpkgs/packages/yaml2nix/default.nix b/.config/nixpkgs/packages/yaml2nix/package.nix
index af4ae38..af4ae38 100644
--- a/.config/nixpkgs/packages/yaml2nix/default.nix
+++ b/.config/nixpkgs/packages/yaml2nix/package.nix