commit 152c63c9ff82276e225ac4a4fa71c791d33e443d · pyrox.dev/nixpkgs

+4 -4

lib/attrsets.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       # Operations on attribute sets.

     

       2
       3
        
       

     

       3
       4
        
       let

     

       4
       5
        
         inherit (builtins) head tail length;

     

       5
       5
       -
         inherit (import ./trivial.nix) and or;

     

       6
       6
       -
         inherit (import ./default.nix) fold;

     

       7
       7
       -
         inherit (import ./strings.nix) concatStringsSep;

     

       8
       8
       -
         inherit (import ./lists.nix) concatMap concatLists all deepSeqList;

     

       6
       6
       +
         inherit (lib.trivial) and or;

     

       7
       7
       +
         inherit (lib.strings) concatStringsSep;

     

       8
       8
       +
         inherit (lib.lists) fold concatMap concatLists all deepSeqList;

     

       9
       9
        
       in

     

       10
       10
        
       

     

       11
       11
        
       rec {

+1 -1

lib/customisation.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       let

     

       2
       3
        
       

     

       3
       3
       -
         lib = import ./default.nix;

     

       4
       4
        
         inherit (builtins) attrNames isFunction;

     

       5
       5
        
       

     

       6
       6
        
       in

+3 -1

lib/debug.nix

···

       1
       1
       -
       let lib = import ./default.nix;

     

       1
       1
       +
       { lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       2
       4
        
       

     

       3
       5
        
       inherit (builtins) trace attrNamesToStr isAttrs isFunction isList isInt

     

       4
       6
        
               isString isBool head substring attrNames;

+113 -44

lib/default.nix

···

       5
       5
        
        */

     

       6
       6
        
       let

     

       7
       7
        
       

     

       8
       8
       -
         # often used, or depending on very little

     

       9
       9
       -
         trivial = import ./trivial.nix;

     

       10
       10
       -
         fixedPoints = import ./fixed-points.nix;

     

       8
       8
       +
         callLibs = file: import file { inherit lib; };

     

       11
       9
        
       

     

       12
       12
       -
         # datatypes

     

       13
       13
       -
         attrsets = import ./attrsets.nix;

     

       14
       14
       -
         lists = import ./lists.nix;

     

       15
       15
       -
         strings = import ./strings.nix;

     

       16
       16
       -
         stringsWithDeps = import ./strings-with-deps.nix;

     

       10
       10
       +
         lib = rec {

     

       17
       11
        
       

     

       18
       18
       -
         # packaging

     

       19
       19
       -
         customisation = import ./customisation.nix;

     

       20
       20
       -
         maintainers = import ./maintainers.nix;

     

       21
       21
       -
         meta = import ./meta.nix;

     

       22
       22
       -
         sources = import ./sources.nix;

     

       12
       12
       +
           # often used, or depending on very little

     

       13
       13
       +
           trivial = callLibs ./trivial.nix;

     

       14
       14
       +
           fixedPoints = callLibs ./fixed-points.nix;

     

       23
       15
        
       

     

       24
       24
       -
         # module system

     

       25
       25
       -
         modules = import ./modules.nix;

     

       26
       26
       -
         options = import ./options.nix;

     

       27
       27
       -
         types = import ./types.nix;

     

       16
       16
       +
           # datatypes

     

       17
       17
       +
           attrsets = callLibs ./attrsets.nix;

     

       18
       18
       +
           lists = callLibs ./lists.nix;

     

       19
       19
       +
           strings = callLibs ./strings.nix;

     

       20
       20
       +
           stringsWithDeps = callLibs ./strings-with-deps.nix;

     

       28
       21
        
       

     

       29
       29
       -
         # constants

     

       30
       30
       -
         licenses = import ./licenses.nix;

     

       31
       31
       -
         systems = import ./systems;

     

       22
       22
       +
           # packaging

     

       23
       23
       +
           customisation = callLibs ./customisation.nix;

     

       24
       24
       +
           maintainers = callLibs ./maintainers.nix;

     

       25
       25
       +
           meta = callLibs ./meta.nix;

     

       26
       26
       +
           sources = callLibs ./sources.nix;

     

       27
       27
       +
       

     

       28
       28
       +
       

     

       29
       29
       +
           # module system

     

       30
       30
       +
           modules = callLibs ./modules.nix;

     

       31
       31
       +
           options = callLibs ./options.nix;

     

       32
       32
       +
           types = callLibs ./types.nix;

     

       32
       33
        
       

     

       33
       33
       -
         # misc

     

       34
       34
       -
         debug = import ./debug.nix;

     

       35
       35
       -
         generators = import ./generators.nix;

     

       36
       36
       -
         misc = import ./deprecated.nix;

     

       34
       34
       +
           # constants

     

       35
       35
       +
           licenses = callLibs ./licenses.nix;

     

       36
       36
       +
           systems = callLibs ./systems;

     

       37
       37
        
       

     

       38
       38
       -
         # domain-specific

     

       39
       39
       -
         sandbox = import ./sandbox.nix;

     

       40
       40
       -
         fetchers = import ./fetchers.nix;

     

       38
       38
       +
           # misc

     

       39
       39
       +
           debug = callLibs ./debug.nix;

     

       41
       40
        
       

     

       42
       42
       -
         # Eval-time filesystem handling

     

       43
       43
       -
         filesystem = import ./filesystem.nix;

     

       41
       41
       +
           generators = callLibs ./generators.nix;

     

       42
       42
       +
           misc = callLibs ./deprecated.nix;

     

       43
       43
       +
           # domain-specific

     

       44
       44
       +
           sandbox = callLibs ./sandbox.nix;

     

       45
       45
       +
           fetchers = callLibs ./fetchers.nix;

     

       44
       46
        
       

     

       45
       45
       -
       in

     

       46
       46
       -
         { inherit trivial fixedPoints

     

       47
       47
       -
                   attrsets lists strings stringsWithDeps

     

       48
       48
       -
                   customisation maintainers meta sources

     

       49
       49
       -
                   modules options types

     

       50
       50
       -
                   licenses systems

     

       51
       51
       -
                   debug generators misc

     

       52
       52
       -
                   sandbox fetchers filesystem;

     

       47
       47
       +
           # Eval-time filesystem handling

     

       48
       48
       +
           filesystem = callLibs ./filesystem.nix;

     

       53
       49
        
       

     

       54
       50
        
           # back-compat aliases

     

       55
       51
        
           platforms = systems.doubles;

     

       56
       56
       -
         }

     

       57
       57
       -
         # !!! don't include everything at top-level; perhaps only the most

     

       58
       58
       -
         # commonly used functions.

     

       59
       59
       -
         // trivial // fixedPoints

     

       60
       60
       -
         // lists // strings // stringsWithDeps // attrsets // sources

     

       61
       61
       -
         // options // types // meta // debug // misc // modules

     

       62
       62
       -
         // customisation

     

       52
       52
       +
       

     

       53
       53
       +
           inherit (builtins) add addErrorContext attrNames

     

       54
       54
       +
             concatLists deepSeq elem elemAt filter genericClosure genList

     

       55
       55
       +
             getAttr hasAttr head isAttrs isBool isFunction isInt isList

     

       56
       56
       +
             isString length lessThan listToAttrs pathExists readFile

     

       57
       57
       +
             replaceStrings seq stringLength sub substring tail;

     

       58
       58
       +
           inherit (trivial) id const concat or and boolToString mergeAttrs

     

       59
       59
       +
             flip mapNullable inNixShell min max importJSON warn info

     

       60
       60
       +
             nixpkgsVersion mod;

     

       61
       61
       +
       

     

       62
       62
       +
           inherit (fixedPoints) fix fix' extends composeExtensions

     

       63
       63
       +
             makeExtensible makeExtensibleWithCustomName;

     

       64
       64
       +
           inherit (attrsets) attrByPath hasAttrByPath setAttrByPath

     

       65
       65
       +
             getAttrFromPath attrVals attrValues catAttrs filterAttrs

     

       66
       66
       +
             filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs

     

       67
       67
       +
             mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond

     

       68
       68
       +
             genAttrs isDerivation toDerivation optionalAttrs

     

       69
       69
       +
             zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil

     

       70
       70
       +
             recursiveUpdate matchAttrs overrideExisting getOutput getBin

     

       71
       71
       +
             getLib getDev chooseDevOutputs zipWithNames zip;

     

       72
       72
       +
           inherit (lists) singleton foldr fold foldl foldl' imap0 imap1

     

       73
       73
       +
             concatMap flatten remove findSingle findFirst any all count

     

       74
       74
       +
             optional optionals toList range partition zipListsWith zipLists

     

       75
       75
       +
             reverseList listDfs toposort sort take drop sublist last init

     

       76
       76
       +
             crossLists unique intersectLists subtractLists

     

       77
       77
       +
             mutuallyExclusive;

     

       78
       78
       +
           inherit (strings) concatStrings concatMapStrings concatImapStrings

     

       79
       79
       +
             intersperse concatStringsSep concatMapStringsSep

     

       80
       80
       +
             concatImapStringsSep makeSearchPath makeSearchPathOutput

     

       81
       81
       +
             makeLibraryPath makeBinPath makePerlPath optionalString

     

       82
       82
       +
             hasPrefix hasSuffix stringToCharacters stringAsChars escape

     

       83
       83
       +
             escapeShellArg escapeShellArgs replaceChars lowerChars upperChars

     

       84
       84
       +
             toLower toUpper addContextFrom splitString removePrefix

     

       85
       85
       +
             removeSuffix versionOlder versionAtLeast getVersion nameFromURL

     

       86
       86
       +
             enableFeature fixedWidthString fixedWidthNumber isStorePath

     

       87
       87
       +
             toInt readPathsFromFile fileContents;

     

       88
       88
       +
           inherit (stringsWithDeps) textClosureList textClosureMap

     

       89
       89
       +
             noDepEntry fullDepEntry packEntry stringAfter;

     

       90
       90
       +
           inherit (customisation) overrideDerivation makeOverridable

     

       91
       91
       +
             callPackageWith callPackagesWith addPassthru hydraJob makeScope;

     

       92
       92
       +
           inherit (meta) addMetaAttrs dontDistribute setName updateName

     

       93
       93
       +
             appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio

     

       94
       94
       +
             hiPrioSet;

     

       95
       95
       +
           inherit (sources) pathType pathIsDirectory cleanSourceFilter

     

       96
       96
       +
             cleanSource sourceByRegex sourceFilesBySuffices

     

       97
       97
       +
             commitIdFromGitRepo;

     

       98
       98
       +
           inherit (modules) evalModules closeModules unifyModuleSyntax

     

       99
       99
       +
             applyIfFunction unpackSubmodule packSubmodule mergeModules

     

       100
       100
       +
             mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions

     

       101
       101
       +
             pushDownProperties dischargeProperties filterOverrides

     

       102
       102
       +
             sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride

     

       103
       103
       +
             mkOptionDefault mkDefault mkForce mkVMOverride mkStrict

     

       104
       104
       +
             mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions

     

       105
       105
       +
             mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule

     

       106
       106
       +
             mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule

     

       107
       107
       +
             mkAliasOptionModule doRename filterModules;

     

       108
       108
       +
           inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions

     

       109
       109
       +
             mergeDefaultOption mergeOneOption mergeEqualOption getValues

     

       110
       110
       +
             getFiles optionAttrSetToDocList optionAttrSetToDocList'

     

       111
       111
       +
             scrubOptionValue literalExample showOption showFiles

     

       112
       112
       +
             unknownModule mkOption;

     

       113
       113
       +
           inherit (types) isType setType defaultTypeMerge defaultFunctor

     

       114
       114
       +
             isOptionType mkOptionType;

     

       115
       115
       +
           inherit (debug) addErrorContextToAttrs traceIf traceVal

     

       116
       116
       +
             traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq

     

       117
       117
       +
             traceValSeqN traceShowVal traceShowValMarked

     

       118
       118
       +
             showVal traceCall traceCall2 traceCall3 traceValIfNot runTests

     

       119
       119
       +
             testAllTrue strict traceCallXml attrNamesToStr;

     

       120
       120
       +
           inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs

     

       121
       121
       +
             defaultOverridableDelayableArgs composedArgsAndFun

     

       122
       122
       +
             maybeAttrNullable maybeAttr ifEnable checkFlag getValue

     

       123
       123
       +
             checkReqs uniqList uniqListExt condConcat lazyGenericClosure

     

       124
       124
       +
             innerModifySumArgs modifySumArgs innerClosePropagation

     

       125
       125
       +
             closePropagation mapAttrsFlatten nvs setAttr setAttrMerge

     

       126
       126
       +
             mergeAttrsWithFunc mergeAttrsConcatenateValues

     

       127
       127
       +
             mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults

     

       128
       128
       +
             mergeAttrsByFuncDefaultsClean mergeAttrBy

     

       129
       129
       +
             prepareDerivationArgs nixType imap overridableDelayableArgs;

     

       130
       130
       +
         };

     

       131
       131
       +
       in lib

+5 -4

lib/deprecated.nix

···

       1
       1
       -
       let lib = import ./default.nix;

     

       1
       1
       +
       { lib }:

     

       2
       2
       +
       let

     

       2
       3
        
           inherit (builtins) isFunction head tail isList isAttrs isInt attrNames;

     

       3
       4
        
       

     

       4
       5
        
       in

     

       5
       6
        
       

     

       6
       6
       -
       with import ./lists.nix;

     

       7
       7
       -
       with import ./attrsets.nix;

     

       8
       8
       -
       with import ./strings.nix;

     

       7
       7
       +
       with lib.lists;

     

       8
       8
       +
       with lib.attrsets;

     

       9
       9
       +
       with lib.strings;

     

       9
       10
        
       

     

       10
       11
        
       rec {

     

       11
       12

+1

lib/fetchers.nix

···

       1
       1
        
       # snippets that can be shared by multiple fetchers (pkgs/build-support)

     

       2
       2
       +
       { lib }:

     

       2
       3
        
       {

     

       3
       4
        
       

     

       4
       5
        
         proxyImpureEnvVars = [

+1

lib/filesystem.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       { # haskellPathsInDir : Path -> Map String Path

     

       2
       3
        
         # A map of all haskell packages defined in the given path,

     

       3
       4
        
         # identified by having a cabal file with the same name as the

+1

lib/fixed-points.nix

···

       1
       1
       +
       { ... }:

     

       1
       2
        
       rec {

     

       2
       3
        
         # Compute the fixed point of the given function `f`, which is usually an

     

       3
       4
        
         # attribute set that expects its final, non-recursive representation as an

+4 -3

lib/generators.nix

···

       7
       7
        
        * Tests can be found in ./tests.nix

     

       8
       8
        
        * Documentation in the manual, #sec-generators

     

       9
       9
        
        */

     

       10
       10
       -
       with import ./trivial.nix;

     

       10
       10
       +
       { lib }:

     

       11
       11
       +
       with (lib).trivial;

     

       11
       12
        
       let

     

       12
       12
       -
         libStr = import ./strings.nix;

     

       13
       13
       -
         libAttr = import ./attrsets.nix;

     

       13
       13
       +
         libStr = lib.strings;

     

       14
       14
       +
         libAttr = lib.attrsets;

     

       14
       15
        
       

     

       15
       16
        
         flipMapAttrs = flip libAttr.mapAttrs;

     

       16
       17
        
       in

+2 -3

lib/licenses.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       let

     

       2
       2
       -
       

     

       3
       3
       -
         lib = import ./default.nix;

     

       4
       3
        
       

     

       5
       4
        
         spdx = lic: lic // {

     

       6
       5
        
           url = "http://spdx.org/licenses/${lic.spdxId}";

     
···

       408
       407
        
           url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE";

     

       409
       408
        
           fullName = "Notion modified LGPL";

     

       410
       409
        
         };

     

       411
       411
       -
         

     

       410
       410
       +
       

     

       412
       411
        
         ofl = spdx {

     

       413
       412
        
           spdxId = "OFL-1.1";

     

       414
       413
        
           fullName = "SIL Open Font License 1.1";

+2 -2

lib/lists.nix

···

       1
       1
        
       # General list operations.

     

       2
       2
       -
       

     

       3
       3
       -
       with import ./trivial.nix;

     

       2
       2
       +
       { lib }:

     

       3
       3
       +
       with lib.trivial;

     

       4
       4
        
       

     

       5
       5
        
       rec {

     

       6
       6

+1

lib/maintainers.nix

···

       1
       1
       +
       { ...}:

     

       1
       2
        
       /* List of NixOS maintainers. The format is:

     

       2
       3
        
       

     

       3
       4
        
           handle = "Real Name <address@example.org>";

+1 -2

lib/meta.nix

···

       1
       1
        
       /* Some functions for manipulating meta attributes, as well as the

     

       2
       2
        
          name attribute. */

     

       3
       3
        
       

     

       4
       4
       -
       let lib = import ./default.nix;

     

       5
       5
       -
       in

     

       4
       4
       +
       { lib }:

     

       6
       5
        
       

     

       7
       6
        
       rec {

     

       8
       7

+9 -7

lib/modules.nix

···

       1
       1
       -
       with import ./lists.nix;

     

       2
       2
       -
       with import ./strings.nix;

     

       3
       3
       -
       with import ./trivial.nix;

     

       4
       4
       -
       with import ./attrsets.nix;

     

       5
       5
       -
       with import ./options.nix;

     

       6
       6
       -
       with import ./debug.nix;

     

       7
       7
       -
       with import ./types.nix;

     

       1
       1
       +
       { lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib.lists;

     

       4
       4
       +
       with lib.strings;

     

       5
       5
       +
       with lib.trivial;

     

       6
       6
       +
       with lib.attrsets;

     

       7
       7
       +
       with lib.options;

     

       8
       8
       +
       with lib.debug;

     

       9
       9
       +
       with lib.types;

     

       8
       10
        
       

     

       9
       11
        
       rec {

     

       10
       12

+5 -6

lib/options.nix

···

       1
       1
        
       # Nixpkgs/NixOS option handling.

     

       2
       2
       +
       { lib }:

     

       2
       3
        
       

     

       3
       3
       -
       let lib = import ./default.nix; in

     

       4
       4
       -
       

     

       5
       5
       -
       with import ./trivial.nix;

     

       6
       6
       -
       with import ./lists.nix;

     

       7
       7
       -
       with import ./attrsets.nix;

     

       8
       8
       -
       with import ./strings.nix;

     

       4
       4
       +
       with lib.trivial;

     

       5
       5
       +
       with lib.lists;

     

       6
       6
       +
       with lib.attrsets;

     

       7
       7
       +
       with lib.strings;

     

       9
       8
        
       

     

       10
       9
        
       rec {

     

       11
       10

+2 -1

lib/sandbox.nix

···

       1
       1
       -
       with import ./strings.nix;

     

       1
       1
       +
       { lib }:

     

       2
       2
       +
       with lib.strings;

     

       2
       3
        
       

     

       3
       4
        
       /* Helpers for creating lisp S-exprs for the Apple sandbox

     

       4
       5

+1 -2

lib/sources.nix

···

       1
       1
        
       # Functions for copying sources to the Nix store.

     

       2
       2
       -
       

     

       3
       3
       -
       let lib = import ./default.nix; in

     

       2
       2
       +
       { lib }:

     

       4
       3
        
       

     

       5
       4
        
       rec {

     

       6
       5

+4 -3

lib/strings-with-deps.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       /*

     

       2
       3
        
       Usage:

     

       3
       4
        
       

     
···

       40
       41
        
         [1] maybe this behaviour should be removed to keep things simple (?)

     

       41
       42
        
       */

     

       42
       43
        
       

     

       43
       43
       -
       with import ./lists.nix;

     

       44
       44
       -
       with import ./attrsets.nix;

     

       45
       45
       -
       with import ./strings.nix;

     

       44
       44
       +
       with lib.lists;

     

       45
       45
       +
       with lib.attrsets;

     

       46
       46
       +
       with lib.strings;

     

       46
       47
        
       

     

       47
       48
        
       rec {

     

       48
       49

+2 -2

lib/strings.nix

···

       1
       1
        
       /* String manipulation functions. */

     

       2
       2
       -
       

     

       3
       3
       -
       let lib = import ./default.nix;

     

       2
       2
       +
       { lib }:

     

       3
       3
       +
       let

     

       4
       4
        
       

     

       5
       5
        
       inherit (builtins) length;

     

       6
       6

+7 -6

lib/systems/default.nix

···

       1
       1
       -
       let inherit (import ../attrsets.nix) mapAttrs; in

     

       1
       1
       +
       { lib }:

     

       2
       2
       +
         let inherit (lib.attrsets) mapAttrs; in

     

       2
       3
        
       

     

       3
       4
        
       rec {

     

       4
       4
       -
         doubles = import ./doubles.nix;

     

       5
       5
       -
         parse = import ./parse.nix;

     

       6
       6
       -
         inspect = import ./inspect.nix;

     

       7
       7
       -
         platforms = import ./platforms.nix;

     

       8
       8
       -
         examples = import ./examples.nix;

     

       5
       5
       +
         doubles = import ./doubles.nix { inherit lib; };

     

       6
       6
       +
         parse = import ./parse.nix { inherit lib; };

     

       7
       7
       +
         inspect = import ./inspect.nix { inherit lib; };

     

       8
       8
       +
         platforms = import ./platforms.nix { inherit lib; };

     

       9
       9
       +
         examples = import ./examples.nix { inherit lib; };

     

       9
       10
        
       

     

       10
       11
        
         # Elaborate a `localSystem` or `crossSystem` so that it contains everything

     

       11
       12
        
         # necessary.

+5 -4

lib/systems/doubles.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       let

     

       2
       2
       -
         lists = import ../lists.nix;

     

       3
       3
       -
         parse = import ./parse.nix;

     

       4
       4
       -
         inherit (import ./inspect.nix) predicates;

     

       5
       5
       -
         inherit (import ../attrsets.nix) matchAttrs;

     

       3
       3
       +
         inherit (lib) lists;

     

       4
       4
       +
         parse = import ./parse.nix { inherit lib; };

     

       5
       5
       +
         inherit (import ./inspect.nix { inherit lib; }) predicates;

     

       6
       6
       +
         inherit (lib.attrsets) matchAttrs;

     

       6
       7
        
       

     

       7
       8
        
         all = [

     

       8
       9
        
           "aarch64-linux"

+2 -2

lib/systems/examples.nix

···

       1
       1
        
       # These can be passed to nixpkgs as either the `localSystem` or

     

       2
       2
        
       # `crossSystem`. They are put here for user convenience, but also used by cross

     

       3
       3
        
       # tests and linux cross stdenv building, so handle with care!

     

       4
       4
       -
       

     

       5
       5
       -
       let platforms = import ./platforms.nix; in

     

       4
       4
       +
       { lib }:

     

       5
       5
       +
       let platforms = import ./platforms.nix { inherit lib; }; in

     

       6
       6
        
       

     

       7
       7
        
       rec {

     

       8
       8
        
         #

+4 -3

lib/systems/inspect.nix

···

       1
       1
       -
       with import ./parse.nix;

     

       2
       2
       -
       with import ../attrsets.nix;

     

       3
       3
       -
       with import ../lists.nix;

     

       1
       1
       +
       { lib }:

     

       2
       2
       +
       with import ./parse.nix { inherit lib; };

     

       3
       3
       +
       with lib.attrsets;

     

       4
       4
       +
       with lib.lists;

     

       4
       5
        
       

     

       5
       6
        
       rec {

     

       6
       7
        
         patterns = rec {

+5 -6

lib/systems/parse.nix

···

       4
       4
        
       # http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially

     

       5
       5
        
       # Triple::normalize. Parsing should essentially act as a more conservative

     

       6
       6
        
       # version of that last function.

     

       7
       7
       -
       

     

       8
       8
       -
       with import ../lists.nix;

     

       9
       9
       -
       with import ../types.nix;

     

       10
       10
       -
       with import ../attrsets.nix;

     

       11
       11
       -
       with (import ./inspect.nix).predicates;

     

       7
       7
       +
       { lib }:

     

       8
       8
       +
       with lib.lists;

     

       9
       9
       +
       with lib.types;

     

       10
       10
       +
       with lib.attrsets;

     

       11
       11
       +
       with (import ./inspect.nix { inherit lib; }).predicates;

     

       12
       12
        
       

     

       13
       13
        
       let

     

       14
       14
       -
         lib = import ../default.nix;

     

       15
       14
        
         setTypesAssert = type: pred:

     

       16
       15
        
           mapAttrs (name: value:

     

       17
       16
        
             assert pred value;

+1

lib/systems/platforms.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       rec {

     

       2
       3
        
         pcBase = {

     

       3
       4
        
           name = "pc";

+2 -1

lib/trivial.nix

···

       1
       1
       +
       { lib }:

     

       1
       2
        
       rec {

     

       2
       3
        
       

     

       3
       4
        
         /* The identity function

     
···

       55
       56
        
           isInt add sub lessThan

     

       56
       57
        
           seq deepSeq genericClosure;

     

       57
       58
        
       

     

       58
       58
       -
         inherit (import ./strings.nix) fileContents;

     

       59
       59
       +
         inherit (lib.strings) fileContents;

     

       59
       60
        
       

     

       60
       61
        
         # Return the Nixpkgs version number.

     

       61
       62
        
         nixpkgsVersion =

+12 -11

lib/types.nix

···

       1
       1
        
       # Definitions related to run-time type checking.  Used in particular

     

       2
       2
        
       # to type-check NixOS configurations.

     

       3
       3
       +
       { lib }:

     

       4
       4
       +
       with lib.lists;

     

       5
       5
       +
       with lib.attrsets;

     

       6
       6
       +
       with lib.options;

     

       7
       7
       +
       with lib.trivial;

     

       8
       8
       +
       with lib.strings;

     

       9
       9
       +
       let

     

       3
       10
        
       

     

       4
       4
       -
       with import ./lists.nix;

     

       5
       5
       -
       with import ./attrsets.nix;

     

       6
       6
       -
       with import ./options.nix;

     

       7
       7
       -
       with import ./trivial.nix;

     

       8
       8
       -
       with import ./strings.nix;

     

       9
       9
       -
       let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in

     

       10
       10
       -
       

     

       11
       11
       +
         inherit (lib.modules) mergeDefinitions filterOverrides;

     

       12
       12
       +
         outer_types =

     

       11
       13
        
       rec {

     

       12
       12
       -
       

     

       13
       14
        
         isType = type: x: (x._type or "") == type;

     

       14
       15
        
       

     

       15
       16
        
         setType = typeName: value: value // {

     
···

       95
       96
        
         # When adding new types don't forget to document them in

     

       96
       97
        
         # nixos/doc/manual/development/option-types.xml!

     

       97
       98
        
         types = rec {

     

       98
       98
       -
       

     

       99
       99
        
           unspecified = mkOptionType {

     

       100
       100
        
             name = "unspecified";

     

       101
       101
        
           };

     
···

       291
       291
        
           submodule = opts:

     

       292
       292
        
             let

     

       293
       293
        
               opts' = toList opts;

     

       294
       294
       -
               inherit (import ./modules.nix) evalModules;

     

       294
       294
       +
               inherit (lib.modules) evalModules;

     

       295
       295
        
             in

     

       296
       296
        
             mkOptionType rec {

     

       297
       297
        
               name = "submodule";

     
···

       395
       395
        
           addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };

     

       396
       396
        
       

     

       397
       397
        
         };

     

       398
       398
       +
       };

     

       398
       399
        
       

     

       399
       399
       -
       }

     

       400
       400
       +
       in outer_types // outer_types.types