2 files changed, 16 insertions, 9 deletions

diff --git a/custom/bar-service.nix b/custom/bar-service.nix
index 97e6f592..6e10d24b 100644
--- a/custom/bar-service.nix
+++ b/custom/bar-service.nix
@@ -82,9 +82,13 @@ in {
     users.groups."${cfg.group}" = {};
 
     nixpkgs.overlays = [(selfPkgs: superPkgs: {
-      haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: {
-        bar = superPkgs.callPackage ./bar { haskellPackages = selfH; };
-      });
+      haskell = superPkgs.haskell // {
+        packages = superPkgs.haskell.packages // {
+          ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: {
+            bar = superPkgs.callPackage ./bar { haskellPackages = selfH; };
+          });
+        };
+      };
 
       inherit (selfPkgs.haskell.packages.ghc822) bar;
     })];
diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix
index a7291b8c..bc61ca39 100644
--- a/custom/thermoprint-service.nix
+++ b/custom/thermoprint-service.nix
@@ -18,12 +18,15 @@ in {
 
   config = mkIf pCfg.enable {
     nixpkgs.overlays = [(selfPkgs: superPkgs: {
-      haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH:
-        import ./thermoprint {
-          callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; });
-          extraPackages = pCfg.extraServerPackages;
-        }
-      );
+      haskell = superPkgs.haskell // {
+        packages = superPkgs.haskell.packages // {
+          ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH:
+            import ./thermoprint {
+              callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; });
+              extraPackages = pCfg.extraServerPackages;
+          );
+        };
+      };
 
       inherit (selfPkgs.haskell.packages.ghc822) thermoprint-server thermoprint-webgui tprint;
     })];