Vladimír Čunát
2c51a075ab
makeFontsConf: fix with multiple outputs
2016-02-03 16:57:41 +01:00
Vladimír Čunát
bd2ca1e539
libvdpau: fixup branch interactions
...
This solution is cleaner anyway.
2016-02-03 16:57:41 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Nikolay Amiantov
53e0f8b1cd
Merge branch 'fontconfig-caches' into staging
...
Closes #12668 , fixes #12648
2016-02-01 12:20:06 +03:00
Nikolay Amiantov
b64ca73b81
Merge remote-tracking branch 'nckx/update-freetype' into staging
...
Closes #12600
2016-02-01 12:18:02 +03:00
Nikolay Amiantov
7bd9a5b104
fontconfig: reorder cache dirs
2016-01-29 16:35:59 +03:00
Nikolay Amiantov
893af77556
makeFontsCache: init
2016-01-29 14:41:26 +03:00
Vladimír Čunát
de0af30716
Merge branch 'master' into staging
2016-01-29 10:19:48 +01:00
Robin Gloster
edad608f56
libressl_2_3: 2.3.1 -> 2.3.2
2016-01-29 03:42:14 +00:00
Robin Gloster
46c31fa675
libressl: 2.2.5 -> 2.2.6
2016-01-29 03:42:14 +00:00
Vladimír Čunát
a92c2cb994
openssl_1_0_2: high-severity security update e -> f
...
Fixes CVE-2016-0701 and CVE-2015-3197.
2016-01-28 20:35:00 +01:00
Eelco Dolstra
2ecb6b4574
openssl: 1.0.1q -> 1.0.1r
...
CVE-2015-3197 (low severity)
2016-01-28 18:57:23 +01:00
Thomas Tuegel
9e743fd151
qt54.qtbase: fix path typo in resolv patch
2016-01-28 11:15:58 -06:00
Thomas Tuegel
9695e139ec
qt55.qtbase: fix path typo in resolv patch
2016-01-28 11:15:14 -06:00
Charles Strahan
7b8cd1dce9
watchman: 4.1.0 -> 4.3.0
...
* improved handling of case insensitive filenames
* improved reliability of symlink change detection on osx
2016-01-28 11:58:33 -05:00
Robin Gloster
a83920c32d
Merge pull request #12652 from mayflower/upstream-vagrant
...
vagrant: 1.8.0 -> 1.8.1
2016-01-28 17:24:31 +01:00
Sander van der Burg
a1cd11aff4
titaniumenv: remove obsolete android configuration steps
2016-01-28 16:19:18 +00:00
Arseniy Seroka
6dcfd1a849
Merge pull request #12654 from mayflower/upstream-nodejs5
...
nodejs-5_x: 5.4.1 -> 5.5.0
2016-01-28 19:12:07 +03:00
Michael Alan Dorman
a9b0bfe3bb
ghc-imported-from: builds again
2016-01-28 16:47:22 +01:00
Peter Simons
81c8babb38
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 34e1e2890f152c587fd19b9c0dc0e3486fdffc71
2016-01-28 16:45:46 +01:00
Sander van der Burg
b4e47d1ab8
titaniumenv: change identifier to 5.1.2.GA
2016-01-28 14:39:21 +00:00
Sander van der Burg
4dc36b1227
titaniumenv: use version 5.1.2 by default in the example
2016-01-28 14:36:51 +00:00
Sander van der Burg
b205b587e7
titaniumenv: remove obsolete iosWwdrCertificate parameter
2016-01-28 13:32:21 +00:00
Vladimír Čunát
363f667e8b
qt5*.qtbase: fixup output references
...
Hopefully I haven't missed any references in qt5*.
2016-01-28 13:31:17 +01:00
Christian Albrecht
2dbd741009
nodejs-5_x: 5.4.1 -> 5.5.0
2016-01-28 13:27:40 +01:00
Vincent Laporte
c67c27dc82
pycairo: add darwin to meta.platforms
2016-01-28 11:02:26 +01:00
Christian Albrecht
8975148a16
vagrant: 1.8.0 -> 1.8.1
2016-01-28 01:01:56 +01:00
Peter Simons
2c78c7b84b
Merge pull request #12649 from grwlf/urweb
...
urweb: version bump
2016-01-27 23:27:32 +01:00
Sergey Mironov
f9ab62431c
urweb: version bump
2016-01-27 23:13:13 +03:00
Tobias Geerinckx-Rice
a4fb3c27cc
wcslib: 5.12 -> 5.13 + enableParallelBuilding
2016-01-27 18:39:41 +01:00
vbgl
5b153a1c2c
Merge pull request #12617 from pmahoney/darwin-mono
...
Get mono building on darwin
2016-01-27 14:27:44 +01:00
Frederik Rietdijk
e366168d22
Merge pull request #12552 from NixOS/python-wip
...
pythonPackages: update setuptools, many updates and fixes
2016-01-27 13:19:00 +01:00
Domen Kožar
07049a7edf
python generic builder: fix typos
2016-01-27 13:11:20 +01:00
Nikolay Amiantov
e1a734cee2
libva: fix likely problem on Darwin
2016-01-27 10:31:18 +03:00
Peter Simons
40b0b45fce
jailbreak-cabal: use native Cabal library with GHC 8.0.x or later
2016-01-27 00:33:26 +01:00
Peter Simons
ffabca8f92
haskell-hspec-core: disable test suite when building with GHC 8.0.x.
2016-01-27 00:33:25 +01:00
Peter Simons
d487783174
haskell: update use of Cabal 1.18.1.6 to 1.18.1.7
...
This affects GHC versions 7.2.x and earlier, which cannot compile more
recent versions of Cabal.
2016-01-27 00:33:25 +01:00
Peter Simons
c68c8655f1
haskell: update use of Cabal 1.20.0.3 to 1.20.0.4
...
This affects mostly jailbreak-cabal, which uses the old version on most
platforms due to bugs introduced to Cabal in later releases.
2016-01-27 00:33:25 +01:00
Peter Simons
2e3c8d55f7
haskell-async: remove obsolete override
2016-01-27 00:33:25 +01:00
Peter Simons
64a872863d
haskell-binary: update pre-7.8.x compilers from 0.8.0.0 to 0.8.0.1
2016-01-27 00:33:25 +01:00
Peter Simons
b57e4fa813
configuration-hackage2nix.yaml: update list of broken builds
2016-01-27 00:33:25 +01:00
Peter Simons
0d8c3e278b
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:
- Nixpkgs: 066b92d429e664cee71e9b9c0dc0e3c5293e6b9b
2016-01-27 00:33:17 +01:00
Arseniy Seroka
c03b113a63
Merge pull request #12618 from romildo/update-jflex
...
jflex: 1.4.3 -> 1.6.1
2016-01-26 18:56:37 +03:00
Patrick Mahoney
1d20ec0ff9
mono: build on darwin
2016-01-26 09:34:45 -06:00
Ollie Charles
981e8d5582
audiofile: Fix build on darwin
2016-01-26 14:43:46 +00:00
Peter Simons
62900b026b
haskell-nats: fix overrides for GHC versions prior to 7.10.x.
...
Closes https://github.com/NixOS/nixpkgs/issues/12622 .
2016-01-26 14:01:40 +01:00
Nikolay Amiantov
de26cac3cb
mesa: 11.0.8 -> 11.1.1
2016-01-26 14:27:49 +03:00
Nikolay Amiantov
2c2497fc2e
libva: 1.6.1 -> 1.6.2
2016-01-26 13:42:54 +03:00
Nikolay Amiantov
768f7d19b5
libvdpau: use OpenGL drivers link directory
2016-01-26 13:42:39 +03:00
Nikolay Amiantov
1b95212a69
libva: use OpenGL drivers link directory
2016-01-26 13:42:36 +03:00
