summary refs log tree commit diff
path: root/lib
Commit message (Expand)AuthorAge
* Merge pull request #53397 from cdepillabout/aliasoptionmodule-set-priorityNicolas B. Pierron2019-01-14
|\
| * 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
| * Add a failing test for mkAliasOptionModule.(cdep)illabout2019-01-04
* | Merge pull request #53754 from danbst/lib-fake-hashesJörg Thalheim2019-01-10
|\ \
| * | lib: add shortcuts for fake hashes (fakeSha256, fakeSha512)danbst2019-01-10
* | | Merge branch 'master' into staging-nextVladimír Čunát2019-01-05
|\| |
| * | Merge pull request #53029 from Ericson2314/windows-ce-armJohn Ericson2019-01-04
| |\ \ | | |/ | |/|
| | * 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
| * 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: ensure dependencies always includedAlyssa Ross2018-12-11
| | * | ikos: init at 2.1Etienne Laurin2018-12-12
| | |/
| * / platform.emulator: fix non-x86 systemsJörg Thalheim2018-12-12
| |/
* / lib.makePerlPath -> perlPackages.makePerlPathvolth2018-12-15
|/
* systems/parse.nix: support eabihfMatthew Bauer2018-12-02
* Merge master into staging-nextFrederik Rietdijk2018-11-30
|\
| * Merge pull request #50212 from matthewbauer/host-emulatorMatthew Bauer2018-11-29
| |\
| | * treewide: add emulator to platformMatthew Bauer2018-11-29
| | * systems/examples.nix: move riscv function to let bindingMatthew Bauer2018-11-29
* | | Merge master into staging-nextFrederik Rietdijk2018-11-22
|\| |
| * | Merge pull request #50532 from typetetris/add-extends-exampleRobert Hensing2018-11-21
| |\ \
| | * | lib/fixed-points.nix: add an example for extendsEric Wolf2018-11-21
| * | | systems/parse: add older x86 architecturesMatthew Bauer2018-11-21
* | | | Merge staging-next into stagingFrederik Rietdijk2018-11-18
|\| | |
| * | | lib/licenses: remove bsl10Linus Heckemann2018-11-16
| * | | lib/licenses: mark some as unfreeLinus Heckemann2018-11-16
| * | | group the release infozimbatm2018-11-15
| |/ /
| * | Merge pull request #49588 from vincrusher/masterMatthew Bauer2018-11-12
| |\ \
| | * | lib/systems: Added missing semicolonsVincent Weisner2018-11-09
| | * | lib/system: Added Embedded Platforms for the CPUsVincent Weisner2018-11-09
| | * | Update parse.nixVincent Weisner2018-11-02
| | * | CPU FixJörg Thalheim2018-11-01
| | * | Update parse.nixVincent Weisner2018-11-01
* | | | Merge staging-next into stagingFrederik Rietdijk2018-11-11
|\| | |
| * | | Merge pull request #48687 from danielrutz/port-typeSilvan Mosberger2018-11-10
| |\ \ \
| | * | | Add type port as an alias to u16Daniel Rutz2018-10-18
| * | | | cwebbin: add licenseMarkus Kowalewski2018-11-08
| * | | | lib: commitIdFromGitRepo: simplify a tiny bitJan Malakhovski2018-11-08
| | |_|/ | |/| |
* / | | make-derivation: use pname-version as default name if both are presentPatrick Hilhorst2018-11-06
|/ / /
* | / jasper: add licenseMarkus Kowalewski2018-11-01
| |/ |/|
* | Merge pull request #49567 from obsidiansystems/arm-auto-detectJohn Ericson2018-10-31
|\ \
| * | lib.systems.platforms: Add more ARM autodetectionJohn Ericson2018-10-31