120419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitry Moskowski	07b6bf3f07	influxdb: 1.0.2 -> 1.4.1	2017-11-14 11:45:13 +00:00
Franz Pletz	172d346ff1	Merge pull request #31628 from lheckemann/fbterm-arm ... fbterm: fix build on non-x86	2017-11-14 12:39:51 +01:00
Franz Pletz	f6ad758c18	Merge pull request #31634 from yegortimoshenko/bchunk/1.2.2 ... bchunk: 1.2.0 -> 1.2.2	2017-11-14 12:35:10 +01:00
Franz Pletz	1f645d2cef	Merge pull request #31638 from matthewbauer/ncmpc ... ncmpc: fix on darwin	2017-11-14 12:34:25 +01:00
Franz Pletz	775fb7e127	Merge pull request #31616 from jerith666/smartd-cat ... smartd: fix 'cat: command not found' error	2017-11-14 12:32:23 +01:00
Peter Simons	c404aa43a9	hackage-packages.nix: automatic Haskell package set update ... This update was generated by hackage2nix v2.6-16-g50aa754 from Hackage revision 364936a85b.	2017-11-14 12:27:31 +01:00
Peter Simons	3c43ebe9d0	hackage2nix: disable broken builds	2017-11-14 12:27:29 +01:00
Peter Simons	9fa0a6338c	LTS Haskell 9.13	2017-11-14 12:27:29 +01:00
Peter Simons	a3ab69d79c	pdsh: 2.29 -> 2.33	2017-11-14 12:25:41 +01:00
Franz Pletz	6806dd36e1	Merge pull request #31420 from ChengCat/chengcat ... vista-fonts-chs: init at 1	2017-11-14 12:21:33 +01:00
Yucheng Zhang	55ec8e1881	vista-fonts-chs: init at 1	2017-11-14 20:05:32 +08:00
Franz Pletz	5499e42ed3	Merge pull request #30814 from ebzzry/usync-0.0.3 ... usync: init at 0.0.3	2017-11-14 12:17:54 +01:00
Franz Pletz	06d0ba1ee9	Merge pull request #31477 from andir/fix-babeld-config ... Fix babeld config	2017-11-14 12:12:59 +01:00
Franz Pletz	aeff3080d0	Merge pull request #31653 from bflyblue/plex-1.9.6.4429 ... plex: 1.9.5 -> 1.9.6	2017-11-14 12:04:51 +01:00
Franz Pletz	d43b55c1e3	Merge pull request #31545 from rnhmjoj/wireless ... docs: document networking.wireless changes	2017-11-14 12:04:26 +01:00
Tuomas Tynkkynen	cbccb1edf5	nixos installer tests: Add UEFI Grub test ... Fixed merge conflict. Closes #22923.	2017-11-14 11:30:28 +01:00
Shaun Sharples	7f9d876fea	plex: 1.9.5 -> 1.9.6	2017-11-14 11:57:16 +02:00
Linus Heckemann	e50745712c	fbterm: fix build on non-x86	2017-11-14 09:01:13 +00:00
Michael Raskin	eac38d0b1e	Merge pull request #31617 from orivej/clisp ... clisp_2_44_1, libsigsegv_25: delete	2017-11-14 09:42:20 +01:00
Cray Elliott	3c0c18792d	mwprocapture: forgot to include a file	2017-11-13 20:26:24 -08:00
Cray Elliott	7f473fa506	mwprocapture: minor correctness fix to 4.14 patch	2017-11-13 20:21:56 -08:00
Cray Elliott	eb85eb5c73	linuxPackages: revert default linux kernel to 4.9 ... partially reverts bfe9c928c1 by author's request, since many modules are currently broken. 4.14 will be the default kernel when the dust settles track github issue #31640	2017-11-13 20:03:18 -08:00
Daniel Peebles	881e41f0ac	Merge pull request #31639 from matthewbauer/dosbox-on-darwin ... Dosbox on darwin	2017-11-13 23:00:40 -05:00
Cray Elliott	ce8dea6bdd	mwprocapture: patch to fix build for linux 4.14	2017-11-13 19:54:57 -08:00
aszlig	f6ae3948bc	tests/boot-stage1: Fix build of kcanary module ... In bfe9c928c1 the default kernel has been updated to version 4.14 and the declarations for allow_signal() and signal_pending() are no longer exposed via kthread.h, so let's actually use the right header files. I've added a condition for kernel 4.10 and upwards to include the linux/sched/signal.h header file, because that got introduced in version 4.10. Even if the declaration would still reside in kthread.h (I haven't checked) for version 4.10 it won't hurt and the compilation will still succeed. Tested against kernel 4.9 and 4.14 and the build now succeeds. Signed-off-by: aszlig <aszlig@nix.build>	2017-11-14 04:36:19 +01:00
Matthew Bauer	fdf92b553d	dosbox: add gpl2 license	2017-11-13 20:55:40 -06:00
Orivej Desh	ba45205b84	Merge pull request #31579 from matthewbauer/emacs-fixes ... Emacs fixes	2017-11-14 01:44:01 +00:00
Dan Peebles	d5bdfcbfe6	darwin.make-bootstrap-tools: fix ICU reference to improve purity	2017-11-13 20:27:11 -05:00
Orivej Desh	ea2aeb7af4	netperf: update source	2017-11-14 00:32:17 +00:00
Matthew Bauer	ba62c31dfc	ncmpc: fix on darwin	2017-11-13 18:09:18 -06:00
Matthew Bauer	3e6040e3ec	dosbox: add myself as maintainer	2017-11-13 18:08:19 -06:00
Matthew Bauer	010475bb8b	dosbox: build on darwin ... fixes dosbox issue on dariwn	2017-11-13 18:07:57 -06:00
Joerg Thalheim	4e2110b1bb	xbanish: 1.4 -> 1.5	2017-11-14 00:04:40 +00:00
Graham Christensen	3d03f5c39d	Merge pull request #31635 from NixOS/revert-31632-plex-1.9.7.4441 ... Revert "plex: 1.9.5 -> 1.9.7"	2017-11-13 18:54:17 -05:00
Graham Christensen	ce7bc5c321	Revert "plex: 1.9.5 -> 1.9.7"	2017-11-13 18:53:51 -05:00
Graham Christensen	a81bd249fd	Merge pull request #31632 from bflyblue/plex-1.9.7.4441 ... plex: 1.9.5 -> 1.9.7	2017-11-13 18:53:06 -05:00
Joerg Thalheim	d58f318333	trackballs: 1.2.3 -> 1.2.4	2017-11-13 23:44:50 +00:00
Yegor Timoshenko	eb8c0f046d	bchunk: 1.2.0 -> 1.2.2	2017-11-13 23:39:23 +00:00
Renaud	a3f5010644	Merge pull request #31633 from InfernalKnight/viber ... viber: 6.5.5.1481 -> 7.0.0.1035	2017-11-13 23:49:07 +01:00
Eric Bailey	51a8584252	musescore (darwin): 2.0.3 -> 2.1 (#26297)	2017-11-13 23:47:28 +01:00
Graham Christensen	c886b170b1	Merge pull request #31629 from lheckemann/jfbview-mujs ... jfbview: remove mujs and no-longer-necessary patch	2017-11-13 17:10:44 -05:00
infernalknight	0dfe582c5e	viber: 6.5.5.1481 -> 7.0.0.1035	2017-11-14 01:09:48 +03:00
Graham Christensen	9a4b2de497	Merge pull request #31630 from Ma27/fix-postgres-quoting ... services.postgres: fix quoting in the description of `superUser`	2017-11-13 17:01:05 -05:00
Shaun Sharples	228cfe9ff0	plex: 1.9.5 -> 1.9.7	2017-11-13 23:49:05 +02:00
Maximilian Bosch	82062f7080	services.postgres: fix quoting in the description of superUser ... `nixos-option` evals the description and the '`' is used to define shell commands. Due to this, the following error appears: ``` $ nixos-option services.postgresql.superUser Value: "root" Default: "root" Description: /run/current-system/sw/bin/nixos-option: line 294: root: command not found /run/current-system/sw/bin/nixos-option: line 294: postgres: command not found NixOS traditionally used as superuser, most other distros use . From 17.09 we also try to follow this standard. Internal since changing this value would lead to breakage while setting up databases. ```	2017-11-13 22:22:35 +01:00
John Ericson	350a5e31fc	Merge pull request #29418 from vanschelven/small-documentation-improvements ... documentation: cross-compilation - partial rewrite	2017-11-13 16:21:58 -05:00
Linus Heckemann	2c4e1e975c	jfbview: remove mujs and no-longer-necessary patch ... mujs is only required when older versions of mupdf are used, but we have a more recent one in nixpkgs.	2017-11-13 21:08:01 +00:00
Joerg Thalheim	b22f75748e	android-udev-rules: 20171107 -> 20171113	2017-11-13 21:04:33 +00:00
Vladimír Čunát	f80a55ca37	libbsd, libtiger: fix meta evaluation ... I suppose we'll one day transition to forced automatic checks of some basic things before pushing/merging.	2017-11-13 21:53:10 +01:00
Vladimír Čunát	e04339db80	Merge branch 'staging'	2017-11-13 21:50:29 +01:00