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: 0a784c094f2c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: b66d6f404ef7
Choose a head ref
  • 19 commits
  • 37 files changed
  • 10 contributors

Commits on Sep 29, 2018

  1. Configuration menu
    Copy the full SHA
    5c5ea8b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    00262d7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41cb592 View commit details
    Browse the repository at this point in the history
  4. zig: 0.2.0 -> 0.3.0

    andrewrk committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    f2fe5f7 View commit details
    Browse the repository at this point in the history
  5. patchelf: fix license

    Use the attr set instead of a string
    bhipple committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    d7003ed View commit details
    Browse the repository at this point in the history
  6. Merge pull request #47539 from bhipple/l/patchelf

    patchelf: fix license
    matthewbauer committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    99add16 View commit details
    Browse the repository at this point in the history
  7. mosh: fix clang build

    The darwin build started to fail because of protobuf c++11 related
    errors https://hydra.nixos.org/build/82082958.
    LnL7 committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    9d59281 View commit details
    Browse the repository at this point in the history
  8. linux: 4.4.158 -> 4.4.159

    NeQuissimus committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    7769fd6 View commit details
    Browse the repository at this point in the history
  9. linux: 4.9.129 -> 4.9.130

    NeQuissimus committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    74f56e1 View commit details
    Browse the repository at this point in the history
  10. linux: 4.14.72 -> 4.14.73

    NeQuissimus committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    00e5778 View commit details
    Browse the repository at this point in the history
  11. linux: 4.18.10 -> 4.18.11

    NeQuissimus committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    5eefdeb View commit details
    Browse the repository at this point in the history
  12. Merge pull request #47541 from LnL7/darwin-mosh

    mosh: fix clang build
    Mic92 committed Sep 29, 2018
    Configuration menu
    Copy the full SHA
    02658a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2018

  1. Configuration menu
    Copy the full SHA
    74df71b View commit details
    Browse the repository at this point in the history
  2. NIX_PATH: don't prepend $HOME-based value in session variable, set later

    environment.sessionVariables cannot refer to the values of env vars,
    and as a result this has caused problems in a variety of scenarios.
    
    One use for these is that they're injected into /etc/profile,
    elewhere these are used to populate an 'envfile' for pam
    (`pam 5 pam_env.conf`) which mentions use of HOME being
    potentially problematic.
    
    Anyway if the goal is to make things easier for users,
    simply do the NIX_PATH modification as extraInit.
    
    This fixes the annoying problems generated by the current approach
    (#40165 and others) while hopefully serving the original goal.
    
    One way to check if things are borked is to try:
    
    $ sudo env | grep NIX_PATH
    
    Which (before this change) prints NIX_PATH variable with
    an unexpanded $HOME in the value.
    
    -------
    
    This does mean the following won't contain user channels for 'will':
    $ sudo -u will nix-instantiate --eval -E builtins.nixPath
    
    However AFAICT currently they won't be present either,
    due to unescaped $HOME.  Unsure if similar situation for other users
    of sessionVariables (not sudo) work with current situation
    (if they exist they will regress after this change AFAIK).
    dtzWill authored and grahamc committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    f3a114e View commit details
    Browse the repository at this point in the history
  3. nix-daemon: only add channels dir to NIX_PATH if exists

    Per reviewer comment (thanks!).
    dtzWill authored and grahamc committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    243e28b View commit details
    Browse the repository at this point in the history
  4. Revert "Revert "doc: Update section about imperative containers""

    I fixed the problem.
    
    This reverts commit 74df71b.
    grahamc committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    9622cd3 View commit details
    Browse the repository at this point in the history
  5. docs: format

    grahamc committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    8413f22 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #47534 from andrewrk/zig-0.3.0

    zig: 0.2.0 -> 0.3.0
    dtzWill committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    b5ba81a View commit details
    Browse the repository at this point in the history
  7. Merge pull request #47530 from dtzWill/update/libreoffice-2018-09-29

    libreoffice-fresh: 6.1.1.2 -> 6.1.2.1
    dtzWill committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    b66d6f4 View commit details
    Browse the repository at this point in the history