pkgs: Add pkgs-lib structure
This commit is contained in:
parent
9df69cba05
commit
888c923880
7
pkgs/pkgs-lib/default.nix
Normal file
7
pkgs/pkgs-lib/default.nix
Normal 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 }: {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
5
pkgs/pkgs-lib/tests/default.nix
Normal file
5
pkgs/pkgs-lib/tests/default.nix
Normal 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" [
|
||||||
|
]
|
|
@ -523,6 +523,9 @@ in
|
||||||
#package writers
|
#package writers
|
||||||
writers = callPackage ../build-support/writers {};
|
writers = callPackage ../build-support/writers {};
|
||||||
|
|
||||||
|
# lib functions depending on pkgs
|
||||||
|
inherit (import ../pkgs-lib { inherit lib pkgs; });
|
||||||
|
|
||||||
### TOOLS
|
### TOOLS
|
||||||
|
|
||||||
_0x0 = callPackage ../tools/misc/0x0 { };
|
_0x0 = callPackage ../tools/misc/0x0 { };
|
||||||
|
|
|
@ -34,6 +34,7 @@ let
|
||||||
|
|
||||||
manual = import ../../doc { inherit pkgs nixpkgs; };
|
manual = import ../../doc { inherit pkgs nixpkgs; };
|
||||||
lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
|
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
|
darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate
|
||||||
{ name = "nixpkgs-darwin-${jobs.tarball.version}";
|
{ name = "nixpkgs-darwin-${jobs.tarball.version}";
|
||||||
|
@ -91,6 +92,7 @@ let
|
||||||
[ jobs.tarball
|
[ jobs.tarball
|
||||||
jobs.manual
|
jobs.manual
|
||||||
jobs.lib-tests
|
jobs.lib-tests
|
||||||
|
jobs.pkgs-lib-tests
|
||||||
jobs.stdenv.x86_64-linux
|
jobs.stdenv.x86_64-linux
|
||||||
jobs.linux.x86_64-linux
|
jobs.linux.x86_64-linux
|
||||||
jobs.pandoc.x86_64-linux
|
jobs.pandoc.x86_64-linux
|
||||||
|
|
Loading…
Reference in a new issue