JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,761 Commits 2 Branches 0 Tags 13 GiB
77dacee416
Commit Graph

32775 Commits

Author SHA1 Message Date
Frederik Rietdijk
77dacee416 mesa: use python2 
since there is still code that is not compatible with Python 3.x and the
following issue occurs as well
https://bugs.freedesktop.org/show_bug.cgi?id=95338
 2016-10-18 23:14:35 +02:00
Frederik Rietdijk
f17f64d203 http-parser: use python2 2016-10-18 23:14:34 +02:00
Frederik Rietdijk
f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Frederik Rietdijk
47a95edc1e libxml2: use python2 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
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
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
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
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
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
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
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
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
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
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
Graham Christensen
85c9f014ed
mujs: 2016-02-22 -> 2016-09-21 2016-10-13 07:42:30 -04:00
Frederik Rietdijk
ffa65afdcd edk2: use python env 2016-10-13 10:47:07 +02:00
Frederik Rietdijk
cffdffe1f6 Merge pull request #19309 from FRidh/outputs 
Python: use separate output for tkinter
 2016-10-13 10:40:14 +02:00
Vladimír Čunát
727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00
Alex Ivanov
1fa5aceda8 pakcs: fixed for darwin 2016-10-13 09:37:02 +03:00
Alex Ivanov
e9e69993b2 swiProlog: fixed for darwin 2016-10-13 09:36:49 +03:00
Alex Ivanov
4e87ea7f73 unixODBC: enable build for darwin 2016-10-13 09:23:14 +03:00
Dan Peebles
9617f61164 xcbuild: init at 49f8a592 2016-10-13 00:32:19 -04:00
Franz Pletz
6adc67d8d7
vaapiIntel: 1.7.0 -> 1.7.2 2016-10-13 03:19:28 +02:00
Franz Pletz
cdd019811c
intel-gpu-tools: 1.14 -> 1.16 2016-10-13 03:18:52 +02:00
Franz Pletz
d514bf3fcc
libsamplerate: 0.1.8 -> 0.1.9 2016-10-13 03:18:42 +02:00
Franz Pletz
29b04017b5
libmpcdec: cleanup, use sha256 hash 2016-10-13 03:18:37 +02:00
Franz Pletz
f7454f6a15
libmikmod: 3.3.7 -> 3.3.10 2016-10-13 03:18:32 +02:00
Franz Pletz
e50be9ff75
libcue: 1.4.0 -> 2.1.0 2016-10-13 03:18:28 +02:00
Franz Pletz
e8e50bf696
zeroc_ice: 3.6.1 -> 3.6.3 2016-10-13 03:18:17 +02:00
Daniel Peebles
77d1fb94f1 Merge pull request #19470 from copumpkin/fix-sierra 
Fix Darwin stdenv to work on Sierra
 2016-10-12 19:04:03 -04:00
Joachim F
d4a22b4de3 Merge pull request #19479 from sternenseemann/master 
libhttpseverywhere: build api documentation
 2016-10-12 22:37:45 +02:00
Joachim F
71fd469d45 Merge pull request #19385 from taku0/android_sdk_sources 
androidenv: Add API sources
 2016-10-12 22:37:36 +02:00
Dan Peebles
f35ab9c2f8 rpm-ostree: 2016.1 -> 2016.10 
This also updates a bunch of its dependencies to enable the update,
and gets rid of libhif because upstream stopped maintaining it as
such, instead using it internally in other projects until they can
agree on an interface for it. Nothing seemed to be using libhif so
I'm not too concerned about removing it.
 2016-10-12 20:31:02 +00:00
Eelco Dolstra
ed6006790a libunistring: Do propagate libiconv on non-Linux 
Fixes #19492.
 2016-10-12 20:26:43 +02:00
Peter Simons
ea1a8cf5f0 git-annex: bump to latest version 2016-10-12 17:50:20 +02:00
Peter Simons
8c95f0ffaf ghcjs: revert "mark build as broken" 
This reverts commit 8f07d4bd780a24dcf33be46d8cbfc6163fcdde0e. The build
failure blocking this package has been fixed in the meanwhile. Thanks to
@basvandijk for the heads-up.

(cherry picked from commit 56d033ac1b00a8b29bc29589312d2f5024656bd3)
 2016-10-12 16:52:41 +02:00
Peter Simons
5925d14525 haddock-library: fix build with GHC 7.10.x 
Required by GHCJS.
 2016-10-12 16:52:41 +02:00
Peter Simons
7c1d952a56 hackage-packages.nix: automatic Haskell package set update 
This update was generated by hackage2nix v2.0.2-12-g87e23de from Hackage revision
d009766695.
 2016-10-12 16:52:41 +02:00