overlays: Fixing various mistakes in how overlays worked up until now

4 files changed, 11 insertions, 21 deletions

diff --git a/overlays/default.nix b/overlays/default.nix
index c17b24224de..7681eddb432 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -5,27 +5,16 @@
  * kookie: scripts and utils that won't leave LIBKOOKIE
  */
 
-self: super:
+self: super: {
 
-{
-
-  barrel-blog = self.callPackage ./kookie/barrel-blog { };
-  
-  invoice = self.callPackage ./kookie/invoice { };
-
-  spacekookie-de = self.callPackage ./kookie/spacekookie-de { };
-
-} // {
+  barrel-blog = self.callPackage ./kookie/barrel-blog { inherit (super); };
+  invoice = self.callPackage ./kookie/invoice { inherit (super); };
+  spacekookie-de = self.callPackage ./kookie/spacekookie-de { inherit (super); };
 
   nodemcu-uploader = self.callPackage ./staging/nodemcu-uploader { };
-  
   pleroma = self.callPackage ./staging/pleroma { };
   
-} // {
-
   emacs-ergoemacs-mode = self.callPackage ./patches/emacs-ergoemacs-mode { };
-  
   htop = self.callPackage ./patches/htop { inherit (super) htop; };
-
   neomutt = self.callPackages ./patches/neomutt { inherit (super) neomutt; };
 }
diff --git a/overlays/kookie/barrel-blog/default.nix b/overlays/kookie/barrel-blog/default.nix
index 68e8cf1825f..15c2e58d5ce 100644
--- a/overlays/kookie/barrel-blog/default.nix
+++ b/overlays/kookie/barrel-blog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, ... }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 let
   json = with builtins; fromJSON (readFile ./meta.json);
@@ -15,7 +15,7 @@ in
       sha256 = masterSha256;
     }; 
 
-    buildInputs = with pkgs.pythonPackages; [ pelican webassets markdown ];
+    buildInputs = with pythonPackages; [ pelican webassets markdown ];
 
     installPhase = ''
       cd docs/
diff --git a/overlays/kookie/invoice/default.nix b/overlays/kookie/invoice/default.nix
index 25c0fbb1ddb..cdf0f1537ac 100644
--- a/overlays/kookie/invoice/default.nix
+++ b/overlays/kookie/invoice/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, makeWrapper, coreutils, findutils, gawk, pandoc, gnumake, texlive }:
+{ stdenv, makeWrapper, coreutils, findutils,
+  gawk, pandoc, gnumake, texlive }:
 
 stdenv.mkDerivation {
   pname = "invoice";
@@ -21,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Generate dynamic invoices based on yaml descriptors";
-    homepage = "https://git.sr.ht/~spacekookie/kookiepkgs/";
+    homepage = "https://git.sr.ht/~spacekookie/libkookie/";
     license = licenses.gpl3;
   };
 }
diff --git a/overlays/kookie/spacekookie-de/default.nix b/overlays/kookie/spacekookie-de/default.nix
index a15af12b5fa..49104906317 100644
--- a/overlays/kookie/spacekookie-de/default.nix
+++ b/overlays/kookie/spacekookie-de/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, ... }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
 let
   json = with builtins; fromJSON (readFile ./meta.json);
@@ -15,7 +15,7 @@ in
       sha256 = masterSha256;
     }; 
 
-    buildInputs = with pkgs.python3Packages; [ pelican webassets markdown ];
+    buildInputs = with python3Packages; [ pelican webassets markdown ];
 
     installPhase = ''
       pelican content