mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/nixpkgs): add additionalOverlays optional arg

Browse source 
This allows applying additional overlays to nixpkgs before
instantiating it.

Change-Id: Iee486086e13bb73e6bd20a817b1106c3cd99c935
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11407
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-04-13 13:43:41 +03:00 committed by flokli
parent 31e3382129
commit e5b87d5496
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
third_party/nixpkgs/default.nix vendored
View file

@ -13,6 +13,9 @@
, depotOverlays ? true , depotOverlays ? true
, localSystem ? externalArgs.localSystem or builtins.currentSystem , localSystem ? externalArgs.localSystem or builtins.currentSystem
, crossSystem ? externalArgs.crossSystem or localSystem , crossSystem ? externalArgs.crossSystem or localSystem
# additional overlays to be applied.
# Useful when calling this file in a view exported from depot.
, additionalOverlays ? [ ]
, ... , ...
}: }:
@ -69,5 +72,5 @@ import nixpkgsSrc (commonNixpkgsArgs // {
depot.third_party.overlays.ecl-static depot.third_party.overlays.ecl-static
depot.third_party.overlays.dhall depot.third_party.overlays.dhall
(import depot.third_party.sources.rust-overlay) (import depot.third_party.sources.rust-overlay)
] else [ ]); ] else [ ] ++ additionalOverlays);
}) })

1
tvix/shell.nix
View file

@ -8,6 +8,7 @@
pkgs ? (import ./nixpkgs { pkgs ? (import ./nixpkgs {
depotOverlays = false; depotOverlays = false;
depot.third_party.sources = import ./sources { }; depot.third_party.sources = import ./sources { };
additionalOverlays = [ ];
}) })
, ... , ...
}: }: