Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: e4d710b1c94b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 7319061eef4f
Choose a head ref
  • 16 commits
  • 8 files changed
  • 7 contributors

Commits on May 9, 2020

  1. Copy the full SHA
    8007a72 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. 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`.
    nlewo committed May 13, 2020
    Copy the full SHA
    9ac444d View commit details
    Browse the repository at this point in the history
  2. maintainers/scripts/update.nix: Import lib into scope

    This will make it easier to change it if we want to decouple from pkgs.
    jtojnar committed May 13, 2020
    Copy the full SHA
    8f50956 View commit details
    Browse the repository at this point in the history
  3. 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
    jtojnar committed May 13, 2020
    Copy the full SHA
    fab2ee8 View commit details
    Browse the repository at this point in the history
  4. 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.
    jtojnar committed May 13, 2020
    Copy the full SHA
    3f3aeb7 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    96f3c62 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. Copy the full SHA
    9774e87 View commit details
    Browse the repository at this point in the history
  2. alot: 0.9 → 0.9.1

    Dropped the patch, as it is included in the point release.
    
    Switched the hash representation to regular base32.
    milibopp committed May 15, 2020
    Copy the full SHA
    0682ec4 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    136aebc View commit details
    Browse the repository at this point in the history
  4. alot: replace geistesk as maintainer

    As requested by geistesk here:
    NixOS/nixpkgs#87803 (comment)
    milibopp committed May 15, 2020
    Copy the full SHA
    c562954 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    b0df5a6 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    a762c0e View commit details
    Browse the repository at this point in the history
  7. Merge pull request #87346 from r-ryantm/auto-update/python2.7-latexcodec

    python27Packages.latexcodec: 1.0.7 -> 2.0.0
    dotlambda committed May 15, 2020
    Copy the full SHA
    a6a5cba View commit details
    Browse the repository at this point in the history
  8. lsp-plugins: Fix build

    	/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*)}
    jtojnar committed May 15, 2020
    Copy the full SHA
    7ac7382 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #87725 from nlewo/fix-dockertools

    dockerTools.examples: fix the nginx image
    nlewo committed May 15, 2020
    Copy the full SHA
    df928fa View commit details
    Browse the repository at this point in the history
  10. Merge pull request #87803 from aepsil0n/upgrade-alot-0.9.1

    alot: 0.9 → 0.9.1
    teto committed May 15, 2020
    Copy the full SHA
    7319061 View commit details
    Browse the repository at this point in the history