From 23c08d04f9c78aaaf511f3be2849f2875071ad0e Mon Sep 17 00:00:00 2001
From: Jake Hamilton <jake.hamilton@hey.com>
Date: Wed, 28 Dec 2022 23:40:05 -0800
Subject: [PATCH] feat(overlay): only namespace package overlays

BREAKING CHANGE

This commit modifies the overlay builder's original behavior
in a non-backward compatible way. Previously, all overlays
would be namespaced with "nixpkgs/". This was often
unnecessary or would cause conflicts with package overlays if
they shared a name. After this change, all overlays retain their
directory name (eg. "my-overlay") and all package overlays are
prefixed with "package/" to differentiate them and avoid name
conflicts.
---
 README.md               | 12 ++++++------
 lib/overlay/default.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 66c6a76..555c27a 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ library instance with `mkLib`.
 	description = "My Flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 		snowfall-lib = {
 			url = "github:snowfallorg/lib";
@@ -247,7 +247,7 @@ packages, overlays, and shells specified by the [Flake Structure](#flake-structu
 	description = "My Flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 		snowfall-lib = {
 			url = "github:snowfallorg/lib";
@@ -279,7 +279,7 @@ You can apply overlays and modules from your flake's inputs with the following o
 	description = "My Flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 		snowfall-lib = {
 			url = "github:snowfallorg/lib";
@@ -338,7 +338,7 @@ on `pkgs` and consumers of your flake can use the generated `<your-flake>.overla
 	description = "My Flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 		snowfall-lib = {
 			url = "github:snowfallorg/lib";
@@ -391,7 +391,7 @@ mapping the `default` package or shell to the name of the one you want.
 	description = "My Flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 		snowfall-lib = {
 			url = "github:snowfallorg/lib";
@@ -437,7 +437,7 @@ include `darwin` and/or `nixos-generators` as inputs.
 	description = "My Flake";
 
 	inputs = {
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 		snowfall-lib = {
 			url = "github:snowfallorg/lib";
diff --git a/lib/overlay/default.nix b/lib/overlay/default.nix
index d8edf25..bb2a26b 100644
--- a/lib/overlay/default.nix
+++ b/lib/overlay/default.nix
@@ -118,7 +118,7 @@ in
             overlays
           else
             overlays // {
-              "nixpkgs/${name}" = overlay;
+              ${name} = overlay;
             }
         );
 
@@ -151,7 +151,7 @@ in
           in
           package-overlays //
           {
-            "nixpkgs/${name}" = overlay;
+            "package/${name}" = overlay;
           };
 
         package-overlays =