Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: e4d710b1c94b
head repository: NixOS/nixpkgs-channels
compare: 7319061eef4f
- 16 commits
- 8 files changed
- 7 contributors
Commits on May 9, 2020
Commits on May 13, 2020
-
dockerTools.examples: fix the nginx image
Nginx now requires directories `/var/log/nginx` and `/var/cache/nginx` to be existing. The objective is to fix the test `nixosTests.docker-tools`.
-
maintainers/scripts/update.nix: Import lib into scope
This will make it easier to change it if we want to decouple from pkgs.
-
maintainers/scripts/update.nix: derivation is the final station
It does not make sense to look for derivations within derivations, not even when `recurseForDerivations` is true. Nix does not do that either: https://github.com/NixOS/nix/blob/ebc024df2287085d48ed6194aa756fd70c07f76c/src/libexpr/get-drvs.cc#L346-L355
-
maintainers/scripts/update.nix: refactor package collector
The `packagesWith` function expected an attrSet but `packagesWithUpdateScript` could be passing it a derivation or a list when the attribute path supplied by user through the `--argstr path` argument pointed to one. It only worked because derivations are also attrSets and contain their outputs as attributes, and did not work for lists at all. Additionally, the improper handling would cause the `src` attribute to be built in some rare cases (`mkYarnPackage` seems to trigger this). Rewriting the `packagesWith` function to be inductive with a derivation as a base case and attrSets and lists as inductive steps is much cleaner and also fixes the unnecessary build.
-
Commits on May 15, 2020
-
-
Dropped the patch, as it is included in the point release. Switched the hash representation to regular base32.
-
alot: replace geistesk as maintainer
As requested by geistesk here: NixOS/nixpkgs#87803 (comment)
-
-
-
Merge pull request #87346 from r-ryantm/auto-update/python2.7-latexcodec
python27Packages.latexcodec: 1.0.7 -> 2.0.0
-
/build/source/include/metadata/modules.h:122:1: note: in expansion of macro 'MOD_PLUGIN' 122 | MOD_PLUGIN(slap_delay_mono, plugin_ui) | ^~~~~~~~~~ lv2.cpp:414:43: error: invalid conversion from 'void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*)' {aka 'void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)'} to 'void* (*)(const LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*)' {aka 'void* (*)(const LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)'} [-fpermissive] 414 | d->instantiate = lv2ui_instantiate; \ | ^~~~~~~~~~~~~~~~~ | | | void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*) {aka void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)}
-
Merge pull request #87725 from nlewo/fix-dockertools
dockerTools.examples: fix the nginx image
-
Merge pull request #87803 from aepsil0n/upgrade-alot-0.9.1
alot: 0.9 → 0.9.1
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff e4d710b1c94b...7319061eef4f