about summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
...
* makeSearchPath (and derivatives): check outputUnspecifiedNikolay Amiantov2016-04-13
|
* makePerlPath: try to guess outputsNikolay Amiantov2016-04-13
|
* makeSearchPathOutputs: init functionNikolay Amiantov2016-04-13
|
* tryAttrs: init functionNikolay Amiantov2016-04-13
|
* makeBinPath: guess outputsNikolay Amiantov2016-04-13
|
* Merge pull request #14647 from MostAwesomeDude/tahoezimbatm2016-04-13
|\ | | | | Tahoe-LAFS improvements
| * tahoe-lafs: 1.10.2 -> 1.11.0Corbin2016-04-12
| | | | | | | | Also add myself to maintainers, as I *do* care about this package.
* | Merge branch 'staging', containing closure-size #7701Vladimír Čunát2016-04-13
|\ \
| * | Merge branch 'master' into closure-sizeVladimír Čunát2016-04-10
| |\| | | | | | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
| * | Merge #12653: rework default outputsVladimír Čunát2016-04-07
| |\ \
| | * \ Merge branch 'closure-size' into p/default-outputsVladimír Čunát2016-03-14
| | |\ \
| | * | | nixos systemPackages: rework default outputsVladimír Čunát2016-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Now `pkg.outputUnspecified = true` but this attribute is missing in every output, so we can recognize whether the user chose or not. If (s)he didn't choose, we put `pkg.bin or pkg.out or pkg` into `systemPackages`. - `outputsToLink` is replaced by `extraOutputsToLink`. We add extra outputs *regardless* of whether the user chose anything. It's mainly meant for outputs with docs and debug symbols. - Note that as a result, some libraries will disappear from system path.
| * | | | Merge 'staging' into closure-sizeVladimír Čunát2016-04-07
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
| * \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
| * | | | | Merge master into closure-sizeVladimír Čunát2016-03-08
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
| * \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2016-02-14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Let's get rid of those merge conflicts.
| * | | | | | | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeVladimír Čunát2015-12-31
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
| * \ \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-12-11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into closure-sizeLuca Bruno2015-11-29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into closure-sizeLuca Bruno2015-11-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge staging into closure-sizeVladimír Čunát2015-11-20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge staging into closure-sizeVladimír Čunát2015-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes gcc5 the default builder, etc.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit staging+systemd into closure-sizeVladimír Čunát2015-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many non-conflict problems weren't (fully) resolved in this commit yet.
| * | | | | | | | | | | | | | | systemPackages, makeLibraryPath: try to guess outputsVladimír Čunát2015-05-05
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #14618 from moretea/update_mcrl2joachifm2016-04-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mcrl2
| * | | | | | | | | | | | | | | | mcrl2: 2009.01 -> 2014.09Maarten Hoogendoorn2016-04-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #14613 from cransom/jpjoachifm2016-04-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jp
| * | | | | | | | | | | | | | | | Add @cransom as a maintainerCasey Ransom2016-04-11
| |/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / Substite new GitHub username ‘timbertson’ for ‘gfxmonk’Tobias Geerinckx-Rice2016-04-11
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #14518 from CrystalGamma/masterjoachifm2016-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lombok: init at 1.16.8
| * | | | | | | | | | | | | | | lombok: init at 1.16.8Jona Stubbe (CrystalGamma)2016-04-09
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #14498 from expipiplus1/python-cgkitFrederik Rietdijk2016-04-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | pythonPackages.cgkit: init at 2.0.0
| * | | | | | | | | | | | | | | pythonPackages.cgkit: Add maintenance informationJoe Hermaszewski2016-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @expipiplus as a maintainer.
* | | | | | | | | | | | | | | | discord: init at 0.0.1ldesgoui2016-04-05
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Stronger warning against usage of splitStringEelco Dolstra2016-04-01
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | xe-guest-utilities: init at 6.2.0Ben Booth2016-03-30
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use mkEnableOption use sha256 add xe-guest-utilities to module-list.nix
* | | | | | | | | | | | | | Merge pull request #14186 from LatitudeEngineering/latitude/topic/qgroundcontrolzimbatm2016-03-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qgroundcontrol: init at 2.9.4
| * | | | | | | | | | | | | | qgroundcontrol: init at 2.9.4Patrick Callahan2016-03-24
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | dvdbackup: init at 0.4.2Brad Ediger2016-03-24
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #14045 from otwieracz/masterArseniy Seroka2016-03-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | znapzend: added
| * | | | | | | | | | | | | | znapzend: init at 0.15.3Slawomir Gonet2016-03-24
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | mxu11x0: init at 1.3.11Svintsov Dmitry2016-03-24
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #14023 from Adjective-Object/add/ansifilterjoachifm2016-03-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ansifilter: add @ 1.15
| * | | | | | | | | | | | | | | ansifilter: init at 1.15Maxwell2016-03-21
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | dynamic-colors: 2013-12-28 -> 0.2.1Peter Hoeg2016-03-19
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | lib/types: Revert handling submodules for "either"aszlig2016-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f0805b, because @nbp had concerns about whether this would be a good idea and pointed out problems with this. We currently do not have a case where "either" is used in conjunction with submodules, but I'm reverting it anyway to prevent people from adding options using that type in that way. This is now being reviewed in #14053. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | | | | | | | | | | | lib/types: Handle submodules for type "either"aszlig2016-03-19
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the "either" type only handled "flat" types, so you couldn't do something like: type = either int (submodule { options = ...; }); Not only caused this the submodule's options not being checked but also not show up in the documentation. This was something we stumbled on with #13916. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra
* | | | | | | | | | | | | | | yamdi: init at 1.9Ryan Artecona2016-03-16
| | | | | | | | | | | | | | |