Comparing changes
Open a pull request
base repository: NixOS/nixpkgs
base: d9a5fa5780e7
head repository: NixOS/nixpkgs
compare: 0bd37b4da93b
- 17 commits
- 62 files changed
- 11 contributors
Commits on Mar 18, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 2105794 - Browse repository at this point
Copy the full SHA 2105794View commit details -
Configuration menu - View commit details
-
Copy full SHA for 24c5f09 - Browse repository at this point
Copy the full SHA 24c5f09View commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for 69427c7 - Browse repository at this point
Copy the full SHA 69427c7View commit details -
(cherry picked from commit 3fac05b)
Configuration menu - View commit details
-
Copy full SHA for e10f141 - Browse repository at this point
Copy the full SHA e10f141View commit details -
tvheadend: fix typo in package description
(cherry picked from commit ff7506d)
Configuration menu - View commit details
-
Copy full SHA for 244d44e - Browse repository at this point
Copy the full SHA 244d44eView commit details -
nixos/release.nix: added tests.wordpress
(cherry picked from commit 6022a79)
Configuration menu - View commit details
-
Copy full SHA for 2339114 - Browse repository at this point
Copy the full SHA 2339114View commit details -
Configuration menu - View commit details
-
Copy full SHA for f7fcede - Browse repository at this point
Copy the full SHA f7fcedeView commit details -
Configuration menu - View commit details
-
Copy full SHA for b249f7f - Browse repository at this point
Copy the full SHA b249f7fView commit details
Commits on Mar 19, 2017
-
grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820
(cherry picked from commit d440981)
Configuration menu - View commit details
-
Copy full SHA for 07c2541 - Browse repository at this point
Copy the full SHA 07c2541View commit details -
Configuration menu - View commit details
-
Copy full SHA for 35e6ef8 - Browse repository at this point
Copy the full SHA 35e6ef8View commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for d685191 - Browse repository at this point
Copy the full SHA d685191View commit details -
setuptools_scm: 1.11.1 -> 1.15.0
(cherry picked from commit f32fc9b)
Configuration menu - View commit details
-
Copy full SHA for c11c1ac - Browse repository at this point
Copy the full SHA c11c1acView commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for a2e1c15 - Browse repository at this point
Copy the full SHA a2e1c15View commit details -
pythonPackages.django_guardian: fix eval
(cherry picked from commit 2e72372)
Configuration menu - View commit details
-
Copy full SHA for b4edc0b - Browse repository at this point
Copy the full SHA b4edc0bView commit details -
pythonPackages.pytest-django: fix hash patch setuptools_scm
Do the files change over time..? (cherry picked from commit 48deda9)
Configuration menu - View commit details
-
Copy full SHA for 0b93d2b - Browse repository at this point
Copy the full SHA 0b93d2bView commit details -
Configuration menu - View commit details
-
Copy full SHA for fc0d67b - Browse repository at this point
Copy the full SHA fc0d67bView commit details -
makeWrapper: quote paths (#23511)
Fixes #22962 (comment) Also run ShellCheck. (cherry picked from commit 7ff6eec) For ZHF #23253 to fix e.g. blink.
Configuration menu - View commit details
-
Copy full SHA for 0bd37b4 - Browse repository at this point
Copy the full SHA 0bd37b4View commit details
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 d9a5fa5780e7...0bd37b4da93b