172367 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John Ericson	4dfe9f9eb8	Merge remote-tracking branch 'upstream/master' into override-unstable-nix	2019-03-10 13:53:59 -04:00
John Ericson	bfc72142e0	nix*: Make .override work ... Currently, .override is only on a temporary attrset that is thrown away, now it is also on the nix derivations we use.	2019-03-10 13:52:55 -04:00
worldofpeace	213d6dd6ac	Merge pull request #56939 from Kjuvi/appeditor-init-at-1.1.0 ... appeditor: init at 1.1.0	2019-03-09 20:31:59 -05:00
Ryan Mulligan	5511fd1318	Merge pull request #57166 from ar1a/capture-license ... capture: 1.0 -> 2019-03-10	2019-03-09 15:33:45 -08:00
Ryan Mulligan	0ad6a98d88	Merge pull request #57167 from ar1a/pbclibroken ... pb_cli: 1.0 -> 2019-03-10	2019-03-09 15:33:09 -08:00
Aria Edmonds	42631524df	capture: 1.0 -> 2019-03-10	2019-03-10 10:22:43 +11:00
Aria Edmonds	57bfa0c395	pb_cli: 1.0 -> 2019-03-10	2019-03-10 10:15:41 +11:00
Matthew Bauer	1e7bac9401	xcode-sdk-pkgs: add sdk to extraPackages ... this gives you access to libraries like Foundation.	2019-03-09 18:12:25 -05:00
Matthew Bauer	ca6e93155b	Merge pull request #56661 from matthewbauer/stack-hook-fixup ... stack-hook: deduplicate better	2019-03-09 18:08:47 -05:00
Michael Weiss	c1c13e4115	fuse3: 3.4.1 -> 3.4.2	2019-03-10 00:03:25 +01:00
worldofpeace	cec337d50f	Merge pull request #55403 from xtruder/pkgs/hetzner-kube/0.3.2rc1 ... hetzner-kube: 0.3.1 -> 0.3.2rc1	2019-03-09 17:38:20 -05:00
worldofpeace	3c3ccaed81	hetzner-kube: pname cleanup	2019-03-09 22:37:45 +00:00
Silvan Mosberger	6ad76ff1ba	Merge pull request #52096 from furrycatherder/davmail ... nixos/davmail: init	2019-03-09 22:41:55 +01:00
worldofpeace	d81b51ac02	feedreader: add hicolor-icon-theme for setup-hook	2019-03-09 15:39:08 -05:00
Pascal Wittmann	c999c2c89b	instead: 3.2.2 -> 3.3.0	2019-03-09 21:09:06 +01:00
worldofpeace	7435c633f6	Merge pull request #57128 from FlorianFranzen/pyext ... pythonPackages.pyext: 0.6 -> 0.8	2019-03-09 15:05:29 -05:00
Timo Kaufmann	3b7fb15182	Merge pull request #57126 from timokau/sage-maxima-downgrade ... sage: downgrade maxima to 5.41	2019-03-09 20:05:01 +00:00
Matthew Bauer	a923a5bbdc	ova: remove stateVersion ... This is undefined in the default configuration.nix template.	2019-03-09 14:25:05 -05:00
Florian Franzen	e0b3eb075f	pythonPackages.pyext: 0.6 -> 0.8	2019-03-09 20:20:43 +01:00
Michael Raskin	1f8aa8bf1c	Merge pull request #57132 from ckauhaus/vulnix-1.8.0 ... vulnix: 1.7.1 -> 1.8.0	2019-03-09 19:03:06 +00:00
Sean Haugh	f2730d881b	nixos/davmail: init ... Co-authored-by: Aaron Andersen <aaron@fosslib.net> Co-authored-by: Silvan Mosberger <infinisil@icloud.com>	2019-03-09 12:05:15 -06:00
worldofpeace	40953c84e4	Merge pull request #57119 from sveitser/python-rfc3986-pytest-fix ... pythonPackages.rfc3986: fix pytest dependency	2019-03-09 12:56:38 -05:00
Christian Kauhaus	2172f4bd07	vulnix: 1.7.1 -> 1.8.0	2019-03-09 18:37:42 +01:00
worldofpeace	47dd2b4c6e	Replace deprecated py.test command with pytest ... Co-Authored-By: sveitser <sveitser@gmail.com>	2019-03-10 00:40:44 +08:00
Michael Raskin	ea32c78599	Merge pull request #57125 from amazari/fix-zoneminder-local-db2 ... zoneminder: Fix database name and username	2019-03-09 16:37:47 +00:00
Timo Kaufmann	23908a0ee3	sage: downgrade maxima to 5.41 ... See discussion at 82254747af.	2019-03-09 17:23:57 +01:00
scaroo	56aa491ad7	zonminder: Fix database name and username ... PR #56889 messed up db and use naming while fixing the scope of the initialDatabases property. This patch fixes the issue.	2019-03-09 17:21:29 +01:00
Pascal Wittmann	bbfd2be8ed	mhddfs: fix build (see #53716)	2019-03-09 17:14:42 +01:00
Pascal Wittmann	ca436d9db0	Merge pull request #57115 from NixOS/update-aide ... aide: 0.16 -> 0.16.1	2019-03-09 17:06:17 +01:00
worldofpeace	fa64c63fa0	Merge pull request #56552 from worldofpeace/elementary-screenshot-tool/fix-conceal-text ... pantheon.elementary-screenshot-tool: fix conceal text	2019-03-09 11:03:37 -05:00
Alexandre Mazari	d7f6cdeda4	Fix locally created database (#56889) ... * zoneminder: fix initial database creation Move initialDatabases directive from the 'ensureUsers' scope to the correct outer 'mysql' one. * zoneminder: Fix mysql username to match unix username When database.createLocally is used, a mysql user is created with the ensureUsers directive. It ensures that the unix user with the name provided exists and can connect to MySQL through socket. Thus, the MySQL username used by php/perl scripts must match the unix user owning the server PID. This patch sets the default mysql user to 'zoneminder' instead of 'zmuser'.	2019-03-09 17:57:39 +02:00
Ryan Mulligan	32e9296244	Merge pull request #57111 from NixOS/update-calibre ... calibre: 3.39.1 -> 3.40.1	2019-03-09 07:00:56 -08:00
sveitser	a554b1c71f	pythonPackages.rfc3986: fix pytest dependency	2019-03-09 21:38:27 +08:00
Graham Christensen	777e94d903	Merge pull request #55436 from layus/warn-manual-ids ... Nixos manual: error out on missing IDs	2019-03-09 08:21:07 -05:00
markuskowa	2debad92f0	Merge pull request #56144 from callahad/digikam-media-player ... digikam: fix media playback by adding ffmpeg to buildInputs	2019-03-09 14:15:38 +01:00
Pascal Wittmann	2e1217fb48	aide: 0.16 -> 0.16.1	2019-03-09 13:33:11 +01:00
Vladimír Čunát	84be644f87	Merge #56833: linuxPackages.bcc: fix build	2019-03-09 13:23:27 +01:00
Pascal Wittmann	d20f21de9c	Merge pull request #57113 from NixOS/fix-areca-build ... areca: fix build	2019-03-09 13:16:59 +01:00
Pascal Wittmann	13e4398683	areca: fix build	2019-03-09 12:52:34 +01:00
Vincent Laporte	3c9bfa32e2	compcert: 3.4 -> 3.5	2019-03-09 05:49:26 -06:00
volth	c730f29e7f	network-scripting: do not run resolvconf if /etc/resolv.conf is managed manually (#56682) ... The second invocation of resolvconf, missed in https://github.com/NixOS/nixpkgs/pull/32308	2019-03-09 13:42:14 +02:00
Maximilian Bosch	b8352653ac	Merge pull request #57098 from Infinisil/fix/sad ... sad: Fix build	2019-03-09 12:29:39 +01:00
Pascal Wittmann	7c1ad76780	calibre: 3.39.1 -> 3.40.1	2019-03-09 12:16:36 +01:00
Maximilian Bosch	9df6083b72	Merge pull request #56733 from r-ryantm/auto-update/react-native-debugger ... react-native-debugger: 0.8.2 -> 0.9.7	2019-03-09 11:58:55 +01:00
Jonas Juselius	279716c330	nixos/kubernetes: add dns addonmanger reconcile mode option (#55834) ... Allow coredns ConfigMap and Depolyment to be editable by the user. An use case is augmenting the default, generated dns records with local services.	2019-03-09 12:57:41 +02:00
Aristid Breitkreuz	3671047632	virtualbox-host module: fix warnings syntax	2019-03-09 11:39:22 +01:00
Ryan Mulligan	abe6ff7e8a	Merge pull request #55542 from Ekleog/ocropus-1.3.3 ... ocropus: 20170811 -> 1.3.3	2019-03-08 21:24:51 -08:00
Ryan Mulligan	5b6c5ded02	Merge pull request #55486 from demyanrogozhin/particl-0.17.1 ... particl-core: 0.17.0.2 -> 0.17.1.2	2019-03-08 21:21:40 -08:00
Wael Nasreddine	a7f4fd0014	doc: format the documentation (#57102)	2019-03-08 21:07:11 -08:00
Ryan Mulligan	b7ebfec61f	Merge pull request #55982 from ivan/pushgateway-0.7.0 ... prometheus-pushgateway: 0.4.0 -> 0.7.0	2019-03-08 20:57:43 -08:00