pkgs: Add pkgs-lib structure

This commit is contained in:
Silvan Mosberger 2020-03-26 02:54:23 +01:00
parent 9df69cba05
commit 888c923880
No known key found for this signature in database
GPG key ID: E8F1E9EAD284E17D
4 changed files with 17 additions and 0 deletions

View file

@ -0,0 +1,7 @@
# pkgs-lib is for functions and values that can't be in lib because
# they depend on some packages. This notably is *not* for supporting package
# building, instead pkgs/build-support is the place for that.
{ lib, pkgs }: {
}

View file

@ -0,0 +1,5 @@
# Call nix-build on this file to run all tests in this directory
{ pkgs ? import ../../.. {} }:
let
in pkgs.linkFarm "nixpkgs-pkgs-lib-tests" [
]

View file

@ -523,6 +523,9 @@ in
#package writers
writers = callPackage ../build-support/writers {};
# lib functions depending on pkgs
inherit (import ../pkgs-lib { inherit lib pkgs; });
### TOOLS
_0x0 = callPackage ../tools/misc/0x0 { };

View file

@ -34,6 +34,7 @@ let
manual = import ../../doc { inherit pkgs nixpkgs; };
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; };
darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate
{ name = "nixpkgs-darwin-${jobs.tarball.version}";
@ -91,6 +92,7 @@ let
[ jobs.tarball
jobs.manual
jobs.lib-tests
jobs.pkgs-lib-tests
jobs.stdenv.x86_64-linux
jobs.linux.x86_64-linux
jobs.pandoc.x86_64-linux