flake: remove pkgsUnfree arg

This commit is contained in:
Matt Sturgeon 2025-01-19 12:55:15 +00:00
parent 998bae9dac
commit fecc892145
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
4 changed files with 8 additions and 29 deletions

View file

@ -1,4 +1,3 @@
{ inputs, ... }:
{ {
imports = [ imports = [
./dev ./dev
@ -10,15 +9,4 @@
./tests.nix ./tests.nix
./wrappers.nix ./wrappers.nix
]; ];
perSystem =
{ system, ... }:
{
_module.args = {
pkgsUnfree = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
};
} }

View file

@ -5,18 +5,10 @@
}: }:
{ {
perSystem = perSystem =
{ { pkgs, ... }:
pkgs,
pkgsUnfree,
...
}:
{ {
checks = pkgs.callPackages ../tests { checks = pkgs.callPackages ../tests {
inherit inherit helpers self;
helpers
pkgsUnfree
self
;
}; };
}; };
} }

View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
pkgsUnfree,
helpers, helpers,
lib, lib,
linkFarm, linkFarm,
@ -11,7 +10,6 @@ let
autoArgs = pkgs // { autoArgs = pkgs // {
inherit inherit
helpers helpers
pkgsUnfree
self self
system system
; ;

View file

@ -6,7 +6,6 @@
lib ? pkgs.lib, lib ? pkgs.lib,
linkFarm, linkFarm,
pkgs, pkgs,
pkgsUnfree,
self, self,
system, system,
}: }:
@ -21,14 +20,16 @@ let
file: name: module: file: name: module:
mkTestDerivationFromNixvimModule { mkTestDerivationFromNixvimModule {
inherit name; inherit name;
# Use a single common instance of nixpkgs, with allowUnfree
# Having a single shared instance should speed up tests a little
module = { module = {
_file = file; _file = file;
imports = [ module ]; imports = [ module ];
nixpkgs.pkgs = pkgsUnfree;
}; };
pkgs = pkgsUnfree; # Use a single common instance of nixpkgs, with allowUnfree
# Having a single shared instance should speed up tests a little
pkgs = import self.inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
}; };
# List of files containing configurations # List of files containing configurations