Commit Graph

42406 Commits

Author SHA1 Message Date
Lancelot SIX f32821b270
libgcrypt: 1.8.1 -> 1.8.2 2017-12-21 11:57:23 +01:00
Lancelot SIX e09a0faacd
libassuan: 2.4.3 -> 2.5.1 2017-12-21 11:13:17 +01:00
Moritz Ulrich e222d21eed
gnu-cobol: 2.0-rc2 -> 2.2
Instead of wrapping `cobc` and setting NIX_{LDFLAGS,CFLAGS_COMPILE}
set `COB_CC`, `COB_CFLAGS` and `COB_LDFLAGS` to make `cobc` find the
necessary libraries.
2017-12-21 10:40:02 +01:00
John Wiegley 60a6b81e2d coqPackages.equations: -> 1.0 2017-12-21 01:06:14 -08:00
Vladimír Čunát c303047032
fetchurl on Darwin: gssSupport = false (see 9b54a00160)
I can't see a better way around the problem for now.
2017-12-21 09:34:44 +01:00
Peter Simons a9d31a250f
Merge pull request #32921 from alunduil/add-alunduil-as-maintainer
add alunduil as maintainer for haskell packages
2017-12-21 08:37:33 +01:00
volth a52aa6aafb nixos/libvirt: avoid dependency on two qemu packages
Currently libvirt requires two qemu derivations: qemu and qemu_kvm which is just a truncated version of qemu (defined as qemu.override { hostCpuOnly = true; }).

This patch exposes an option virtualisation.libvirtd.qemuPackage which allows to choose which package to use:

 * pkgs.qemu_kvm if all your guests have the same CPU as host, or
 * pkgs.qemu which allows to emulate alien architectures (for example ARMV7L on X86_64), or
 * a custom derivation

virtualisation.libvirtd.enableKVM option is vague and could be deprecate in favor of virtualisation.libvirtd.qemuPackage, anyway it does allow to enable/disable kvm.
2017-12-21 03:56:40 +00:00
Alex Brandt ca7d54c1a1 add alunduil as maintainer for haskell packages
Adding myself, alunduil, as a maintainer on network-uri-json and
siren-json.
2017-12-20 21:01:35 -06:00
Orivej Desh 2949447c82 neko: update check for darwin, do not strip ndll 2017-12-21 01:51:00 +00:00
volth e19f22c55a neko: 2.1.0 -> 2.2.0 2017-12-21 01:50:52 +00:00
Justin Wood ab0825615b elixir: 1.5.2 -> 1.5.3 2017-12-21 01:38:21 +00:00
Orivej Desh c2b8cf0391
Merge pull request #32902 from lsix/update_pytestquickcheck
pythonPackages.pytest-quickcheck: 0.8.2 -> 0.8.3
2017-12-21 01:10:14 +00:00
volth 400956bca3 protobuf2_5: restore to build Hadoop
This partially reverts 1f2a18d916
2017-12-20 23:05:24 +00:00
Jan Tojnar 53acbe8156
cligh: switch to Python 3 2017-12-20 23:10:45 +01:00
Michael Alan Dorman 8e6d5639c3 pointfree, taffybar: jailbreak 2017-12-20 20:59:33 +01:00
Peter Simons 211a1ee84b hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
2017-12-20 20:59:33 +01:00
Peter Simons 15b9537f37 haskell-wai-secure-cookies: drop obsolete overrides 2017-12-20 20:59:18 +01:00
Peter Simons e4bb2a784d liquidhaskell: drop obsolete override 2017-12-20 20:59:18 +01:00
Peter Simons e058744dd4 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
2017-12-20 20:59:18 +01:00
Peter Simons acc6389bea hackage2nix: update list of broken builds
Ping @alunduil for broken "collection-json" build.
Ping @gridaphobe for broken ghc-srcspan-plugin build.
Ping @gebner for broken hledger-diff build.
Ping @khumba for broken hoppy-docs and hoppy-runtime builds.
Ping @psibi for broken persistent-redis build.
2017-12-20 20:59:04 +01:00
Peter Simons c1dcbad256
Merge pull request #32821 from ttuegel/haskell/shell-env-build-inputs
haskell: set buildInputs in nix-shell env
2017-12-20 20:58:31 +01:00
Lancelot SIX dd853e846c
pythonPackages.pytest-quickcheck: 0.8.2 -> 0.8.3 2017-12-20 17:30:09 +01:00
Pierre Radermecker 3e22c56161 Haskell-language-puppet: don't build haddock 2017-12-20 15:16:57 +01:00
Orivej Desh 6e2df0aed8 haskellPackages.SCalendar: try to restore the bot capacity to evaluate
Remove infinite recursion between SCalendar and scalendar:

https://gist.github.com/GrahamcOfBorg/eb6d5675657ddc3cc3f054305b11dcb5
2017-12-20 10:08:36 +00:00
Orivej Desh 95637269f0 mongoc: fix propagated libraries for libtool
libmongoc-1.0.la links to snappy (ld -l) but does not contain full path (ld -L)
2017-12-20 09:56:40 +00:00
Orivej Desh d3a375fe58 haskell-configuration-nix: fix eval 2017-12-20 09:50:21 +00:00
Frederik Rietdijk c9044dee32 python36: 3.6.3 -> 3.6.4 2017-12-20 10:27:10 +01:00
Orivej Desh fb349c84e2 qt5.qttools: install macdeployqt on darwin 2017-12-20 08:56:54 +00:00
Peter Simons d41f7655fb hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
4112e5cd3d.
2017-12-20 09:17:47 +01:00
Peter Simons 9a3158d486 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-5-gf18d849 from Hackage revision
4112e5cd3d.
2017-12-20 09:17:47 +01:00
Peter Simons 8909467b16 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-4-g48a154e from Hackage revision
4d733469c5.
2017-12-20 09:17:47 +01:00
Peter Simons 3ae4e2dcc9 haskell-graphviz: jailbreak to fix build with recent versions of QuickCheck 2017-12-20 09:17:46 +01:00
Peter Simons dba09a202b stack: jailbreak to fix broken build in LTS-10.x 2017-12-20 09:17:46 +01:00
Peter Simons 4ab8999891 haskell-store: disable test suite to fix build with recent versions of smallcheck 2017-12-20 09:17:46 +01:00
Peter Simons 6922808372 haskell-path: disable test suite to fix build with recent versions of doctest 2017-12-20 09:17:46 +01:00
Peter Simons a33d746223 haskell-genvalidity-property: jailbreak to fix build with recent versions of doctest 2017-12-20 09:17:46 +01:00
Peter Simons 5119549255 haskell-config-ini: disable test suite which fails with GHC 8.2.2 2017-12-20 09:17:46 +01:00
Peter Simons 04bd949738 haskell-nix-derivation: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 48c0621cdf haskell-int-cast: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 68be4071ed haskell-text-short: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons 5a55704605 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-4-g48a154e from Hackage revision
e7b871e45e.
2017-12-20 09:17:46 +01:00
Peter Simons 277e0a72f5 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-3-gb265c2e from Hackage revision
e2ac8e8816.
2017-12-20 09:17:46 +01:00
Peter Simons 2a097c9c02 haskell-blaze-html: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 91a864f3d7 haskell-attoparsec: disable test suite to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons 914d1aa19b haskell-blaze-markup: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons cde067b3ac haskell-cryptohash-*: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons 6372613259 cabal-install: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons a5d5d03a97 haskell-cryptohash-sha256: jailbreak to fix build with recent tasty-quickcheck 2017-12-20 09:17:46 +01:00
Peter Simons 2a742f6aef haskell-edit-distance: jailbreak to fix build with QuickCheck 2.10+ 2017-12-20 09:17:46 +01:00
Peter Simons dbc55c11f0 ghc: drop 8.2.1 version; we have 8.2.2 already 2017-12-20 09:17:46 +01:00
Peter Simons 45e819dd49 haskell-configuration-common: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons e2c6ccf71f haskell-scalendar: mark package as broken 2017-12-20 09:17:46 +01:00
Peter Simons 3e524aa06f haskell-configuration-common: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons 1c0c6d80e7 haskell-configuration-nix: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons 9e99aab45c haskell-configuration-ghc-8.2.x: drop obsolete overrides 2017-12-20 09:17:46 +01:00
Peter Simons 46351ad4b7 haskell-pandoc: drop obsolete constraints 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 053c466073 vector-builder: Break recursion 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 4fa4348dea Remove various package overrides 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 461f311e35 haskell-src-exts: 1.19.1 is now the default version 2017-12-20 09:17:45 +01:00
Michael Alan Dorman 22ef441cfa optparse-applicative: 0.14 is now the default version
Remove references to when it was non-default.
2017-12-20 09:17:45 +01:00
Peter Simons 9f30660e02 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-2-gcba0663 from Hackage revision
ad20994c04.
2017-12-20 09:17:45 +01:00
Peter Simons f1736d1d42 hackage2nix: downgrade llvm-hs to avoid bug in cabal-install
$ cabal get llvm-hs
  Downloading llvm-hs-5.1.1...
  Invalid package llvm-hs-5.1.1
2017-12-20 09:17:44 +01:00
Peter Simons c13330c160 LTS Haskell 10.0 2017-12-20 09:17:44 +01:00
Orivej Desh febcb6679f snappy: build shared library
See f689a6d1c6

Closes #32880
2017-12-20 03:43:01 +00:00
Orivej Desh 3445138387
Merge pull request #32833 from jtojnar/vala-cleanup
Vala cleanup
2017-12-20 03:40:33 +00:00
Orivej Desh 9c65f44a1d
Merge pull request #32872 from yegortimoshenko/20171219.232832/pup
pup: rename attr go-pup -> pup, clean up, 20160425-e76307d -> 0.4.0, add meta
2017-12-20 01:20:32 +00:00
Yegor Timoshenko 40702af936
buildGoPackage: fill in meta.homepage 2017-12-20 01:07:14 +00:00
Yegor Timoshenko c8adf82928
pup: add meta 2017-12-20 01:05:05 +00:00
Yegor Timoshenko 102f8a8907 pup: clean up, 20160425-e76307d -> 0.4.0 2017-12-20 01:04:25 +00:00
Justin Wood c6496aea49 erlang: 20.1.7 -> 20.2.2 2017-12-19 22:05:12 +00:00
Sander van der Burg ab754a40a2 nodePackages: regenerate with node2nix 1.5.0 + add basic Node.js 8.x package set 2017-12-19 22:17:40 +01:00
Maximilian Bode 2bb24283cc docker_compose: add darwin to platforms 2017-12-19 21:12:37 +01:00
dywedir 0d85bddd06 rust-bindgen: 0.31.1 -> 0.32.1 2017-12-19 22:06:05 +02:00
Michael Raskin 1d7f90cba2 quicklisp-to-nix: update after fixes to our ASDF handling suggested by upstream 2017-12-19 17:55:22 +01:00
John Ericson 13acbeae0b Merge branch 'master' into staging 2017-12-19 11:40:18 -05:00
Jan Tojnar c52e085d40
libunity: remove 2017-12-19 17:25:55 +01:00
Jan Tojnar ae1b059987
vala_0_23: remove 2017-12-19 17:25:55 +01:00
Jan Tojnar a91a051332
libunity: use more recent vala 2017-12-19 17:25:54 +01:00
Jan Tojnar 3fa21ca85c
libappindicator-gtk{2,3}: use recent vala 2017-12-19 17:25:54 +01:00
Jan Tojnar eed3354a4b
libosinfo: 0.2.12 → 1.1.0 2017-12-19 17:25:54 +01:00
Jan Tojnar 000ff1959d
libindicate-gtk{2,3}: use recent vala 2017-12-19 17:25:51 +01:00
Jan Tojnar c747ea1b34
gob2: 2.0.18 → 2.0.20 2017-12-19 17:25:51 +01:00
Jan Tojnar 120f46889c
valum: 0.2.16 → 0.3.14 2017-12-19 17:25:50 +01:00
Jan Tojnar 12d081f787
libskk: 1.0.2 → 1.0.3 2017-12-19 17:17:20 +01:00
Michael Raskin e618aad27e lispPackages.cl-fuse: compile the small wrapper library manually, because for some reason NIX_LDFLAGS get lost with the new binutils wrapper 2017-12-19 16:43:18 +01:00
Vladimír Čunát 9b54a00160
Merge #29785: curl: enable kerberos 2017-12-19 15:18:24 +01:00
Vladimír Čunát 13e6a5c561
kerberos: split headers into $dev 2017-12-19 15:18:01 +01:00
Vladimír Čunát 3c51628a4c
fetchurl: switch to the usual curl
I verified that krb5 doesn't need yacc in lib-only build,
simplifying the circular-reference cut.
2017-12-19 15:17:52 +01:00
Peter Simons 523fae925c haskell-pandoc-citeproc: update override 2017-12-19 13:58:52 +01:00
Peter Simons d323c38082 haskell-htoml-megaparsec: update override for latest megaparsec version 2017-12-19 13:58:52 +01:00
Peter Simons ee75081370 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7-2-gcba0663 from Hackage revision
d1e90f94f3.
2017-12-19 13:58:47 +01:00
Peter Simons 53a18401ff hackage2nix: update list of broken builds 2017-12-19 13:58:45 +01:00
Peter Simons 1c988f97e9 LTS Haskell 9.20 2017-12-19 13:58:45 +01:00
Graham Christensen 035aca9d09
electron: Properly handle evaluating on unsupported archs 2017-12-19 06:48:41 -05:00
Vladimír Čunát 4a2340ff6b
Merge branch 'staging' 2017-12-19 10:27:13 +01:00
Vincent Laporte b4551924b1
Merge pull request #32737 from vbgl/coq-packages-filter
Tidy up the Coq package sets
2017-12-19 10:15:31 +01:00
Lancelot SIX 982cd565cc
Merge pull request #32447 from lsix/add_djano_hijack_admin
pythonPackages.django_hijack_admin: init at 2.1.5
2017-12-19 09:18:22 +01:00
Lancelot SIX 298f404aeb
Merge pull request #32446 from lsix/update_django_1_11
pythonPackages.django: 1.11.7 -> 1.11.8
2017-12-19 09:16:24 +01:00
Orivej Desh 8f53673c64
Merge pull request #32768 from yegortimoshenko/electron/1.7.9
electron: 1.8.1 -> 1.7.9
2017-12-18 23:56:04 +00:00
Yegor Timoshenko a9d212fea4 electron: 1.8.1 -> 1.7.9
1.7.9 is the latest stable, and 1.8.1 is beta and it draws `rambox` as a white
rectangle (after a few manipulations with the window such as hiding, showing,
resizing): https://github.com/NixOS/nixpkgs/pull/32741#issuecomment-352203170
2017-12-18 23:52:11 +00:00
Jan Tojnar 64cc62162d
Merge pull request #32793 from jtojnar/telepathy
Telepathy updates
2017-12-19 00:47:18 +01:00
Thomas Tuegel 86311030cf
haskell: set buildInputs in nix-shell env
systemBuildInputs goes in buildInputs (instead of nativeBuildInputs) so that
NIX_CFLAGS_* is set correctly and gcc works.
2017-12-18 13:49:18 -06:00
Orivej Desh 5b6c5964b0 Revert "cairo: bugfix 1.14.10 -> 1.14.12"
This reverts commit fc5756ea5e.

It hangs in cairo_image_surface_create_from_png_stream consuming 100% CPU when
png is malformed:
fc5756ea5e
2017-12-18 18:18:15 +00:00
Shea Levy c6c05dd255
gurobipy: Use buildPythonPackage on Darwin. 2017-12-18 13:07:41 -05:00
Shea Levy 03e10f8535
gurobipy: Use buildPythonPackage on Linux 2017-12-18 12:42:54 -05:00
Orivej Desh b29c78df66 gst_all_1.gst-vaapi: 1.12.3 -> 1.12.4 2017-12-18 16:17:50 +00:00
Orivej Desh 7c58e8dfc2 Merge branch 'master' into staging
* master: (125 commits)
  scummvm: fix eval
  tinycc: 0.9.27pre-20171016 -> 0.9.27
  Update terraform provider versions
  vscode: 1.18.1 -> 1.19.0
  linux: 4.14.6 -> 4.14.7
  scummvm: 1.9.0 -> 2.0.0
  cmst: 2017.03.18 -> 2017.09.19
  albert: 0.14.7 -> 0.14.14
  obs-studio: fix vlc plugin
  ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
  uchiwa: 0.26.3 -> 1.1.0
  linux-testing: 4.15-rc3 -> 4.15-rc4
  steam: override nss, nspr, fixes #32781
  ponyc: 0.20.0 -> 0.21.0
  pythonPackages.pwntools: disable tests
  gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4
  vim-rhubarb: init at 2017-06-28
  atom: depend on libsecret
  nvidia-settings: Make sure binary can find libXv.so
  backblaze-b2: 0.6.2 -> 1.1.0
  ...
2017-12-18 15:56:03 +00:00
Vincent Laporte fcb89df111
coqPackages.multinomials: init at 1.0 2017-12-18 15:30:38 +00:00
Vincent Laporte d9f41a5bce
coqPackages: move to a separate file and filter the package set 2017-12-18 15:30:36 +00:00
Joachim Fasting 3b367119ee
tinycc: 0.9.27pre-20171016 -> 0.9.27 2017-12-18 16:06:42 +01:00
Orivej Desh c4b71137bf
Merge pull request #32725 from yegortimoshenko/fribidi
fribidi: update source
2017-12-18 13:25:30 +00:00
Joachim F 5450c225ae
Merge pull request #32775 from kamilchm/ponyc
ponyc: 0.20.0 -> 0.21.0
2017-12-18 12:36:52 +00:00
Cray Elliott c1e8fea4fc ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
also remove CVE patch, it is upstream in v3.4.1
2017-12-17 23:00:05 -08:00
Yegor Timoshenko 951c5d3b7d fribidi: update source
The old site redirects to GitHub.
2017-12-18 05:34:26 +00:00
Jan Tojnar bfbfea98ea
telepathy_qt: 0.9.6.1 → 0.9.7 2017-12-18 05:23:26 +01:00
Jan Tojnar 3366ce99df
Merge pull request #32750 from jtojnar/gupdates
GNOME updates
2017-12-18 02:20:35 +01:00
Jan Tojnar 0a8b47d709
Merge pull request #32749 from jtojnar/gnome-gtk2-cleanup
Minor GNOME cleanups
2017-12-18 02:18:42 +01:00
Kamil Chmielewski 860ce9e386 ponyc: 0.20.0 -> 0.21.0
https://github.com/ponylang/ponyc/issues/2379
2017-12-17 21:52:11 +01:00
Kristoffer Søholm 56949d7e75 pythonPackages.pwntools: disable tests
There aren't any tests to run, and now the package fails to build
because of a crash while looking if there are any tests.
2017-12-17 20:03:24 +01:00
Jan Malakhovski ea477463a2 libtoxcore-old: remove unused derivation 2017-12-17 14:33:45 +00:00
David Tulig ead4eca0b6 backblaze-b2: 0.6.2 -> 1.1.0 2017-12-17 14:13:42 +00:00
Orivej Desh 0fdb4473f6
Merge pull request #32587 from tristan0x/assimp4
assimp: 3.3.1 -> 4.1.0
2017-12-17 13:40:39 +00:00
Jan Tojnar cfcb02214e
webkitgtk218x: make gtk2 optional 2017-12-17 10:02:20 +01:00
Peter Simons 2737faba47
Merge pull request #32746 from jtojnar/bustle
haskellPackages.bustle: build icons and metadata
2017-12-17 08:42:05 +01:00
Jörg Thalheim 0643952fa5
Merge pull request #32375 from volth/oracle-jdk-remove-redundand-asserts
oraclejdk: remove redundant asserts
2017-12-16 23:20:45 -08:00
Jörg Thalheim 28541e2a3f
Merge pull request #32615 from xvapx/asar
nodePackages.asar: init at 0.14.0
2017-12-16 23:20:29 -08:00
Jan Tojnar e9ead48949
gegl_0_3: 0.3.24 → 0.3.26 2017-12-17 06:33:29 +01:00
Orivej Desh a9f83b1203
Merge pull request #32409 from romildo/fix.network-manager-applet
libdbusmenu: 12.10.12 -> 16.04.0; network-manager-applet: enable appindicator support
2017-12-17 04:34:39 +00:00
Samuel Leathers a76896ea2c
Merge pull request #32748 from andrestylianos/joker
joker: 0.8.6 -> 0.8.7
2017-12-16 23:27:04 -05:00
Orivej Desh 4de81540df
Merge pull request #32427 from TravisWhitaker/cudnn
cuDNN 7.0.3 -> 7.0.5
2017-12-17 04:25:42 +00:00
André Stylianos Ramos dac6aa7d4e joker: 0.8.6 -> 0.8.7 2017-12-17 04:40:53 +01:00
Orivej Desh 1b3f837002
Merge pull request #32640 from Ralith/vulkan
vulkan-loader: 1.0.42.2 -> 1.0.61.1
2017-12-17 01:00:57 +00:00
Orivej Desh 6ba5caacbd
Merge pull request #32647 from berce/upstream-wxPython
wxPython: enable headers
2017-12-17 00:17:38 +00:00
Orivej Desh 97f9bfd280
Merge pull request #32662 from jluttine/add-xlsxwriter
pythonPackages.XlsxWriter: init at 1.0.2
2017-12-16 22:57:47 +00:00
Vincent Laporte 32ac626973
ocamlPackages.sexplib: 0.9.3 -> 0.10.0 2017-12-16 21:47:59 +00:00
Orivej Desh ee03ae2c41
Merge pull request #32739 from jtojnar/libpcap-nolimit
libpcap: increase maximum snapshot length for dbus
2017-12-16 21:42:36 +00:00
Jan Tojnar 07c375d9fc
haskellPackages.bustle: build icons and metadata 2017-12-16 22:42:30 +01:00
Vladimír Čunát fc5756ea5e
cairo: bugfix 1.14.10 -> 1.14.12 2017-12-16 17:51:52 +01:00
Vladimír Čunát 21ba964f0b
mesa: maintenance 17.2.6 -> 17.2.7 2017-12-16 17:51:17 +01:00
Vladimír Čunát 07d3bfc4b4
libjpeg(-turbo): 1.5.2 -> 1.5.3 2017-12-16 17:25:39 +01:00
Vladimír Čunát f7460f6890
Merge #32686: update nodejs and libuv 2017-12-16 17:11:37 +01:00
Jan Tojnar f856f3bf23
libpcap: increase maximum snapshot length for dbus
DBus packet size can be bigger than the size allowed by libpcap,
which breaks applications like bustle.

The issue was fixed upstream so we are backporting the commits.

https://github.com/wjt/bustle/issues/4
2017-12-16 16:22:28 +01:00
Orivej Desh 700e7898b7
Merge pull request #32717 from gebner/perl-builder-env-perl
perl generic builder: recognize #!/usr/bin/env perl
2017-12-16 13:08:05 +00:00
Michiel Leenaars b2d90f1d64
ocamlPackages.cohttp: 0.99 => 1.0.0
ocamlPackages.git-http: mark as broken
2017-12-16 12:21:00 +00:00
Orivej Desh 3501d81585
Merge pull request #32724 from lukeadams/edk2-update
edk2: 2014-12-10 -> 2017-12-05
2017-12-16 12:11:17 +00:00
Vincent Laporte 12c5fe3e2d ocamlPackages.cairo2: 0.4.6 -> 0.5 2017-12-16 12:14:35 +01:00
Orivej Desh 08ff5462ed edk2 add short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch
as requested by @lukeadams in
https://github.com/NixOS/nixpkgs/pull/32724#issuecomment-352140119
2017-12-16 03:07:42 +00:00
Luke Adams 237cf9e21f edk2: 2014-12-10 -> 2017-12-05
src was at vUDK2017 tag (2017-06-13), updated to the latest commit in UDK2017 branch.
2017-12-16 03:01:38 +00:00
Vladimír Čunát 0990b2c7fd
Revert "Reverting #32599"
This reverts commit 15d3d68a5e.
The PR is moved from master to staging.
2017-12-15 22:10:12 +01:00
Vladimír Čunát 3b36161935
Merge branch 'master' into staging 2017-12-15 22:09:44 +01:00