summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
* 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 #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
|\| | | | |
| * | | | | Merge pull request #53754 from danbst/lib-fake-hashesJörg Thalheim2019-01-10
| |\ \ \ \ \ | | | | | | | | | | | | | | lib: add fake hashes
| | * | | | | lib: add shortcuts for fake hashes (fakeSha256, fakeSha512)danbst2019-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fake hashes can be used as placeholders for all the places, where Nix expression requires a hash, but we don't yet have one. This should be more convenient than following: - echo|sha256sum, copy into clipboard, go to editor, paste into previously edited place - search nixpkgs for a random package, copy it's hash to cliboard, go to editor, paste into previously edited place Nix can add support for these fake hashes. In that case printed error should contain only 1 hash, so no more problem "which of two hashes from error should I use?" Idea by irc:Synthetica
* | | | | | | add generic x86_32 support (#52634)Daniel Goertzen2019-01-06
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add generic x86_32 support - Add support for i386-i586. - Add `isx86_32` predicate that can replace most uses of `isi686`. - `isi686` is reinterpreted to mean "exactly i686 arch, and not say i585 or i386". - This branch was used to build working i586 kernel running on i586 hardware. * revert `isi[345]86`, remove dead code - Remove changes to dead code in `doubles.nix` and `for-meta.nix`. - Remove `isi[345]86` predicates since other cpu families don't have specific model predicates. * remove i386-linux since linux not supported on that cpu
* | | | | | Merge branch 'master' into staging-nextVladimír Čunát2019-01-05
|\| | | | | | | | | | | | | | | | | | | | | | | A few more rebuilds (~1k on x86_64-linux).
| * | | | | Merge pull request #53029 from Ericson2314/windows-ce-armJohn Ericson2019-01-04
| |\ \ \ \ \ | | |/ / / / | |/| | | | lib: Fix Mingw on 32-bit ARM
| | * | | | lib: Fix Mingw on 32-bit ARMJohn Ericson2019-01-04
| | | | | |
* | | | | | Merge master into staging-nextFrederik Rietdijk2018-12-31
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Remove composableDerivation, closes #18763Frederik Rietdijk2018-12-30
| |/ / /
* | | | Merge branch 'master' into stagingJan Tojnar2018-12-25
|\| | |
| * | | licenses: update SPDX IDs (#52711)Orivej Desh2018-12-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the bottom of https://spdx.org/licenses/ for the list of deprecations. The explicit URLs of agpl3Plus and gpl2Classpath were dropped because the default SPDX URL is correct. wxWindows ID had wrong capitalization.
| * | | Initial attempt to restore Android NDK cross buildingSander van der Burg2018-12-18
| | | |
* | | | Merge branch 'staging' into make-perl-pathdvolth2018-12-18
|\ \ \ \
| * | | | Merge remote-tracking branch 'upstream/master' into stagingJan Tojnar2018-12-16
| |\| | |
| | * | | Merge pull request #51884 from alyssais/bundlerEnv-groupsAlyssa Ross2018-12-12
| | |\ \ \ | | | | | | | | | | | | bundlerEnv: improve handling of groups
| | | * | | bundlerEnv: ensure dependencies always includedAlyssa Ross2018-12-11
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose I have a Gemfile like this: source "https://rubygems.org" gem "actioncable" gem "websocket-driver", group: :test The gemset.nix generated by Bundix 2.4.1 will set ActionCable's groups to [ "default" ], and websocket-driver's to [ "test" ]. This means that the generated bundlerEnv wouldn't include websocket-driver unless the test group was included, even though it's required by the default group. This is arguably a bug in Bundix (websocket-driver's groups should probably be [ "default" "test" ] or just [ "default" ]), but there's no reason bundlerEnv should omit dependencies even given such an input -- it won't necessarily come from Bundix, and it would be good for bundlerEnv to do the right thing. To fix this, filterGemset is now a recursive function, that adds dependencies of gems in the group to the filtered gemset until it stabilises on the gems that match the required groups, and all of their recursive dependencies.
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-16 02:45:13 +0000