Skip to content
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
base: d9a5fa5780e7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0bd37b4da93b
Choose a head ref
  • 17 commits
  • 62 files changed
  • 11 contributors

Commits on Mar 18, 2017

  1. nixos/treewide: remove boolean examples for options

    They contain no useful information and increase the length of the
    autogenerated options documentation.
    
    See discussion in #18816.
    
    (cherry picked from commit 9536169)
    fpletz authored and globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    2105794 View commit details
    Browse the repository at this point in the history
  2. neo4j service: increase file limit, per warning emitted at startup (#…

    …23961)
    
    (cherry picked from commit 63f1a14)
    dtzWill authored and globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    24c5f09 View commit details
    Browse the repository at this point in the history
  3. atom: avoid using LD_PRELOAD. Fixes glibc compat issues

    The wrapper for Atom was loading libraries via LD_PRELOAD, for example
    libxkbfile. Now, if you installed atom via nix-env and happened to use a newer
    nixpkgs for that than what your system environment is build against, you could
    end up with an error like this:
    
    ```
    uname: relocation error:
    /nix/store/68sa3m89shpfaqq1b9xp5p1360vqhwx6-glibc-2.25/lib/libdl.so.2:
    symbol _dl_catch_error, version GLIBC_PRIVATE not defined in file libc.so.6
    with link time reference
    ```
    
    This happens because atom calls the `uname` executable from the system to
    determine the platform. Because that inherits the `LD_PRELOAD` environment
    variable, so the libxkbfile library that the `atom` wrapper was build against
    is loaded into `uname`. But since `atom` comes from `nix-env`, the `libxkbfile`
    it was built with might be compiled against a newer version of `glibc` than
    `uname`, which comes from the system, was! Having two versions of glibc loaded
    into the same processes results in chaos.
    
    To fix this, we avoid setting `LD_PRELOAD` and instead use patchelf to set the
    correct RPATH. RPATH is not inherited by child processes, so the above issue
    can no longer occur.
    
    The only small complication here is that the library that actually loads
    libxkbfile is not the atom binary itself, but a node extension that atom uses.
    So instead of setting the RPATH on `atom` only, we also set the `rpath` on all
    node extensions (`*.node`) the output.
    
    (cherry picked from commit a4d6e2c)
    bennofs authored and globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    69427c7 View commit details
    Browse the repository at this point in the history
  4. libsodium: 1.0.11 -> 1.0.12

    (cherry picked from commit 3fac05b)
    joachifm authored and globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    e10f141 View commit details
    Browse the repository at this point in the history
  5. tvheadend: fix typo in package description

    (cherry picked from commit ff7506d)
    NickHu authored and globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    244d44e View commit details
    Browse the repository at this point in the history
  6. nixos/release.nix: added tests.wordpress

    (cherry picked from commit 6022a79)
    qknight authored and globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    2339114 View commit details
    Browse the repository at this point in the history
  7. gnome_mplayer: fix src and build

    (cherry picked from commit 4e2f802)
    globin committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    f7fcede View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b249f7f View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820

    (cherry picked from commit d440981)
    joachifm committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    07c2541 View commit details
    Browse the repository at this point in the history
  2. linux_4_9: 4.9.15 -> 4.9.16

    (cherry picked from commit b5da6ca)
    joachifm committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    35e6ef8 View commit details
    Browse the repository at this point in the history
  3. kdelibs: remove sanitize patch

    because its included in 4.14.30 which was part of Applications 16.12.3.
    #23992 (comment)
    
    (cherry picked from commit 2478f7b)
    FRidh authored and vcunat committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    d685191 View commit details
    Browse the repository at this point in the history
  4. setuptools_scm: 1.11.1 -> 1.15.0

    (cherry picked from commit f32fc9b)
    domenkozar authored and FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    c11c1ac View commit details
    Browse the repository at this point in the history
  5. pythonPackages.pytest-django: unpin setuptools_scm

    - unpin setuptools_scm
    - move to file in folder following guidelines
    - use PyPI/upstream name
    
    (cherry picked from commit 645c218)
    FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    a2e1c15 View commit details
    Browse the repository at this point in the history
  6. pythonPackages.django_guardian: fix eval

    (cherry picked from commit 2e72372)
    FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    b4edc0b View commit details
    Browse the repository at this point in the history
  7. pythonPackages.pytest-django: fix hash patch setuptools_scm

    Do the files change over time..?
    
    (cherry picked from commit 48deda9)
    FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    0b93d2b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    fc0d67b View commit details
    Browse the repository at this point in the history
  9. makeWrapper: quote paths (#23511)

    Fixes #22962 (comment)
    
    Also run ShellCheck.
    
    (cherry picked from commit 7ff6eec)
    For ZHF #23253 to fix e.g. blink.
    abbradar authored and vcunat committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    0bd37b4 View commit details
    Browse the repository at this point in the history