new bootTools is working

This commit is contained in:
Jeff Hykin 2024-05-21 23:53:33 -04:00
parent 3864986c18
commit 040494bb21
237 changed files with 123 additions and 1530 deletions

View file

@ -1,55 +0,0 @@
name: Update
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * SUN' # every sunday
jobs:
update:
name: Pull in latest lib from Nixpkgs
runs-on: ubuntu-latest
steps:
- name: Procure Nix
uses: cachix/install-nix-action@v21
- name: Checkout
uses: actions/checkout@v2
with:
ref: master
path: nixpkgs-lib
- name: Checkout nixpkgs repo
uses: actions/checkout@v2
with:
ref: master
repository: NixOS/nixpkgs
path: nixpkgs
fetch-depth: 0 # complete history
- name: Procure git-filter-repo from nixpkgs
run: "nix profile install nixpkgs#git-filter-repo"
- name: Filter nixpkgs on ./lib
run: |
cd ./nixpkgs
git filter-repo --path lib --force
- name: Update nixpkgs.lib
run: |
cd ./nixpkgs-lib
git remote add other ../nixpkgs/
git fetch other master
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git merge -X theirs --allow-unrelated-histories other/master
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
directory: nixpkgs-lib
branch: master

View file

@ -1,12 +0,0 @@
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
;
[subrepo]
remote = git@github.com:nix-community/nixpkgs.lib.git
branch = master
commit = 0df131b5ee4d928a4b664b6d0cd99cf134d6ab6b
parent = 91911cb4385d8950614656373e3d82b9da997f06
method = merge
cmdver = 0.4.5

View file

@ -1,5 +0,0 @@
{
description = "A cheap & continously rebased fork of nixpkgs.lib";
outputs = { self }: { lib = import ./lib; };
}

View file

@ -2025,16 +2025,4 @@ rec {
intersection;
in
(x // y) // mask;
# DEPRECATED
zipWithNames = warn
"lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames;
# DEPRECATED
zip = warn
"lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith;
# DEPRECATED
cartesianProductOfSets = warnIf (isInOldestRelease 2405)
"lib.cartesianProductOfSets is a deprecated alias of lib.cartesianProduct." cartesianProduct;
}

View file

@ -9,8 +9,44 @@ let
lib = makeExtensible (self: let
callLibs = file: import file { lib = self; };
loadNode = (root: folder:
let
static = {
setup = builtins.fromJSON builtins.readFile ( "${root}/${folder}/static/setup.json" );
dependencies = builtins.fromJSON builtins.readFile ( "${root}/${folder}/static/dependencies.json" );
meta = builtins.fromJSON builtins.readFile ( "${root}/${folder}/static/meta.json" );
};
_nodeNames = (builtins.attrNames static.dependencies.nodes);
in
# basecase
if (builtins.length _nodeNames) == 0
then
{
static = static;
value = import "${root}/${folder}/default.nix";
dependencies = {};
}
# recursive case
else
{
static = static;
value = import "${root}/${folder}/default.nix";
dependencies.nodes = (builtins.listToAttrs
(builtins.map
(nodeName:
{
name = nodeName;
value = (loadNode root nodeName).value;
}
)
_nodeNames
)
);
}
);
in {
builtins = builtins;
# often used, or depending on very little
trivial = callLibs ./trivial.nix;
fixedPoints = callLibs ./fixed-points.nix;
@ -47,7 +83,6 @@ let
# misc
asserts = callLibs ./asserts.nix;
debug = callLibs ./debug.nix;
misc = callLibs ./deprecated/misc.nix;
# domain-specific
fetchers = callLibs ./fetchers.nix;
@ -138,7 +173,6 @@ let
mkMergedOptionModule mkChangedOptionModule
mkAliasOptionModule mkDerivedConfig doRename
mkAliasOptionModuleMD;
evalOptionValue = lib.warn "External use of `lib.evalOptionValue` is deprecated. If your use case isn't covered by non-deprecated functions, we'd like to know more and perhaps support your use case well, instead of providing access to these low level functions. In this case please open an issue in https://github.com/nixos/nixpkgs/issues/." self.modules.evalOptionValue;
inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption
getValues getFiles
@ -155,17 +189,16 @@ let
traceSeq traceSeqN traceValSeq
traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN
runTests testAllTrue;
inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs
maybeAttrNullable maybeAttr ifEnable checkFlag getValue
checkReqs uniqList uniqListExt condConcat lazyGenericClosure
innerModifySumArgs modifySumArgs innerClosePropagation
closePropagation mapAttrsFlatten nvs setAttr setAttrMerge
mergeAttrsWithFunc mergeAttrsConcatenateValues
mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
mergeAttrsByFuncDefaultsClean mergeAttrBy
fakeHash fakeSha256 fakeSha512
nixType imap;
inherit (self.versions)
splitVersion;
loadStatic = (folder:
{
setup = builtins.fromJSON ( builtins.readFile "${folder}/static/setup.json" );
dependencies = builtins.fromJSON ( builtins.readFile "${folder}/static/dependencies.json" );
meta = builtins.fromJSON ( builtins.readFile "${folder}/static/meta.json" );
}
);
loadNode = loadNode;
});
in lib

View file

@ -397,8 +397,6 @@ rec {
if ! isString text then throw "literalExpression expects a string."
else { _type = "literalExpression"; inherit text; };
literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression;
/* Transition marker for documentation that's already migrated to markdown
syntax. Has been a no-op for some while and been removed from nixpkgs.
Kept here to alert downstream users who may not be aware of the migration's

Some files were not shown because too many files have changed in this diff Show more