about summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
* Merge branch 'master' into staging-nextVladimír Čunát2019-04-02
|\ | | | | | | Hydra nixpkgs: ?compare=1512490
| * Merge pull request #58330 from AerialX/msp430John Ericson2019-03-29
| |\ | | | | | | TI MSP430 cross compiling
| | * msp430: include vendor headers with stdenvAaron Lindsay2019-03-25
| | |
| | * systems: support TI MSP430 microcontrollersAaron Lindsay2019-03-25
| | |
| * | lib: lists: Alias builtins.mapMatthias Beyer2019-03-29
| |/ | | | | | | | | Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Suggested-by: Profpatsch <mail@profpatsch.de>
* | Merge master into staging-nextFrederik Rietdijk2019-03-23
|\|
| * Doc fix: use correct function name in type signature for concatIMapStringsSepNathan van Doorn2019-03-18
| |
* | Merge branch 'master' into staging-nextVladimír Čunát2019-03-10
|\| | | | | | | Hydra nixpkgs: ?compare=1508887
| * lib: add `showWarnings`Jan Malakhovski2019-03-08
| |
| * module system: revert "remove types.optionSet", just deprecate (#56857)Danylo Hlynskyi2019-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The explicit remove helped to uncover some hidden uses of `optionSet` in NixOps. However it makes life harder for end-users of NixOps - it will be impossible to deploy 19.03 systems with old NixOps, but there is no new release of NixOps with `optionSet` fixes. Also, "deprecation" process isn't well defined. Even that `optionSet` was declared "deprecated" for many years, it was never announced. Hence, I leave "deprecation" announce. Then, 3 releases after announce, we can announce removal of this feature. This type has to be removed, not `throw`-ed in runtime, because it makes some perfectly fine code to fail. For example: ``` $ nix-instantiate --eval -E '(import <nixpkgs/lib>).types' --strict trace: `types.list` is deprecated; use `types.listOf` instead error: types.optionSet is deprecated; use types.submodule instead (use '--show-trace' to show detailed location information) ```
| * lib: optionAttrSetToDocList: warn instead of throwing on options without ↵Jan Malakhovski2019-03-05
| | | | | | | | | | | | descriptions For convenience, it's not like not having a description is deadly or something.
* | Merge staging-next into stagingFrederik Rietdijk2019-03-01
|\|
| * cross/tests: add llvm-based testsMatthew Bauer2019-02-26
| |
| * Merge pull request #56393 from matthewbauer/is-compatibleMatthew Bauer2019-02-26
| |\ | | | | | | systems: add isCompatible handling
| | * systems: add “emultator” for wasmMatthew Bauer2019-02-25
| | | | | | | | | | | | v8 can run any wasm bytecode
| | * systems: add isCompatible handlingMatthew Bauer2019-02-21
| | |
| * | 19.09 is Loris.Linus Heckemann2019-02-25
| | | | | | | | | | | | https://en.wikipedia.org/wiki/Loris
* | | Merge pull request #56197 from matthewbauer/cross-fixes3Matthew Bauer2019-02-26
|\ \ \ | | | | | | | | Android and related cross fixes
| * | | mesa: armv7a-linux supports mesaMatthew Bauer2019-02-24
| |/ /
* / / netbsd: add cross targetMatthew Bauer2019-02-26
|/ /
* | Merge pull request #55488 from winpat/add_dirvishxeji2019-02-24
|\ \ | | | | | | dirvish: init at 1.2.1
| * | lib.licenses: add Open Software License 2.0Patrick Winter2019-02-09
| | |
* | | Merge pull request #54528 from cdepillabout/module-alias-uses-prioritySilvan Mosberger2019-02-23
|\ \ \ | | | | | | | | lib/modules: Change mkAliasOptionModule to use the priority for the alias
| * | | Fix the documentation for the tests to reflect what is actually happening.(cdep)illabout2019-02-07
| | | |
| * | | lib/modules: Change mkAliasOptionModule to use the priority for the alias.(cdep)illabout2019-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the `mkAliasOptionModule` function to make sure that the priority for the aliased option is propagated to the non-aliased option. This also affects the `mkRenamedOptionModule` function in a similar fashion. This also removes the `mkAliasOptionModuleWithPriority` function, since its functionality is now subsumed by `mkAliasOptionModule`. This change was recommended by @nbp: https://github.com/NixOS/nixpkgs/pull/53397#discussion_r245487432
* | | | alpha-embedded: isAlpha code Added (#56090)Vincent Weisner2019-02-20
| | | | | | | | | | | | Adds isAlpha to stdenv.<platform> flags.
* | | | Merge master into staging-nextFrederik Rietdijk2019-02-16
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #55129 from oxij/tree/move-defaults-to-package-filesMichael Raskin2019-02-13
| |\ \ \ | | | | | | | | | | all-packages.nix: move defaults to package files
| | * | | lib: tiny cleanupJan Malakhovski2019-02-03
| | | | |
* | | | | Merge branch 'staging-next' into stagingVladimír Čunát2019-02-01
|\| | | |
| * | | | Merge branch 'master' into staging-nextVladimír Čunát2019-02-01
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
| | * | | types.optionSet: deprecate and remove last usagesdanbst2019-01-31
| | | | |
| | * | | lib/modules.nix: small eval optimization (foldl' + foldl' + attrNames -> ↵danbst2019-01-30
| | | | | | | | | | | | | | | | | | | | foldl' + mapAttrs)
| | * | | lib/types.nix: small eval optimization (listToAttrs + mapAttrsToList -> ↵danbst2019-01-30
| | | | | | | | | | | | | | | | | | | | mapAttrs)
| | * | | linux: convert hardened-config to a structured oneMatthieu Coudron2019-01-28
| | | | |
| | * | | linux: ability to merge structured configsMatthieu Coudron2019-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make the composability of kernel configurations more straigthforward. - now distinguish freeform options from tristate ones - will look for a structured config in kernelPatches too one can now access the structuredConfig from a kernel via linux_test.configfile.structuredConfig in order to reinject it into another kernel, no need to rewrite the config from scratch The following merge strategies are used in case of conflict: -- freeform items must be equal or they conflict (mergeEqualOption) -- for tristate (y/m/n) entries, I use the mergeAnswer strategy which takes the best available value, "best" being defined by the user (by default "y" > "m" > "n", e.g. if one entry is both marked "y" and "n", "y" wins) -- if one item is both marked optional/mandatory, mandatory wins (mergeFalseByDefault)
| | * | | systems/default.nix: wasm in platform.uname.systemMatthew Bauer2019-01-27
| | |/ / | | | | | | | | This adds the "Wasm" system to platform.uname.system. This is used in CMake infrastructure.
* | | | Merge #51447: libpng: 1.6.35 -> 1.6.36, license v2Vladimír Čunát2019-01-19
|\ \ \ \ | |/ / / |/| | | | | | | (into staging)
| * | | libpng2: link to license, SPDX seems geared to old versionWill Dietz2018-12-29
| | | | | | | | | | | | | | | | See https://github.com/NixOS/nixpkgs/pull/51447 for some discussion.
| * | | libpng: 1.6.35 -> 1.6.36, license v2Will Dietz2018-12-29
| | | |
* | | | Merge staging-next into stagingFrederik Rietdijk2019-01-19
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #50561 from oxij/lib/setPrioMichael Raskin2019-01-18
| |\ \ \ | | | | | | | | | | lib: implement `setPrio`
| | * | | lib: implement `setPrio`Jan Malakhovski2018-11-22
| | | | | | | | | | | | | | | | | | | | For when `hiPrio` and `lowPrio` are not enough.
* | | | | Merge staging-next into stagingFrederik Rietdijk2019-01-15
|\| | | |
| * | | | Merge pull request #53397 from cdepillabout/aliasoptionmodule-set-priorityNicolas B. Pierron2019-01-14
| |\ \ \ \ | | | | | | | | | | | | lib/modules: Add function to create option alias that respects priority
| | * | | | Add test that shows that the aliases are able to override options.(cdep)illabout2019-01-06
| | | | | |
| | * | | | Pull out defaultPriority to a top-level definition.(cdep)illabout2019-01-06
| | | | | |
| | * | | | lib/modules: Add a function to create an option alias that respects the priority(cdep)illabout2019-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a function `mkAliasOptionModuleWithPriority`. This function will make an alias to an existing option and copy over the priority. This functionality is needed for PRs like #53041. In that case `nixos-generate-config` added an option to `hardware-configuration.nix` with `mkDefault`. That option was then changed and an alias created for the old name. The end user should be able to set the non-alias option in their `configuration.nix` and have everything work correctly. Without this function, the priority for the option won't be copied over correctly and the end-user will get a message saying they have the same option set to two different values.
| | * | | | Add a failing test for mkAliasOptionModule.(cdep)illabout2019-01-04
| | | | | |
* | | | | | Merge staging-next into stagingFrederik Rietdijk2019-01-13
|\| | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-19 07:15:37 +0000