Commit graph

93785 commits

Author SHA1 Message Date
Graham Christensen 85c9f014ed
mujs: 2016-02-22 -> 2016-09-21 2016-10-13 07:42:30 -04:00
Jörg Thalheim d5316884e4 Merge pull request #19024 from adnelson/docker_refactor
dockerTools: add docs to docker build functions
2016-10-13 11:50:21 +02:00
Carles Pagès d037837cf9 kodi: link to libva-full
Fixes #19480 (vaapi support)
2016-10-13 11:28:50 +02: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
Frederik Rietdijk 1e544b2993 pythonPackages.tkinter: use this instead of the output python.tkinter 2016-10-13 10:38:21 +02:00
Vladimír Čunát 727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00
Vladimír Čunát 54a76b3f5d release-notes: fixup bad conflict resolution in bef6bef
/cc #19324.
2016-10-13 09:49:47 +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 82986b7369 erlangR16_odbc: fixed for darwin 2016-10-13 09:23:45 +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 ccd45f8854
audacious: 3.7.2 -> 3.8 2016-10-13 03:19:43 +02: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 1566fb150e
opusfile: 0.6 -> 0.8 2016-10-13 03:18:46 +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 a637b4d950
mumble: 1.2.16 -> 1.2.17 2016-10-13 03:18:23 +02:00
Franz Pletz e8e50bf696
zeroc_ice: 3.6.1 -> 3.6.3 2016-10-13 03:18:17 +02:00
romildo 83d25e490b smartgithg: 7_1_2 -> 8_0_3 2016-10-12 20:15:35 -03:00
Graham Christensen 88a47f1950 Merge pull request #19467 from grahamc/nvidia-x11-master
nvidia-x11: 367.35 -> 367.57
2016-10-12 19:07:29 -04: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
aszlig 09d3493282
buildLinux/linuxManualConfig: Allow .override
Regression introduced by da36847d92.

The kernelPackages NixOS module option now uses .override to add kernel
patches defined in boot.kernelPatches into the kernel within the
kernelPackages set.

For generic kernels, we already have an .override which comes with
callPackage, but pkgs.linuxManualConfig is a function where we want to
override the attributes passed to it.

The callPackage to manual-config.nix only allows us to override its
internal attributes but not the attributes of the function returned.

Simplified it looks like this:

                                      .----- .override provided by
                                    __|__    callPackage
                                   |     |
(callPackage .../manual-config.nix { ... }) { ... }
                                            |_____|
                                               |
                                  the one -----'
                                  we actually want to override

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-10-12 23:52:23 +02:00
Vladimír Čunát af38c05587 stdenv stripHash(): fixup after #19324 2016-10-12 23:45:30 +02: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
Jörg Thalheim 1371499530 Merge pull request #19486 from Mic92/neovim
python3Packages.neovim: include trollius only for py < 3.4
2016-10-12 20:57:57 +02:00
Jörg Thalheim da32d7ea85
python3Packages.neovim: include trollius only for py < 3.4
trollius breaks python3 because it includes the enum module
2016-10-12 20:56:58 +02:00
Eelco Dolstra ed6006790a libunistring: Do propagate libiconv on non-Linux
Fixes #19492.
2016-10-12 20:26:43 +02:00
zimbatm 985dec611b terraform: 0.7.4 -> 0.7.5 2016-10-12 18:51:16 +01:00
Tim Steinbach d313a114f1 Merge pull request #19488 from peterhoeg/mysqltuner
mysqltuner: init at 1.6.18
2016-10-12 12:41:08 -04:00
Frederik Rietdijk ad33e71c55 Merge pull request #19490 from regnat/taskserver
taskserver : use pythonPackage.buildPythonPackage
2016-10-12 18:24:43 +02:00
regnat f697486122 taskserver : use pythonPackage.buildPythonPackage 2016-10-12 18:09:13 +02:00
Peter Simons ea1a8cf5f0 git-annex: bump to latest version 2016-10-12 17:50:20 +02:00
Tobias Geerinckx-Rice 61a789888a Merge pull request #19482 from peterhoeg/ss
simple-scan: 3.21 -> 3.22
2016-10-12 17:36:35 +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
Peter Simons 8939e2a26b haskell-nvvm: disable build on Hydra since it depends on unfree cudatoolkit 2016-10-12 16:52:40 +02:00
Peter Simons c69f058ee2 configuration-hackage2nix.yaml: add old version of haddock-library
This is required by haddock-api 2.16.x.
2016-10-12 16:51:47 +02:00
Peter Simons 71e4613e78 LTS Haskell 7.3 2016-10-12 16:51:47 +02:00
Thomas Tuegel 8b7f04c25a
kde5.kcoreaddons: fix HTML injection CVE-2016-7966
See https://www.kde.org/info/security/advisory-20161006-1.txt for more
information.
2016-10-12 08:46:43 -05:00
Tim Steinbach 259dcac753 Merge pull request #19484 from peterhoeg/vala
vala: unify builders for various versions
2016-10-12 09:32:38 -04:00
Arseniy Seroka ce3624f6b4 Merge pull request #19438 from primeos/vim-service
vim module: init
2016-10-12 16:30:43 +03:00
Michael Raskin 80ca889586 xscreensaver: 5.35 -> 5.36 2016-10-12 15:29:25 +02:00