Commit Graph

34179 Commits

Author SHA1 Message Date
Vladimír Čunát
5f5681ee7f
Merge branch 'master' into staging 2017-01-06 21:05:43 +01:00
Vladimír Čunát
1f7b090580
mesa: maintenance 13.0.2 -> 13.0.3 2017-01-06 21:05:08 +01:00
c0bw3b
6d3183e7da
nghttp2: refactor (close #21029)
Turning the dependencies unrelated to the base libnghttp2 into proper
options.  vcunat modified the commit slightly.
2017-01-06 21:03:11 +01:00
Domen Kožar
f3381f0be2
electron: 1.2.2 -> 1.4.13 2017-01-06 19:00:17 +01:00
Peter Simons
fb2e0e1eaa Merge pull request #21718 from mimadrid/fix/r-modules
r-modules: fix seewave package
2017-01-06 16:59:31 +01:00
Shea Levy
7ee897a3b3 libuv: Tests fail when cross-compiling 2017-01-06 10:37:04 -05:00
Vladimír Čunát
07bf828bd9
Merge branch 'staging'; security /cc #21642 2017-01-06 16:32:47 +01:00
mimadrid
321d5a01b6
r-modules: fix seewave package 2017-01-06 16:31:30 +01:00
Vladimír Čunát
cf1d3677d3
flex: bring back 2.6.1 as an option
Some breakages after flex update aren't so easy to fix,
and I can't really afford to spend much time on it ATM.
2017-01-06 16:17:46 +01:00
Shea Levy
3c2cbd3259 ghc-head: bump 2017-01-06 08:39:12 -05:00
Frederik Rietdijk
39bb4fe0ee Merge pull request #21689 from rzetterberg/godot-2.1.1-stable-init
godot: init at 2.1.1-stable
2017-01-06 12:43:35 +01:00
Richard Zetterberg
4799971895 godot: init at 2.1.1-stable
Adds the [godot engine](https://godotengine.org/) at the latest stable
version.

Produced binary contains the tools and the engine itself.
2017-01-06 12:07:19 +01:00
Peter Simons
f8a1e87e07 git-annex: update to latest version 2017-01-06 11:01:54 +01:00
Peter Simons
d2e344616c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
c6ccb98171.
2017-01-06 11:01:48 +01:00
Peter Simons
0761b0bc5b configuration-hackage2nix.yaml: don't follow LTS Haskell's version constraints on hledger-* 2017-01-06 11:01:13 +01:00
Peter Simons
a0c197102e configuration-hackage2nix.yaml: keep aeson 1.0.x around for stack 2017-01-06 11:01:13 +01:00
William Casarin
ac9b3d64ce configuration-hackage2nix.yaml: update jb55's packages 2017-01-06 11:01:13 +01:00
Michael Raskin
efb6c30d10 Merge pull request #21656 from zimbatm/packer-0.12.1
packer: 0.10.1 -> 0.12.1
2017-01-05 17:54:55 +00:00
Franz Pletz
2102fa0d6d
smack: 3.4.1 -> 4.1.9, fixe CVE-2016-10027
cc #21642
2017-01-05 17:22:08 +01:00
nzupec
0b22e6254b libmemcached: update sha256 hash 2017-01-05 15:48:49 +01:00
Vladimír Čunát
5d3563f80c
treewide: more fixes of phases after bash 4.3 -> 4.4
I'm surprised that the packages ever worked.
2017-01-05 11:07:04 +01:00
Frederik Rietdijk
3b7193604f pythonPackages.pycrypto: dummy depending on pycryptodome, closes #21671 2017-01-05 11:01:07 +01:00
Domen Kožar
28c06567f8 haskellPackages.hakyll: fix build 2017-01-05 10:24:07 +01:00
Franz Pletz
fe9373460c
pythonPackages.pycrypto: add patch to fix CVE-2013-7459
cc #21642
2017-01-05 06:40:43 +01:00
Vladimír Čunát
fcdb6db041
fontconfig-ultimate: fixup after bash update
I've got no idea why it was trying to override the phase list and in
such a way.  Still, it's slightly discomforting that the expansion
semantics was changed in bash.
2017-01-05 01:58:46 +01:00
Vladimír Čunát
ea7b252c9a
Merge branch 'master' into staging 2017-01-04 23:20:43 +01:00
Domen Kožar
05fe17ea3c libvncserver: enable libgcrypt
This allows encrypted vnc sessions for remmina
2017-01-04 22:27:44 +01:00
Franz Pletz
86a251ee2f
libbrotli: 20160120 -> 1.0 2017-01-04 21:19:52 +01:00
Frederik Rietdijk
a3018650a3 Merge pull request #21643 from symphorien/python-tix
Python tix module
2017-01-04 20:51:33 +01:00
Symphorien Gibol
a6e3d71361 python: support the tkinter.tix module 2017-01-04 19:39:33 +01:00
zimbatm
9e97c0b937 packer: 0.10.1 -> 0.12.1 2017-01-04 17:31:45 +00:00
Symphorien Gibol
3f499d3fb9 tix: init at 8.4.1 2017-01-04 17:39:43 +01:00
Domen Kožar
f10dfd692f haskellPackages.mysql: fix #19593 2017-01-04 16:41:42 +01:00
Symphorien Gibol
87ef971478 tk: add private headers to /include
those are necessary to build some extensions like tix
2017-01-04 15:49:27 +01:00
Nikolay Amiantov
e17b483669 glslang, spirv-tools, vulkan-loader: add metainformation 2017-01-04 12:57:22 +03:00
Daiderd Jordan
27660cfdc0
Merge branch 'master' into staging 2017-01-04 01:42:26 +01:00
Nikolay Amiantov
40a9c37ff3 node-env: use upstream version 2017-01-04 02:52:38 +03:00
Graham Christensen
6b504f8b52 Merge pull request #21626 from NeQuissimus/gradle_3_3
gradle: 3.2.1 -> 3.3
2017-01-03 18:45:42 -05:00
Daiderd Jordan
3daa019125 Merge pull request #21551 from zauberpony/vultr-init
vultr: init at 1.12.0
2017-01-04 00:08:04 +01:00
Tim Steinbach
02efac3f9f
gradle: 3.2.1 -> 3.3 2017-01-03 17:38:01 -05:00
Domen Kožar
17b7eb22c3 haskellPackages.wai-app-file-cgi: fix #21498 2017-01-03 23:28:58 +01:00
Domen Kožar
663048f378 Revert "haskell: workaround for bug with dynamic libraries on darwin"
This reverts commit 19e2e7290a.

See the correct fix in aa64994b48a29ea8d12323942f1743fa4133527a

General purpose solution will be once we implement
https://github.com/NixOS/nixpkgs/issues/21624
2017-01-03 23:10:24 +01:00
Domen Kožar
4bba954e13 rocksdb: properly fix #21215 2017-01-03 23:10:24 +01:00
Domen Kožar
4ce88d8674 rocksdb: build without debug 2017-01-03 23:10:24 +01:00
Domen Kožar
8b6b0aea72 Revert "rocksdb-haskell: just compile rocksdb statically to fix #21215"
This reverts commit 5e5df0fea2.
2017-01-03 23:10:24 +01:00
Jörg Thalheim
d05656a9ca rustNightlyBin: fix build hash 2017-01-03 18:21:19 +00:00
Michael Raskin
efd2b279f3 sbcl_1_3_12: init at 1.3.12; reinstating the previous version for Maxima 2017-01-03 18:06:47 +01:00
Michael Raskin
95f3473e18 ecl_16_1_2: init at 16.1.2; reinstating for Maxima 2017-01-03 18:06:47 +01:00
Michael Raskin
7c29295deb gcl_2_6_13_pre: init at 2.6.13pre50. GCL hasn't had releases for a long time, but there are relatively regular prereleases 2017-01-03 18:06:46 +01:00
Daiderd Jordan
538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00