Frederik Rietdijk
47a95edc1e
libxml2: use python2
2016-10-18 23:14:31 +02:00
Aneesh Agrawal
95b5d8f752
all-packages: Remove unnecessary python3 overrides
...
These are unnecessary with Python3 as default Python.
2016-10-18 23:14:31 +02:00
Aneesh Agrawal
708822250e
Python 3.x: Add python
symlink
...
Add a symlink for "python" in the python3 derivation to provide a
default Python executable.
2016-10-18 23:14:31 +02:00
Dan Peebles
4f8a1094bd
cctools: add patch I forgot
2016-10-17 08:51:48 -04:00
Dan Peebles
e4dba74e8a
darwin.stdenv: update MACOSX_DEPLOYMENT_TARGET
...
No point in claiming we're compatible with a version we don't try to
support, and this will probably help with a few other things elsewhere.
2016-10-16 20:47:43 -04:00
Dan Peebles
ead2424981
cctools: fix triple for the assembler
...
This was breaking `boost155` and would probably break anything else that
calls `as` with no explicit architecture.
2016-10-16 20:46:36 -04:00
Dan Peebles
b91d64463f
Libsystem: update to 10.11.6 version
...
This actually has no effect but it bugged me to keep seeing an old version
in the package names :) and since we're making a bunch of stdenv changes
at once, I might as well.
2016-10-16 20:44:14 -04:00
Frederik Rietdijk
107c035bf0
Python: remove pythonSmall
...
In #19309 a separate output for tkinter was added.
Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.
However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
2016-10-16 14:31:26 +02:00
Frederik Rietdijk
80433e7030
Python: further unify expressions interpreters
2016-10-14 15:52:14 +02:00
Vladimír Čunát
061758490f
Merge branch 'master' into staging
...
... to get the openssl mass rebuild: 942dbf89c
.
2016-10-14 13:16:11 +02:00
zimbatm
6351c4d24b
Merge pull request #19180 from zimbatm/bundler-env-bins
...
Bundler env bins
2016-10-14 11:51:23 +01:00
Nikolay Amiantov
7619bea1fe
Merge pull request #19544 from kamilchm/blueman
...
blueman: hicolor_icon_theme dependency
2016-10-14 14:34:50 +04:00
Eelco Dolstra
942dbf89c6
openssl, curl, git: Respect $NIX_SSL_CERT_FILE
...
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).
See https://github.com/NixOS/nix/issues/921 .
2016-10-14 12:06:10 +02:00
Kamil Chmielewski
745b659481
blueman: hicolor_icon_theme dependency
2016-10-14 12:03:04 +02:00
Vladimír Čunát
027efec879
Merge staging without python splitting for now
...
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Vladimír Čunát
e0210d7cbf
tested job: fixup evaluation after 5dadc3a
...
I believe hardcoding system to builtins.currentSystem isn't very good,
as e.g. Hydra surely evaluates on Linux only...
2016-10-14 09:21:38 +02:00
Vladimír Čunát
3eec7ea3f0
gvfs: fix build after update in 0809aeb47f
...
(cherry picked from commit 56a49e6cda
)
2016-10-14 09:11:28 +02:00
Vladimír Čunát
d73646d270
Revert "gtkmm: fix build error by patching missing operator"
...
This reverts commit 7defda8356
.
It breaks the package after update 61c467937b;
(cherry picked from commit 72e0135752
)
2016-10-14 09:11:18 +02:00
Jörg Thalheim
fe518a733f
Merge pull request #19533 from siddharthist/r-modules/readme-nix-shell
...
r-modules: add more nix-shell documentation
2016-10-14 09:09:19 +02:00
Daniel Peebles
9615afa04b
Merge pull request #19517 from dipinhora/darwin-yosemite-support
...
Re-enable support for OS X 10.10 for darwin.
2016-10-13 22:46:33 -04:00
Dan Peebles
5dadc3a30c
darwin.make-bootstrap-tools: fix for new stdenv setup
2016-10-13 22:32:19 -04:00
Franz Pletz
8435c1637b
gimpPlugins.gap: disable format hardening
2016-10-13 20:33:16 -04:00
Franz Pletz
bb7d270d85
pythonmagick: 0.9.12 -> 0.9.14
2016-10-13 20:33:16 -04:00
Franz Pletz
957a5bdcf3
phpPackages.imagick: 3.4.0RC4 -> 3.4.3RC1
...
Drops imagick31 as the current version also supports PHP 5.x.
2016-10-13 20:33:16 -04:00
Graham Christensen
241cd0e5db
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVE-2016-7799, CVE-2016-7906
2016-10-13 20:33:10 -04:00
Graham Christensen
fcd4b7ea58
Merge pull request #19510 from grahamc/nodejs
...
Nodejs: Upgrades for security patches
2016-10-13 20:26:47 -04:00
Graham Christensen
91c49433c9
nodejs-5_x: Remove, no longer supported
2016-10-13 20:04:24 -04:00
Graham Christensen
66f2a01222
nodejs-6_x: 6.7.0 -> 6.8.0
2016-10-13 20:04:24 -04:00
Graham Christensen
f9df1b5de0
nodejs: 4.4.6 -> 4.6.0
2016-10-13 20:04:23 -04:00
Langston Barrett
2b300c9bef
r-modules: add more environment documentation
...
Use nix-shell with a `default.nix` rather than using
config.nix
2016-10-13 22:18:16 +00:00
Vladimír Čunát
6eeea6effd
Python: more evaluation fixups.
2016-10-14 00:03:12 +02:00
Franz Pletz
4771ccd896
graphicsmagick: apply patches to fix security issues
...
Fixes CVE-2016-7996, CVE-2016-7996, CVE-2016-7800.
cc #19481
2016-10-14 00:02:30 +02:00
Franz Pletz
c766c7f095
fastd: fix meta.platforms typo
2016-10-14 00:02:30 +02:00
Franz Pletz
f30f7d0cff
powertop: add homepage, cleanup
2016-10-14 00:02:30 +02:00
Tuomas Tynkkynen
c66124e9b7
sshpass: 1.05 -> 1.06
2016-10-14 00:58:07 +03:00
Jörg Thalheim
13ff831440
Merge pull request #19524 from nshalman/shfmt-0.2.0
...
shfmt: 2016-06-16 -> 0.2.0
2016-10-13 22:22:34 +02:00
Frederik Rietdijk
efb6052f40
Python: fixup modules that were removed
2016-10-13 22:11:30 +02:00
Daniel Peebles
9703a72f70
Merge pull request #19495 from LnL7/darwin-gdb
...
gdb: disable format hardening
2016-10-13 15:57:19 -04:00
Vladimír Čunát
e4d3254101
intltool: fix #19487 patch download
...
It's strange. Maybe they prune the history.
2016-10-13 21:55:25 +02:00
Franz Pletz
29bd3898a6
fastd: init at 18
2016-10-13 21:42:17 +02:00
Franz Pletz
3b58daf315
libuecc: init at 7
2016-10-13 21:42:16 +02:00
Franz Pletz
2c47729a75
libsodium: 1.0.10 -> 1.0.11
2016-10-13 21:42:15 +02:00
Daiderd Jordan
c5a7728152
gdb: disable format hardening
2016-10-13 21:33:07 +02:00
Nahum Shalman
94cf6fbc35
shfmt: 2016-06-16 -> 0.2.0
2016-10-13 15:24:39 -04:00
Jörg Thalheim
0cdc181409
Merge pull request #19500 from romildo/upd.smartgithg
...
smartgithg: 7_1_2 -> 8_0_3
2016-10-13 21:23:35 +02:00
Vladimír Čunát
56a49e6cda
gvfs: fix build after update in 0809aeb47f
2016-10-13 19:32:45 +02:00
Vladimír Čunát
72e0135752
Revert "gtkmm: fix build error by patching missing operator"
...
This reverts commit 7defda8356
.
It breaks the package after update 61c467937b;
2016-10-13 19:32:45 +02:00
dipinhora
6152c1ea7f
Re-enable support for OS X 10.10 for darwin.
2016-10-13 11:09:37 -04:00
Domen Kožar
6d9fe5dc8a
Revert "nixpkgs: add tested alias for unstable job"
...
This reverts commit 69e614d1e6
.
2016-10-13 17:06:03 +02:00
Graham Christensen
9a668ec58b
Merge pull request #19511 from grahamc/mujs
...
mujs: 2016-02-22 -> 2016-09-21
2016-10-13 08:40:00 -04:00