lix-project/nixos-module
15
7
Fork 14
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Allow use of lix from nixpkgs

Browse source 
Change behaviour of module. Allow not specifying LixSrc
and provide fallback to nixpkgs.pkgs.lix
This commit is contained in:
crop 2024-07-21 20:15:55 +02:00 committed by Jade Lovelace
parent d70318fb94
commit 05c6934e6b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
module.nix
View file

@ -1,4 +1,4 @@
{ lix, versionSuffix ? "" }: { lix ? null, versionSuffix ? "" }:
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ]; nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];

8
overlay.nix
View file

@ -1,11 +1,11 @@
{ lix, versionSuffix ? "" }: { lix ? null, versionSuffix ? "" }:
final: prev: final: prev:
let let
# This is kind of scary to not override the nix version to pretend to be # This is kind of scary to not override the nix version to pretend to be
# 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI # 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI
# usage. # usage.
# https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121 # https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121
lixPkg = final.callPackage (lix + "/package.nix") ({ lixPkgFromSource = final.callPackage (lix + "/package.nix") ({
versionSuffix = "-${versionSuffix}"; versionSuffix = "-${versionSuffix}";
# FIXME: do this more sensibly for future releases # FIXME: do this more sensibly for future releases
# https://git.lix.systems/lix-project/lix/issues/406 # https://git.lix.systems/lix-project/lix/issues/406
@ -52,9 +52,11 @@ let
# want to do that. # want to do that.
lix-sources = import ./pins.nix; lix-sources = import ./pins.nix;
lix = if lix != null then lixPkgFromSource else prev.lix;
nixVersions = prev.nixVersions // rec { nixVersions = prev.nixVersions // rec {
# FIXME: do something less scuffed # FIXME: do something less scuffed
nix_2_18 = maybeWarnDuplicate lixPkg; nix_2_18 = maybeWarnDuplicate final.lix;
stable = nix_2_18; stable = nix_2_18;
nix_2_18_upstream = prev.nixVersions.nix_2_18; nix_2_18_upstream = prev.nixVersions.nix_2_18;
}; };