templates/basic: simplify a bit

2 files changed, 10 insertions, 38 deletions

diff --git a/templates/basic/default.nix b/templates/basic/default.nix
deleted file mode 100644
index 5d0e6a1..0000000
--- a/templates/basic/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  stdenv,
-  self,
-  version,
-  ...
-}:
-stdenv.mkDerivation {
-  pname = "hello";
-  inherit version;
-
-  src = self;
-
-  installPhase = ''
-    echo "hi" > $out
-  '';
-
-  meta = with lib; {
-    description = "";
-    homepage = "";
-    license = licenses.mit;
-    maintainers = [maintainers.getchoo];
-    platforms = platforms.linux;
-  };
-}
diff --git a/templates/basic/flake.nix b/templates/basic/flake.nix
index 17943a8..56675f3 100644
--- a/templates/basic/flake.nix
+++ b/templates/basic/flake.nix
@@ -11,7 +11,6 @@
     ...
   }: let
     inherit (nixpkgs) lib;
-    version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
 
     systems = [
       "x86_64-linux"
@@ -20,13 +19,7 @@
       "aarch64-darwin"
     ];
 
-    genSystems = lib.genAttrs systems;
-    nixpkgsFor = genSystems (sys: nixpkgs.legacyPackages.${sys});
-    forAllSystems = fn: genSystems (sys: fn nixpkgsFor.${sys});
-
-    packageFn = pkgs: {
-      hello = pkgs.callPackage ./default.nix {inherit self version;};
-    };
+    forAllSystems = fn: lib.genAttrs systems (sys: fn nixpkgs.legacyPackages.${sys});
   in {
     devShells = forAllSystems (pkgs: {
       default = pkgs.mkShell {
@@ -36,13 +29,17 @@
       };
     });
 
-    formatter = forAllSystems (p: p.alejandra);
+    formatter = forAllSystems (pkgs: pkgs.alejandra);
 
-    packages = forAllSystems (pkgs: {
-      inherit (pkgs) hello;
-      default = pkgs.hello;
+    packages = forAllSystems (pkgs: let
+      pkgs' = lib.fix (final: self.overlays.default final pkgs);
+    in {
+      inherit (pkgs') hello;
+      default = pkgs'.hello;
     });
 
-    overlays.default = _: prev: (packageFn prev);
+    overlays.default = _: prev: {
+      foo = prev.callPackage ./. {inherit self;};
+    };
   };
 }