mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
flake: remove pkgsUnfree
arg
This commit is contained in:
parent
998bae9dac
commit
fecc892145
4 changed files with 8 additions and 29 deletions
|
@ -1,4 +1,3 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./dev
|
||||
|
@ -10,15 +9,4 @@
|
|||
./tests.nix
|
||||
./wrappers.nix
|
||||
];
|
||||
|
||||
perSystem =
|
||||
{ system, ... }:
|
||||
{
|
||||
_module.args = {
|
||||
pkgsUnfree = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,18 +5,10 @@
|
|||
}:
|
||||
{
|
||||
perSystem =
|
||||
{
|
||||
pkgs,
|
||||
pkgsUnfree,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
checks = pkgs.callPackages ../tests {
|
||||
inherit
|
||||
helpers
|
||||
pkgsUnfree
|
||||
self
|
||||
;
|
||||
inherit helpers self;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
pkgsUnfree,
|
||||
helpers,
|
||||
lib,
|
||||
linkFarm,
|
||||
|
@ -11,7 +10,6 @@ let
|
|||
autoArgs = pkgs // {
|
||||
inherit
|
||||
helpers
|
||||
pkgsUnfree
|
||||
self
|
||||
system
|
||||
;
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
lib ? pkgs.lib,
|
||||
linkFarm,
|
||||
pkgs,
|
||||
pkgsUnfree,
|
||||
self,
|
||||
system,
|
||||
}:
|
||||
|
@ -21,14 +20,16 @@ let
|
|||
file: name: module:
|
||||
mkTestDerivationFromNixvimModule {
|
||||
inherit name;
|
||||
# Use a single common instance of nixpkgs, with allowUnfree
|
||||
# Having a single shared instance should speed up tests a little
|
||||
module = {
|
||||
_file = file;
|
||||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue