pkgs: Use callPackageScope wherever applicable

This should remove a lot of clutter from pkgs/default.nix into
corresponding sub-scopes, eg. pkgs/openlab/default.nix.

Apart from restructuring there is no change of runtime functionality
involved.

Tested by evaluating with "nix-env -f pkgs -qaP".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch, @sternenseemann

4 files changed, 50 insertions, 43 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8b6050c7..23e4bf98 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -41,49 +41,9 @@ let
       config = pkgs.config.vuizvui.games or null;
     };
 
-    openlab = pkgs.recurseIntoAttrs {
-      gitit = callPackage ./openlab/gitit { hlib = pkgs.haskell.lib; };
-      stackenblocken = callPackage ./openlab/stackenblocken {};
-    };
-
     aszlig = callPackageScope ./aszlig;
-
-    profpatsch = pkgs.recurseIntoAttrs {
-      display-infos = callPackage ./profpatsch/display-infos {};
-      nman = callPackage ./profpatsch/nman {};
-      warpspeed = callPackage ./profpatsch/warpspeed {
-        inherit (pkgs.haskellPackages) ghcWithPackages;
-      };
-
-      jmtpfs = pkgs.jmtpfs.override {
-        libmtp = pkgs.libmtp.overrideDerivation (old: {
-          patches = old.patches or [] ++ [
-            ./profpatsch/patches/mtp-jolla.patch
-          ];
-        });
-      };
-
-      # patched version of droopy, with javascript user-enhancement
-      droopy = pkgs.droopy.overrideDerivation (old: {
-        src = pkgs.fetchFromGitHub {
-          owner = "Profpatsch";
-          repo = "Droopy";
-          rev = "dc63d0ac9cecd74cdff84ab9ea2a5849d6953e8a";
-          sha256 = "09sms524wrnpdkhnpv9f2qbq30s8h02ljiv934g0dvmxy8571ph7";
-        };
-        installPhase = old.installPhase or "" + ''
-          mkdir -p $out/share/droopy
-          cp -r $src/static $out/share/droopy
-        '';
-        makeWrapperArgs = old.makeWrapperArgs or [] ++ [
-          "--set DROOPY_STATIC \"$out/share/droopy/static\""
-        ];
-
-      });
-    };
-    sternenseemann = pkgs.recurseIntoAttrs {
-      spacecookie = pkgs.haskellPackages.callPackage ./sternenseemann/spacecookie {};
-      logbook = pkgs.ocamlPackages_4_02.callPackage ./sternenseemann/logbook {};
-    };
+    openlab = callPackageScope ./openlab;
+    profpatsch = callPackageScope ./profpatsch;
+    sternenseemann = callPackageScope ./sternenseemann;
   };
 in pkgs // self
diff --git a/pkgs/openlab/default.nix b/pkgs/openlab/default.nix
new file mode 100644
index 00000000..328e88ed
--- /dev/null
+++ b/pkgs/openlab/default.nix
@@ -0,0 +1,6 @@
+{ callPackage, haskell }:
+
+{
+  gitit = callPackage ./gitit { hlib = haskell.lib; };
+  stackenblocken = callPackage ./stackenblocken {};
+}
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
new file mode 100644
index 00000000..d5b57628
--- /dev/null
+++ b/pkgs/profpatsch/default.nix
@@ -0,0 +1,35 @@
+{ callPackage, haskellPackages, jmtpfs, libmtp, droopy, fetchFromGitHub }:
+
+{
+  display-infos = callPackage ./display-infos {};
+  nman = callPackage ./nman {};
+  warpspeed = callPackage ./warpspeed {
+    inherit (haskellPackages) ghcWithPackages;
+  };
+
+  jmtpfs = jmtpfs.override {
+    libmtp = libmtp.overrideDerivation (old: {
+      patches = old.patches or [] ++ [
+        ./patches/mtp-jolla.patch
+      ];
+    });
+  };
+
+  # patched version of droopy, with javascript user-enhancement
+  droopy = droopy.overrideDerivation (old: {
+    src = fetchFromGitHub {
+      owner = "Profpatsch";
+      repo = "Droopy";
+      rev = "dc63d0ac9cecd74cdff84ab9ea2a5849d6953e8a";
+      sha256 = "09sms524wrnpdkhnpv9f2qbq30s8h02ljiv934g0dvmxy8571ph7";
+    };
+    installPhase = old.installPhase or "" + ''
+      mkdir -p $out/share/droopy
+      cp -r $src/static $out/share/droopy
+    '';
+    makeWrapperArgs = old.makeWrapperArgs or [] ++ [
+      "--set DROOPY_STATIC \"$out/share/droopy/static\""
+    ];
+
+  });
+}
diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix
new file mode 100644
index 00000000..a7ea47d1
--- /dev/null
+++ b/pkgs/sternenseemann/default.nix
@@ -0,0 +1,6 @@
+{ haskellPackages, ocamlPackages_4_02 }:
+
+{
+  spacecookie = haskellPackages.callPackage ./spacecookie {};
+  logbook = ocamlPackages_4_02.callPackage ./logbook {};
+}