about summary refs log tree commit diff
path: root/lib
Commit message (Expand)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2020-01-10
|\
| * lib/modules: Switch _module.args from attrsOf to lazyAttrsOfSilvan Mosberger2020-01-10
| * lib/tests: Add tests for attrsOf and lazyAttrsOfSilvan Mosberger2020-01-10
| * lib/types: Introduce lazyAttrsOfSilvan Mosberger2020-01-10
| * lib/types: Add emptyValue attribute to typesSilvan Mosberger2020-01-10
| * lib/modules: Move the isDefined check into mergedValueSilvan Mosberger2020-01-10
| * lib/tests: Fix module testsSilvan Mosberger2020-01-10
* | Merge master into staging-nextFrederik Rietdijk2020-01-10
|\|
| * lib/tests: Add test case for imports from derivationsSilvan Mosberger2020-01-10
| * lib/modules: Fix store importsSilvan Mosberger2020-01-10
| * Merge pull request #76857 from Infinisil/recursive-disableModulesSilvan Mosberger2020-01-09
| |\
| | * lib/tests: Add tests for recursive disabledModulesSilvan Mosberger2020-01-09
| | * lib/modules: Recursive disabledModulesSilvan Mosberger2020-01-09
* | | Merge branch 'master' into staging-nextVladimír Čunát2020-01-08
|\| |
| * | Clarify error message of 'assigning to top-level attribute' (#76702)Silvan Mosberger2020-01-08
| |\ \
| | * | lib/modules: clarify error message of 'assigning to top-level attribute'Arnout Engelen2020-01-05
* | | | Merge master into staging-nextFrederik Rietdijk2020-01-07
|\| | |
| * | | Merge pull request #77133 from Infinisil/fix-path-checkSilvan Mosberger2020-01-07
| |\ \ \
| | * | | lib/types: Fix path type checkSilvan Mosberger2020-01-06
| * | | | lib/types: warn loaOf is deprecatedrnhmjoj2020-01-06
| * | | | lib/tests: remove strictly loaOf tests and rebase on attrsOfrnhmjoj2020-01-06
| |/ / /
* | | | Merge pull request #74284 from matthewbauer/ios-with-xcode-11Matthew Bauer2020-01-03
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into ios-with-xcode-11Matthew Bauer2020-01-03
| |\ \ \
| * | | | lib/systems: use newer ios sdkMatthew Bauer2020-01-03
* | | | | lib/tests: Temporarily disable submodule path testSilvan Mosberger2020-01-03
* | | | | Revert "lib/types: Allow paths as submodule values"Silvan Mosberger2020-01-03
| |_|_|/ |/| | |
* | | | Module system improvements for NixOS as a submodule (#75031)Silvan Mosberger2020-01-02
|\ \ \ \ | |_|/ / |/| | |
| * | | lib/tests: Add submoduleWith testsSilvan Mosberger2020-01-02
| * | | lib/types: Allow paths as submodule valuesSilvan Mosberger2020-01-02
| * | | lib/modules: Don't pack submodules speciallySilvan Mosberger2020-01-01
| * | | lib/types: Add types.submoduleWith for more flexibility than types.submoduleSilvan Mosberger2020-01-01
| * | | lib/modules: Make unifyModuleSyntax fully idempotentSilvan Mosberger2019-12-05
| * | | lib/modules: file -> _file for a more idempotent unifyModuleSyntaxSilvan Mosberger2019-12-05
| | |/ | |/|
* | | Merge branch 'ghcjs-cross-without-cc-19.09' into ghcjs-cross-without-ccJohn Ericson2019-11-25
|\ \ \
| * | | Fix lib testsJohn Ericson2019-11-25
* | | | Merge remote-tracking branch 'upstream/master' into ghcjs-cross-without-ccJohn Ericson2019-11-25
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #72657 from cleverca22/vc4John Ericson2019-11-24
| |\ \
| | * | initial implementation of vc4 cross-compileMichael Bishop2019-11-19
| * | | Merge remote-tracking branch 'upstream/master' into wrapper-pname-supportJohn Ericson2019-11-24
| |\| | | | |/ | |/|
| | * Merge remote-tracking branch 'upstream/master' into mingw-mcfthreadsJohn Ericson2019-11-11
| | |\
| | | * Merge pull request #72727 from oxalica/mips-parseMatthew Bauer2019-11-06
| | | |\
| | | | * lib.systems: remove redundant mappingoxalica2019-11-04
| | | | * lib.systems: handle mips family properlyoxalica2019-11-03
| | | * | Add note: Keep error message in sync with nixos-optionChuck2019-11-04
| | | |/
| | | * Merge pull request #67809 from Infinisil/propagate-override-argsSilvan Mosberger2019-10-22
| | | |\
| | | | * lib/makeOverridable: RefactorSilvan Mosberger2019-09-05
| | | | * lib/makeOverridable: Remove unimplemented overrideDerivation for functionsSilvan Mosberger2019-09-05
| | | | * lib/makeOverridable: Propagate function args of the callPackage'd functionSilvan Mosberger2019-09-05
| | | | * lib/makeOverridable: Propagate function arguments to override functionsSilvan Mosberger2019-09-05
| | | | * lib/makeOverridable: Abstract result overridingSilvan Mosberger2019-09-05