1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 09:03:48 +00:00
Commit graph

114415 commits

Author SHA1 Message Date
Vladimír Čunát 6b95cf646c
Merge: fixups to staging merge
None are large rebuilds; most are on staging already.
2017-08-30 21:17:17 +02:00
Vladimír Čunát c07e9ba3e7
squishyball: fixup by using older ncurses 2017-08-30 21:15:08 +02:00
Vladimír Čunát 0f0bf06ac6
wyrd: fixup by using older ncurses
(cherry picked from commit 8f713e881e)
2017-08-30 21:14:56 +02:00
Profpatsch 3bff3b10e1 youtube-dl: 2017.08.23 -> 2017.08.27
fixes (among others) mixcloud.com
2017-08-30 21:10:36 +02:00
Frederik Rietdijk 6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Robin Gloster 7cd46a0594
nginx module: add proxyResolveWhileRunning option 2017-08-30 21:01:53 +02:00
Robin Gloster 4ffa9ddb30
nginx module: allow basic configuration of upstreams 2017-08-30 21:01:53 +02:00
Franz Pletz 759daba980
nginx module: first proxy_set_header takes precendence 2017-08-30 21:01:52 +02:00
Franz Pletz 65c2203ffc
nginx module: add option for proxying websocket requests 2017-08-30 21:01:52 +02:00
Franz Pletz 530282eebe
nginx module: fix applying recommended proxy headers
Previously, if proxy_set_header would be used in an extraConfig of
a location, the headers defined in the http block by
recommendedProxySettings would be cleared. As this is not the intended
behaviour, these settings are now included from a separate file if
needed.
2017-08-30 21:01:52 +02:00
Robin Gloster 0371f2b5cc
nginx module: clean up SSL/listen handling 2017-08-30 21:01:52 +02:00
Frederik Rietdijk 56c1c527aa Merge pull request #28758 from pbogdan/thumbor-fix-build
thumbor: fix build
2017-08-30 20:48:56 +02:00
Heitham Omar 6dcc77bdb8 docker: add libseccomp to build 2017-08-30 20:28:43 +02:00
Piotr Bogdan b60c9aa950 thumbor: fix build
thumbor 6.3.2 requires Pillow >=3.0.0 && <4.0.0 whereas presently nixpkgs'
Pillow is at 4.x.x. An upstream commit in a yet unreleased version of thumbor
relaxes the bounds to >=3.0.0 && <5.0.0, and is included here as a patch.
2017-08-30 19:19:59 +01:00
Samuel Leathers 902dc73ee2 sigrok-cli: 0.6.0 -> 0.7.0 2017-08-30 14:04:31 -04:00
Franz Pletz 05c9a95d0e Merge pull request #28378 from Ma27/fix-zshrc-eval-order
programs.zsh: move evlauation of `${zshAliases}` after `cfg.interactiveShellInit`
2017-08-30 19:58:49 +02:00
Franz Pletz 8397dd4285 Merge pull request #28432 from NeQuissimus/389_ds_base_1_3_5_19
389-ds-base: 1.3.5.17 -> 1.3.5.19
2017-08-30 19:57:07 +02:00
Samuel Leathers b39462d0c3 pulseview: 0.3.0 -> 0.4.0 2017-08-30 13:52:17 -04:00
Samuel Leathers 3e1fa824df libsigrokdecode: 0.4.1 -> 0.5.0 2017-08-30 13:52:17 -04:00
Samuel Leathers afa5dcbd7d libsigrok: 0.4.0 -> 0.5.0 2017-08-30 13:52:12 -04:00
Michael Alan Dorman 8374c027f9 melpa-packages: 2017-08-30
Removals:
 - chinese-fonts-setup: removed from melpa
 - chinese-pyim: removed from melpa
 - mo-git-blame: source repository moved, recipe not yet updated
 - org-webpage: removed from melpa
 - simple-rtm: source repository moved, recipe not yet updated
 - vc-fossil: recipe doesn't match repository
2017-08-30 13:45:02 -04:00
Michael Alan Dorman e035d95a43 melpa-stable-packages: 2017-08-30
Removals:
 - chinese-fonts-setup: removed from melpa
 - chinese-pyim: removed from melpa
2017-08-30 13:45:01 -04:00
Michael Alan Dorman 28de93c5bd org-packages: 2017-08-30 2017-08-30 13:45:01 -04:00
Michael Alan Dorman 28cb5f58cf elpa-packages: 2017-08-30 2017-08-30 13:45:01 -04:00
Franz Pletz e269e9d4d8 Merge pull request #28651 from NeQuissimus/evdi_1_4_1_master
evdi: 1.4.1 -> 1.4.1+git2017-06-12
2017-08-30 19:36:47 +02:00
Franz Pletz a28c62d411 Merge pull request #28653 from NeQuissimus/rtlwifi_new_2017_07_18
rtlwifi_new: 2016-09-12 -> 2017-07-18
2017-08-30 19:36:12 +02:00
Franz Pletz c38b8aba16 Merge pull request #28654 from NeQuissimus/rtl8723bs_2017_04_06
rtl8723bs: 2016-04-11 -> 2017-04-06
2017-08-30 19:35:45 +02:00
Franz Pletz 9e6bc51cf5 Merge pull request #28661 from NeQuissimus/ixgbevf_4_2_1
ixgbevf: 4.1.2 -> 4.2.1
2017-08-30 19:35:16 +02:00
Samuel Leathers 1f0d6f1190 ardour: fix build with gcc6 2017-08-30 19:33:05 +02:00
Grant Wu fa5e343242 deluge: 1.3.13 -> 1.3.15
Change libtorrentRasterbar dependency to 1.0.x series (required for
1.3.x series)
Move Deluge out of pythonPackages (it doesn't support Python 3)
2017-08-30 19:25:30 +02:00
Tim Steinbach 4c91e32da6
linux-copperhead: 4.12.9.a -> 4.12.10.a 2017-08-30 13:17:51 -04:00
Franz Pletz b5a95f6289 Merge pull request #28741 from bachp/gitlab-runner-improve
Gitlab runner improve
2017-08-30 18:52:17 +02:00
Jörg Thalheim ee34c2e72f Merge pull request #28752 from disassembler/xbase
xbase: gcc6/gcc7 patches
2017-08-30 17:51:55 +01:00
Franz Pletz e3a8f58a21 Merge pull request #28746 from mguentner/ipfstest
tests: fix ipfs test, test actual networking functionality
2017-08-30 18:50:40 +02:00
Franz Pletz a22e1d4121 Merge pull request #28621 from elitak/ipfs
ipfs improvements
2017-08-30 18:50:11 +02:00
Adam Růžička 55a123a49d notmuch-addrlookup: fix build with notmuch 0.25 (#27691) 2017-08-30 18:43:27 +02:00
Samuel Leathers 078abc31aa xbase: gcc6/gcc7 patches 2017-08-30 12:32:45 -04:00
Mikael Brockman 3d107c15bd solc: v0.4.13 -> v0.4.16 (#28732)
Also add the Z3 SMT solver as a dependency, since the new solc can use
it for checking assertions and stuff (which is awesome).
2017-08-30 18:21:17 +02:00
Michael Raskin e36afa80e3 gfan: 0.5 -> 0.6; #28643 2017-08-30 18:19:14 +02:00
Cillian de Róiste 769c44d9d8 mixxx: patch to build with gcc6 (via debian)
Also, get the sqlite patch directly from bugs.gentoo.org.
2017-08-30 17:57:27 +02:00
Cillian de Róiste 5b70a2f1e5 lmms: use gcc5
This should be fixed in 1.2, which has had a few release candidates
already.
2017-08-30 17:57:27 +02:00
Cillian de Róiste 28856eb23b Lmms: fix homepage URL 2017-08-30 17:57:27 +02:00
Dan Peebles b8538c6801 chromedriver: fix on Darwin
A refactor broke it by forcing a bunch of Linux-specific dependencies on
Darwin that only get used in the patchelf invocation.
2017-08-30 11:49:34 -04:00
Michael Raskin 4ef4a17f77 nilfs-utils: fix build
Just kill .libs to make sure patchelf does shrink-rpath correctly

Complain in comments that patchelf/#98 is still not used by stdenv
2017-08-30 17:54:04 +02:00
Eric Litak 5050c56382 ipfs: adding mountDir options but disabling broken autoMount 2017-08-30 08:24:38 -07:00
Michael Raskin 596daff250 Merge pull request #28751 from disassembler/xplanet
xplanet: gcc6 patch
2017-08-30 17:22:15 +02:00
Eric Litak 5554ea5583 ipfs: preStart configuration moved into daemon services 2017-08-30 08:17:34 -07:00
Eric Litak ba976021af ipfs: refactor; wrapper adjustment 2017-08-30 08:17:34 -07:00
Eric Litak 952424217b ipfs: optionally manage ulimit -n in serviceConfig 2017-08-30 08:17:34 -07:00
Eric Litak 5f9bad6ceb ipfs: add extraConfig option 2017-08-30 08:17:34 -07:00