kylekrein/snowfall-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(overlay): only namespace package overlays

Browse source 
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.
This commit is contained in:
Jake Hamilton 2022-12-28 23:40:05 -08:00
parent 07d478036c
commit 23c08d04f9
No known key found for this signature in database
GPG key ID: 9762169A1B35EA68
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -66,7 +66,7 @@ library instance with `mkLib`.
description = "My Flake"; description = "My Flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib";
@ -247,7 +247,7 @@ packages, overlays, and shells specified by the [Flake Structure](#flake-structu
description = "My Flake"; description = "My Flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/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"; description = "My Flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/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"; description = "My Flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/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"; description = "My Flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib";
@ -437,7 +437,7 @@ include `darwin` and/or `nixos-generators` as inputs.
description = "My Flake"; description = "My Flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib";

4
lib/overlay/default.nix
View file

@ -118,7 +118,7 @@ in
overlays overlays
else else
overlays // { overlays // {
"nixpkgs/${name}" = overlay; ${name} = overlay;
} }
); );
@ -151,7 +151,7 @@ in
in in
package-overlays // package-overlays //
{ {
"nixpkgs/${name}" = overlay; "package/${name}" = overlay;
}; };
package-overlays = package-overlays =