Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

pkgs/overlays: create, move unstable there

Browse source 
also in unstable: use nixpkgs option to define
if unstable nixpkgs expressions should be from
nixos or nixpkgs channel
(default true, use nixos channel)
This commit is contained in:
Wroclaw 2024-06-17 07:24:06 +02:00
parent 3b7c1594ac
commit 88f348a2c9
2 changed files with 46 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
nix-os/unstable-packages.nix
View file

@ -1,37 +1,20 @@
{config, pkgs, lib, ...}: {config, pkgs, lib, ...}:
let let
nixos-unstable-exprs = builtins.fetchTarball https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz; cfg = config.unstable;
nixos-unstable = import nixos-unstable-exprs { unstableOverlay = import ../pkgs/overlays/unstable.nix;
inherit (config.nixpkgs) config localSystem crossSystem;
overlays = if config.unstable.usePkgsOverlays then config.pkgs.overlays else [];
};
nixos-unstable-version = builtins.concatStringsSep "." [
(builtins.readFile "${builtins.toString nixos-unstable-exprs}/.version")
(builtins.readFile "${builtins.toString nixos-unstable-exprs}/.version-suffix")
];
in in
{ {
options.unstable = { options.unstable = {
enable = lib.mkEnableOption (lib.mkDoc '' enable = lib.mkEnableOption (lib.mkDoc ''
use of unstable packages in configuration. You can use `unstablePkgs` in configuration modules use of unstable packages in configuration. You can use `unstablePkgs` in configuration modules
'') // { default = true; }; '') // { default = true; };
usePkgsOverlays = lib.mkEnableOption (lib.mkDoc ''
use overlays from `nixpkgs.overlays`
'');
pkgs = lib.mkOption {
default = if config.unstable.enable then nixos-unstable else pkgs;
description = lib.mkDoc ''
acts like pkgs, but it has unstable packages if `unstable.enable` is enabled.
You can also use `unstablePkgs` in module arguments.
'';
visible = true;
readOnly = true;
type = lib.types.pkgs;
};
}; };
config._module.args.unstablePkgs = config.unstable.pkgs; config = {
config.system.extraSystemBuilderCmds = lib.mkIf config.unstable.enable '' _module.args.unstablePkgs = if config.unstable.enable then pkgs.unstable else pkgs;
echo ${nixos-unstable-version} > $out/nixos-unstable-version nixpkgs.overlays = lib.mkIf cfg.enable [ unstableOverlay ];
''; system.extraSystemBuilderCmds = lib.mkIf config.unstable.enable ''
echo ${pkgs.unstableVersion} > $out/nixos-unstable-version
'';
};
} }

36
pkgs/overlays/unstable.nix Normal file
View file

@ -0,0 +1,36 @@
self: super:
let
nixos = self.config.nixos or true;
useUnstable = self.config.useUnstable or true;
unstablePkgsExprs = if nixos
then builtins.fetchTarball "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
else builtins.fetchTarball "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
# Compiled nixpkgs expression eg expressions from a nix channel
nixpkgsVersion = builtins.concatStringsSep "." [
(builtins.readFile "${unstablePkgsExprs}/.version")
(builtins.readFile "${unstablePkgsExprs}/.version-suffix")
];
nixpkgsRevision = (builtins.readFile "${unstablePkgsExprs}/.git-revision");
unstablePkgsForNixpkgs = nixpkgs: import unstablePkgsExprs {
# localSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.hostPlatform ???
localSystem = nixpkgs.stdenv.hostPlatform;
# crossSystem -> nixpkgs.stdenv.targetPlatform
crossSystem = nixpkgs.stdenv.targetPlatform;
# config -> pkgs.config
config = nixpkgs.config;
# overlays -> partial of pkgs.overlays
overlays = nixpkgs.overlays;
# crossOverlays -> partial of pkgs.overlays
# crossOverlays are merged to overlays, not sure what issues that might raise.
# ignoring.
};
in
{
unstable = if useUnstable then unstablePkgsForNixpkgs self else self;
unstableVersion = self.lib.optionalString useUnstable nixpkgsVersion;
unstableRevision = self.lib.optionalString useUnstable nixpkgsRevision;
}