treewide: move packages to subdirectory

11 files changed, 32 insertions, 31 deletions

diff --git a/default.nix b/default.nix
index 576da5b..26470b5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,31 +1 @@
-{ nixpkgs ? import <nixpkgs> {}}:
-
-let
-  pkgs = nixpkgs // turrispkgs;
-  callPackage = pkgs.lib.callPackageWith pkgs;
-
-  turrispkgs = with pkgs; {
-    bootstrapHook = callPackage (
-      { makeSetupHook, autoconf, autoconf-archive, automake, gettext, libtool }:
-      makeSetupHook
-        { deps = [ autoconf autoconf-archive automake gettext libtool ]; }
-        ./build-support/bootstrap.sh
-    ) { };
-
-    logc = callPackage ./libraries/logc { };
-    logc-0_1 = callPackage ./libraries/logc {
-      pkgversion = "0.1.0";
-      pkgsha256 = "1swjzs2249wvnqx2zvxwd7d1z22kd3512xxfvq002cvgbq78ka9a";
-    };
-    logc-libs = callPackage ./libraries/logc-libs { };
-    base64c = callPackage ./libraries/base64c { };
-    paho-mqtt-c = callPackage ./libraries/paho-mqtt-c { };
-
-    sentinel-proxy = callPackage ./sentinel/proxy { };
-    sentinel-minipot = callPackage ./sentinel/minipot { };
-    sentinel-fwlogs = callPackage ./sentinel/fwlogs { };
-    sentinel-faillogs = callPackage ./sentinel/faillogs { };
-
-  };
-
-in turrispkgs
+import ./pkgs
diff --git a/build-support/bootstrap.sh b/pkgs/build-support/bootstrap.sh
index a1202cb..a1202cb 100644
--- a/build-support/bootstrap.sh
+++ b/pkgs/build-support/bootstrap.sh
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..576da5b
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,31 @@
+{ nixpkgs ? import <nixpkgs> {}}:
+
+let
+  pkgs = nixpkgs // turrispkgs;
+  callPackage = pkgs.lib.callPackageWith pkgs;
+
+  turrispkgs = with pkgs; {
+    bootstrapHook = callPackage (
+      { makeSetupHook, autoconf, autoconf-archive, automake, gettext, libtool }:
+      makeSetupHook
+        { deps = [ autoconf autoconf-archive automake gettext libtool ]; }
+        ./build-support/bootstrap.sh
+    ) { };
+
+    logc = callPackage ./libraries/logc { };
+    logc-0_1 = callPackage ./libraries/logc {
+      pkgversion = "0.1.0";
+      pkgsha256 = "1swjzs2249wvnqx2zvxwd7d1z22kd3512xxfvq002cvgbq78ka9a";
+    };
+    logc-libs = callPackage ./libraries/logc-libs { };
+    base64c = callPackage ./libraries/base64c { };
+    paho-mqtt-c = callPackage ./libraries/paho-mqtt-c { };
+
+    sentinel-proxy = callPackage ./sentinel/proxy { };
+    sentinel-minipot = callPackage ./sentinel/minipot { };
+    sentinel-fwlogs = callPackage ./sentinel/fwlogs { };
+    sentinel-faillogs = callPackage ./sentinel/faillogs { };
+
+  };
+
+in turrispkgs
diff --git a/libraries/base64c/default.nix b/pkgs/libraries/base64c/default.nix
index ec89a4b..ec89a4b 100644
--- a/libraries/base64c/default.nix
+++ b/pkgs/libraries/base64c/default.nix
diff --git a/libraries/logc-libs/default.nix b/pkgs/libraries/logc-libs/default.nix
index 1fe7a18..1fe7a18 100644
--- a/libraries/logc-libs/default.nix
+++ b/pkgs/libraries/logc-libs/default.nix
diff --git a/libraries/logc/default.nix b/pkgs/libraries/logc/default.nix
index 1c99e19..1c99e19 100644
--- a/libraries/logc/default.nix
+++ b/pkgs/libraries/logc/default.nix
diff --git a/libraries/paho-mqtt-c/default.nix b/pkgs/libraries/paho-mqtt-c/default.nix
index 07db14d..07db14d 100644
--- a/libraries/paho-mqtt-c/default.nix
+++ b/pkgs/libraries/paho-mqtt-c/default.nix
diff --git a/sentinel/faillogs/default.nix b/pkgs/sentinel/faillogs/default.nix
index d4bfa6b..d4bfa6b 100644
--- a/sentinel/faillogs/default.nix
+++ b/pkgs/sentinel/faillogs/default.nix
diff --git a/sentinel/fwlogs/default.nix b/pkgs/sentinel/fwlogs/default.nix
index c388a76..c388a76 100644
--- a/sentinel/fwlogs/default.nix
+++ b/pkgs/sentinel/fwlogs/default.nix
diff --git a/sentinel/minipot/default.nix b/pkgs/sentinel/minipot/default.nix
index 89b93f6..89b93f6 100644
--- a/sentinel/minipot/default.nix
+++ b/pkgs/sentinel/minipot/default.nix
diff --git a/sentinel/proxy/default.nix b/pkgs/sentinel/proxy/default.nix
index 5de2836..5de2836 100644
--- a/sentinel/proxy/default.nix
+++ b/pkgs/sentinel/proxy/default.nix