| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | systemd: Include https://github.com/NixOS/systemd/pull/8•••(cherry picked from commit 6ef630a12549c2f36bc1706718c5ad12e0fa05f3)
origin/staging-17.03 | Eelco Dolstra | 2017-03-27 | 1 | -2/+2 |
| * | openssl: default to default profile CA on darwin•••(cherry picked from commit c86f05e7ce13e64238960ebf3ee9706142db961b)
| Guillaume Maudoux | 2017-03-22 | 2 | -1/+15 |
| * | curl: Use default trust store of TLS backend•••Having curl fall back to openssl's CA means that we need not patch curl
to respect NIX_SSL_CERT_FILE. It will work in all the cases.
This reverts commit fb4c43dd8adbd7a10d1c52539b36e2da269f3f7f "curl: Use CA bundle in nix default profile by default"
If we want to reintroduce that feature, this needs to go inside openssl
(cherry picked from commit 8ecb94bb97842f95ca3fb780fc2977ee43b7d554)
| Guillaume Maudoux | 2017-03-22 | 2 | -40/+1 |
| * | curl, git: Fix curl default CA, let git use it•••Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.
(cherry picked from commit 525a6631747597cd108bed21c26286637038b6a6)
| Guillaume Maudoux | 2017-03-22 | 3 | -19/+27 |
| * | pythonPackages.pygobject2: fixup conversation to buildPythonPackage•••(cherry picked from commit 8143413e590cf249b50047906d61eab2ce983c12)
| Frederik Rietdijk | 2017-03-21 | 1 | -0/+1 |
| * | mesa: maintenance 17.0.1 -> 17.0.2•••(cherry picked from commit 39eda57d2a2abd0d80828ff94541ff342764aad8)
| Vladimír Čunát | 2017-03-21 | 1 | -2/+2 |
| * | mesa: enable texture floats only for drivers•••To be on more safe side. This shouldn't matter theoretically as nothing in core
Mesa depends on them.
(cherry picked from commit 328bcdae252319bacdac9e9e20d0125af9969e20)
| Nikolay Amiantov | 2017-03-21 | 2 | -1/+2 |
| * | mesa: allow overriding driver compilation•••(cherry picked from commit eccc1fa9bb2fd5baea960d55f81708637cfd8ff0)
This is to sync expression code with master/staging;
the derivations evaluate the same, at least on x86_64-linux.
| Thomas Tuegel | 2017-03-21 | 1 | -12/+52 |
| * | mesa: enable texture floats by default•••(cherry picked from commit 261d7caed794c4e7e8346455e53a2f3a464e7935)
| Nikolay Amiantov | 2017-03-21 | 1 | -1/+2 |
| * | git, openssl, curl: Respect $NIX_SSL_CERT_FILE•••Slightly modified version of 942dbf89c6120cb5b52fb2ab456855d1fbf2994e
Signed-off-by: Domen Kožar <domen@dev.si>
| Domen Kožar | 2017-03-21 | 5 | -3/+35 |
| * | Python: replace mkPythonDerivation with buildPythonPackage and format="other";•••This way all Python packages use the same function,
`buildPythonPackage`.
(cherry picked from commit 3760c8c7fde6e8b15d19b063579d05018fc2d8b3)
| Frederik Rietdijk | 2017-03-21 | 18 | -35/+55 |
| * | Merge #23983: update kmod and kmod-blacklist-ubuntu | Vladimír Čunát | 2017-03-20 | 2 | -10/+11 |
| |\ |
|
| | * | kmod: 23 -> 24•••(cherry picked from commit 89724f152a9ab933142f07dc9da0eafb2a7f42a6)
| Peter Hoeg | 2017-03-17 | 1 | -2/+2 |
| | * | kmod-blacklist-ubuntu: 9.3 -> 22.1•••(cherry picked from commit 0c262a639e1f5754ebe0701b7f622e2ada26ddfa)
| Peter Hoeg | 2017-03-17 | 1 | -8/+9 |
| * | | makeTest: don't rely on makeWrapper not quoting newlines•••(cherry picked from commit 1f0ce0eaf8ca840e769615acc7581bd71268ca44)
| Nikolay Amiantov | 2017-03-20 | 1 | -3/+3 |
| * | | makeWrapper: quote paths (#23511)•••Fixes https://github.com/NixOS/nixpkgs/pull/22962#commitcomment-21144939
Also run ShellCheck.
(cherry picked from commit 7ff6eec5fd80ece0d634f1353c96f6ba4fb11ec6)
For ZHF #23253 to fix e.g. blink.
| Nikolay Amiantov | 2017-03-19 | 1 | -35/+40 |
| * | | Merge branch 'release-17.03' into staging-17.03 | Vladimír Čunát | 2017-03-19 | 61 | -113/+58 |
| |\ \ |
|
| | * | | pythonPackages.pytest-django: fix hash patch setuptools_scm•••Do the files change over time..?
(cherry picked from commit 48deda9f367b24a9ca122f13a9f6659ed2bfe75d)
| Frederik Rietdijk | 2017-03-19 | 1 | -1/+1 |
| | * | | pythonPackages.django_guardian: fix eval•••(cherry picked from commit 2e72372c05ee5a4e0c690178c5f6305878a3a777)
| Frederik Rietdijk | 2017-03-19 | 1 | -2/+2 |
| | * | | pythonPackages.pytest-django: unpin setuptools_scm•••- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
(cherry picked from commit 645c2189d14ee95d22efb08e42a2bb3ca7e74a04)
| Frederik Rietdijk | 2017-03-19 | 2 | -1/+31 |
| | * | | setuptools_scm: 1.11.1 -> 1.15.0•••(cherry picked from commit f32fc9b03e0a5c8152f94ddec01879050df2b988)
| Domen Kožar | 2017-03-19 | 1 | -2/+2 |
| | * | | kdelibs: remove sanitize patch•••because its included in 4.14.30 which was part of Applications 16.12.3.
https://github.com/NixOS/nixpkgs/pull/23992#issuecomment-287553865
(cherry picked from commit 2478f7b92c8e5209d5b92490de7fad5b8248180b)
| Frederik Rietdijk | 2017-03-19 | 1 | -5/+0 |
| | * | | linux_4_9: 4.9.15 -> 4.9.16•••(cherry picked from commit b5da6ca2131fff8406835e7ef350c43e2909078a)
| Joachim Fasting | 2017-03-19 | 1 | -2/+2 |
| | * | | grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820•••(cherry picked from commit d4409817a63a398ba7cb18e577e4f8a1c02f08f5)
| Joachim Fasting | 2017-03-19 | 2 | -5/+5 |
| | * | | Merge branch 'staging-17.03' into release-17.03 | Vladimír Čunát | 2017-03-18 | 10 | -34/+132 |
| | |\ \
| |/ /
|/| | |
|
| * | | | Merge branch 'release-17.03' into staging-17.03•••Solving firefox conflicts (parallel updates).
| Vladimír Čunát | 2017-03-18 | 21 | -1553/+1784 |
| |\ \ \ |
|
| * | | | | Merge pull request #23924 from 7c6f434c/improve-firefox-test•••nixos: tests: firefox: make more comprehensive
(cherry picked from commit f9fb38fcae7631903d23523cb987266592e35b0a)
The test will block the channel without the xterm change.
| Michael Raskin | 2017-03-17 | 1 | -2/+8 |
| * | | | | Merge #23917: fix firefox crashes•••(cherry picked from commit 9adcebb1a97ac75b8a2445459f9e3826a7b71a39)
| Vladimír Čunát | 2017-03-17 | 3 | -0/+90 |
| * | | | | Merge branch 'release-17.03' into staging-17.03 | Vladimír Čunát | 2017-03-17 | 76 | -1125/+432 |
| |\ \ \ \
| | |_|/
| |/| | |
|
| * | | | | Merge branch 'release-17.03' into staging-17.03 | Vladimír Čunát | 2017-03-13 | 59 | -1339/+1985 |
| |\ \ \ \ |
|
| * | | | | | gnutls: bugfix+security 3.5.9 -> 3.5.10•••http://gnutls.org/security.html#GNUTLS-SA-2017-3
(cherry picked from commit b264486cf11b5b5946a0c1ad73610a9f80f520a5)
| Vladimír Čunát | 2017-03-13 | 2 | -5/+5 |
| * | | | | | libreoffice-still: apply the patch for ICU 58•••see #17126
(cherry picked from commit f3a4f31554f655440181aa6085ed7fea5b4c24e4)
| Michael Raskin | 2017-03-10 | 1 | -0/+7 |
| * | | | | | firefox, firefox-bin: 51.0.1 -> 52.0, firefox-esr: 45.7esr -> 52.0esr•••(cherry picked from commit a24aaae60252b8c383bdf480858c724c4b38c3b6)
| taku0 | 2017-03-09 | 2 | -373/+373 |
| * | | | | | nss: 3.28.1 -> 3.28.3•••This should fix firefox build, which fails due to nss being too old.
(cherry picked from commit cb670556c52f134e6d042ea3be4f607b8ece508a)
| Alexey Shmalko | 2017-03-09 | 1 | -3/+3 |
| * | | | | | sqlite: 3.16.2 -> 3.17.0•••Firefox requires the latest sqlite to build:
```
checking for sqlite3 >= 3.17.0... Requested 'sqlite3 >= 3.17.0' but version of SQLite is 3.16.2
configure: error: Library requirements (sqlite3 >= 3.17.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```
(cherry picked from commit d4bb1c786fd35d359b2eb8364863b4320cac1627)
| Alexey Shmalko | 2017-03-09 | 1 | -3/+3 |
| * | | | | | icu: 57.1 -> 58.2•••Firefox requires new version of the icu to build:
```
checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1
configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```
(cherry picked from commit 28598c01e7e09c606b5988306ce84534a717b94a)
| Alexey Shmalko | 2017-03-09 | 1 | -22/+2 |
| * | | | | | Merge branch 'release-17.03' into staging-17.03 | Robin Gloster | 2017-03-09 | 16 | -128/+177 |
| |\ \ \ \ \ |
|
| * | | | | | | stripDirs: Silence annoying 'File format not recognized' errors•••(cherry picked from commit d39be63a1076c55b46d967869c7c86476b012ead)
| Shea Levy | 2017-03-08 | 1 | -1/+1 |
| | | | | | * | gnome_mplayer: fix src and build•••(cherry picked from commit 4e2f802ce815dea0a4625a8285f5c7e7f74cf8ab)
| Robin Gloster | 2017-03-18 | 1 | -2/+4 |
| | | | | | * | nixos/release.nix: added tests.wordpress•••(cherry picked from commit 6022a79cbc2fd3c78a89a8ec02732781cceb4a59)
| Joachim Schiele | 2017-03-18 | 1 | -0/+1 |
| | | | | | * | tvheadend: fix typo in package description•••(cherry picked from commit ff7506d665141f2df5527446df4196be30ed4e4c)
| Nick Hu | 2017-03-18 | 1 | -1/+1 |
| | | | | | * | libsodium: 1.0.11 -> 1.0.12•••(cherry picked from commit 3fac05b9515dbee23d8d33dad42d947204192483)
| Joachim Fasting | 2017-03-18 | 1 | -2/+2 |
| | | | | | * | 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 a4d6e2cf163202b438b2b1af732fa47ea5db5cce)
| Benno Fünfstück | 2017-03-18 | 2 | -5/+6 |
| | | | | | * | neo4j service: increase file limit, per warning emitted at startup (#23961)•••(cherry picked from commit 63f1a14ae551f650584ac7502b5ee159221d1f92)
| Will Dietz | 2017-03-18 | 1 | -0/+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 953616907493c5b81ba3ec9dd86f1422f4d1fcd3)
| Franz Pletz | 2017-03-18 | 47 | -86/+1 |
| | | | | |/ |
|
| | | | | * | amule: 2.3.1 -> 2.3.2•••(cherry picked from commit f77ae4e72607a658bdfd117b7e6f32aa4504befc)
| Lluís Batlle i Rossell | 2017-03-18 | 2 | -24/+3 |
| | | | | * | citrix-receiver: add link to webpage with all versions and adjust to change i...•••Helps with #23975
(cherry picked from commit 17bfb6a08a0f77124bbe96e2908076c821bdeb46)
| obadz | 2017-03-18 | 1 | -1/+3 |
| | | | | * | firefox-esr: 52.0esr -> 52.0.1esr•••(cherry picked from commit a038f918714efbb67b27574dff93b632f50c916e)
| taku0 | 2017-03-18 | 1 | -2/+2 |
| | | | | * | firefox, firefox-bin: 52.0 -> 52.0.1•••(cherry picked from commit 3f175876e8f470b0860e37b926aa0e9776231556)
| taku0 | 2017-03-18 | 2 | -371/+371 |
| | | | | * | firefox, firefox-bin: 51.0.1 -> 52.0, firefox-esr: 45.7esr -> 52.0esr•••(cherry picked from commit a24aaae60252b8c383bdf480858c724c4b38c3b6)
| taku0 | 2017-03-18 | 2 | -373/+373 |
