Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into nixpkgs.lib
Browse files Browse the repository at this point in the history
  • Loading branch information
roberth committed Mar 7, 2025
2 parents 0210dcc + 3876f6b commit 23e4843
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 50 deletions.
49 changes: 16 additions & 33 deletions dev/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions extras/partitions.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,12 @@ let

# Nix does not recognize that a flake like "${./dev}", which is a content
# addressed store path is a pure input, so we have to fetch and wire it
# manually with get-flake.
# TODO: update this
get-flake = import (builtins.fetchTree {
type = "github";
owner = "ursi";
repo = "get-flake";
rev = "a6c57417d1b857b8be53aba4095869a0f438c502";
# manually with flake-compat.
get-flake = src: (flake-compat { inherit src; system = throw "operating flake-compat in pure mode; system not allowed to be used"; }).outputs;
# TODO: update
flake-compat = import (builtins.fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/9ed2ac151eada2306ca8c418ebd97807bb08f6ac.tar.gz";
sha256 = "sha256:063slk1np1g1dkh21a82x655kpja7p4pc74rb3lqankyrbbpy4hx";
});

in
Expand Down
15 changes: 6 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion modules/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,23 @@ in
flake = mkOption {
type = types.submoduleWith {
modules = [
{ freeformType = types.lazyAttrsOf types.raw; }
{
freeformType =
types.lazyAttrsOf
(types.unique
{
message = ''
No option has been declared for this flake output attribute, so its definitions can't be merged automatically.
Possible solutions:
- Load a module that defines this flake output attribute
Many modules are listed at https://flake.parts
- Declare an option for this flake output attribute
- Make sure the output attribute is spelled correctly
- Define the value only once, with a single definition in a single module
'';
}
types.raw);
}
];
};
description = ''
Expand Down

0 comments on commit 23e4843

Please sign in to comment.