From 84f0497e53f012ea5bec827f4df1a3e07d874b2e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 2 May 2023 13:57:27 +0100 Subject: [PATCH] Move packages to /packages --- flake.nix | 28 +++++++++++-------- .../fontconfig_actor}/default.nix | 0 .../libnotify_actor}/default.nix | 0 .../preserves-nim}/default.nix | 0 .../preserves-py}/default.nix | 0 .../preserves-tools}/default.nix | 0 {squeak => packages/squeak}/default.nix | 0 {squeaker => packages/squeaker}/default.nix | 0 .../syndicate-nim}/default.nix | 0 .../syndicate-py}/default.nix | 0 .../syndicate-server}/default.nix | 0 .../syndicate_utils-nim}/default.nix | 0 .../xdg_open_ng}/default.nix | 0 13 files changed, 16 insertions(+), 12 deletions(-) rename {fontconfig_actor => packages/fontconfig_actor}/default.nix (100%) rename {libnotify_actor => packages/libnotify_actor}/default.nix (100%) rename {preserves-nim => packages/preserves-nim}/default.nix (100%) rename {preserves-py => packages/preserves-py}/default.nix (100%) rename {preserves-tools => packages/preserves-tools}/default.nix (100%) rename {squeak => packages/squeak}/default.nix (100%) rename {squeaker => packages/squeaker}/default.nix (100%) rename {syndicate-nim => packages/syndicate-nim}/default.nix (100%) rename {syndicate-py => packages/syndicate-py}/default.nix (100%) rename {syndicate-server => packages/syndicate-server}/default.nix (100%) rename {syndicate_utils-nim => packages/syndicate_utils-nim}/default.nix (100%) rename {xdg_open_ng => packages/xdg_open_ng}/default.nix (100%) diff --git a/flake.nix b/flake.nix index aa63e7f..83464b4 100644 --- a/flake.nix +++ b/flake.nix @@ -17,31 +17,35 @@ in { inherit (self) lib; - fontconfig_actor = final.nimPackages.callPackage ./fontconfig_actor { }; + fontconfig_actor = + final.nimPackages.callPackage ./packages/fontconfig_actor { }; - libnotify_actor = final.nimPackages.callPackage ./libnotify_actor { }; + libnotify_actor = + final.nimPackages.callPackage ./packages/libnotify_actor { }; nimPackages = prev.nimPackages.overrideScope' (final': prev': { - preserves = final'.callPackage ./preserves-nim { }; - syndicate = final'.callPackage ./syndicate-nim { }; - syndicate_utils = final'.callPackage ./syndicate_utils-nim { }; - xdg_open_ng = final'.callPackage ./xdg_open_ng { }; + preserves = final'.callPackage ./packages/preserves-nim { }; + syndicate = final'.callPackage ./packages/syndicate-nim { }; + syndicate_utils = + final'.callPackage ./packages/syndicate_utils-nim { }; + xdg_open_ng = final'.callPackage ./packages/xdg_open_ng { }; }); python3Packages = prev.python3Packages.override { overrides = final': prev': { - preserves = final'.callPackage ./preserves-py { }; - syndicate = final'.callPackage ./syndicate-py { }; + preserves = final'.callPackage ./packages/preserves-py { }; + syndicate = final'.callPackage ./packages/syndicate-py { }; }; }; - preserves-tools = final.callPackage ./preserves-tools { rust = rust'; }; + preserves-tools = + final.callPackage ./packages/preserves-tools { rust = rust'; }; - squeak = final.callPackage ./squeak { }; - squeaker = final.python3Packages.callPackage ./squeaker { }; + squeak = final.callPackage ./packages/squeak { }; + squeaker = final.python3Packages.callPackage ./packages/squeaker { }; syndicate-server = - final.callPackage ./syndicate-server { rust = rust'; }; + final.callPackage ./packages/syndicate-server { rust = rust'; }; }; legacyPackages = diff --git a/fontconfig_actor/default.nix b/packages/fontconfig_actor/default.nix similarity index 100% rename from fontconfig_actor/default.nix rename to packages/fontconfig_actor/default.nix diff --git a/libnotify_actor/default.nix b/packages/libnotify_actor/default.nix similarity index 100% rename from libnotify_actor/default.nix rename to packages/libnotify_actor/default.nix diff --git a/preserves-nim/default.nix b/packages/preserves-nim/default.nix similarity index 100% rename from preserves-nim/default.nix rename to packages/preserves-nim/default.nix diff --git a/preserves-py/default.nix b/packages/preserves-py/default.nix similarity index 100% rename from preserves-py/default.nix rename to packages/preserves-py/default.nix diff --git a/preserves-tools/default.nix b/packages/preserves-tools/default.nix similarity index 100% rename from preserves-tools/default.nix rename to packages/preserves-tools/default.nix diff --git a/squeak/default.nix b/packages/squeak/default.nix similarity index 100% rename from squeak/default.nix rename to packages/squeak/default.nix diff --git a/squeaker/default.nix b/packages/squeaker/default.nix similarity index 100% rename from squeaker/default.nix rename to packages/squeaker/default.nix diff --git a/syndicate-nim/default.nix b/packages/syndicate-nim/default.nix similarity index 100% rename from syndicate-nim/default.nix rename to packages/syndicate-nim/default.nix diff --git a/syndicate-py/default.nix b/packages/syndicate-py/default.nix similarity index 100% rename from syndicate-py/default.nix rename to packages/syndicate-py/default.nix diff --git a/syndicate-server/default.nix b/packages/syndicate-server/default.nix similarity index 100% rename from syndicate-server/default.nix rename to packages/syndicate-server/default.nix diff --git a/syndicate_utils-nim/default.nix b/packages/syndicate_utils-nim/default.nix similarity index 100% rename from syndicate_utils-nim/default.nix rename to packages/syndicate_utils-nim/default.nix diff --git a/xdg_open_ng/default.nix b/packages/xdg_open_ng/default.nix similarity index 100% rename from xdg_open_ng/default.nix rename to packages/xdg_open_ng/default.nix