mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-06 08:47:00 +00:00
version: implement nix-darwin release versions
This commit is contained in:
parent
0ef91bc148
commit
8a3ea966bc
2 changed files with 18 additions and 6 deletions
|
@ -59,11 +59,18 @@ in
|
||||||
description = "Label to be used in the names of generated outputs.";
|
description = "Label to be used in the names of generated outputs.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
system.darwinRelease = mkOption {
|
||||||
|
readOnly = true;
|
||||||
|
type = types.str;
|
||||||
|
default = (lib.importJSON ../../version.json).release;
|
||||||
|
description = "The nix-darwin release (e.g. `24.11`).";
|
||||||
|
};
|
||||||
|
|
||||||
system.darwinVersion = mkOption {
|
system.darwinVersion = mkOption {
|
||||||
internal = true;
|
internal = true;
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "darwin${toString cfg.stateVersion}${cfg.darwinVersionSuffix}";
|
default = cfg.darwinRelease + cfg.darwinVersionSuffix;
|
||||||
description = "The full darwin version (e.g. `darwin4.2abdb5a`).";
|
description = "The full nix-darwin version (e.g. `24.11.2abdb5a`).";
|
||||||
};
|
};
|
||||||
|
|
||||||
system.darwinVersionSuffix = mkOption {
|
system.darwinVersionSuffix = mkOption {
|
||||||
|
@ -72,7 +79,7 @@ in
|
||||||
default = if cfg.darwinRevision != null
|
default = if cfg.darwinRevision != null
|
||||||
then ".${substring 0 7 cfg.darwinRevision}"
|
then ".${substring 0 7 cfg.darwinRevision}"
|
||||||
else "";
|
else "";
|
||||||
description = "The short darwin version suffix (e.g. `.2abdb5a`).";
|
description = "The short nix-darwin version suffix (e.g. `.2abdb5a`).";
|
||||||
};
|
};
|
||||||
|
|
||||||
system.darwinRevision = mkOption {
|
system.darwinRevision = mkOption {
|
||||||
|
@ -86,14 +93,15 @@ in
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = lib.trivial.release;
|
default = lib.trivial.release;
|
||||||
description = "The nixpkgs release (e.g. `16.03`).";
|
description = "The nixpkgs release (e.g. `24.11`).";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# TODO: Shouldn’t mismatch the Darwin release, rethink all this…
|
||||||
system.nixpkgsVersion = mkOption {
|
system.nixpkgsVersion = mkOption {
|
||||||
internal = true;
|
internal = true;
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = cfg.nixpkgsRelease + cfg.nixpkgsVersionSuffix;
|
default = cfg.nixpkgsRelease + cfg.nixpkgsVersionSuffix;
|
||||||
description = "The full nixpkgs version (e.g. `16.03.1160.f2d4ee1`).";
|
description = "The full nixpkgs version (e.g. `24.11.1160.f2d4ee1`).";
|
||||||
};
|
};
|
||||||
|
|
||||||
system.nixpkgsVersionSuffix = mkOption {
|
system.nixpkgsVersionSuffix = mkOption {
|
||||||
|
@ -124,7 +132,7 @@ in
|
||||||
config = {
|
config = {
|
||||||
# This default is set here rather than up there so that the options
|
# This default is set here rather than up there so that the options
|
||||||
# documentation is not reprocessed on every commit
|
# documentation is not reprocessed on every commit
|
||||||
system.darwinLabel = mkDefault "${cfg.nixpkgsVersion}+${cfg.darwinVersion}";
|
system.darwinLabel = mkDefault cfg.darwinVersion;
|
||||||
|
|
||||||
assertions = [
|
assertions = [
|
||||||
{
|
{
|
||||||
|
|
4
version.json
Normal file
4
version.json
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"release": "25.05",
|
||||||
|
"isReleaseBranch": false
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue