MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
62458 commits 244 branches 124 tags 6.1 GiB
Commit graph

2438 commits

Author SHA1 Message Date
William A. Kennington III
b6e26aa8df nixos/consul: Support a config directory for health checks 2015-05-11 16:45:04 -07:00
William A. Kennington III
1938dc9b54 nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options 2015-05-11 16:27:53 -07:00
Arseniy Seroka
26492cdba3 Merge pull request #7434 from Forkk/plex-media-server 
plex: add support for managing plugins via Nix
 2015-05-11 14:48:30 +03:00
Eelco Dolstra
492471b453 Apply some overrides to upstream systemd units 
This removes the need for the following patches:

9a6cade993
9f7e832c90
 2015-05-11 12:43:35 +02:00
Arseniy Seroka
c0727fb751 Merge pull request #7788 from Lassulus/charybdis 
add charybdis nixos module
 2015-05-11 12:57:58 +03:00
lassulus
304cab2b46 add charybdis nixos module 2015-05-11 11:38:53 +02:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
Ricardo M. Correia
aa75bb25d8 grsecurity: Update stable and test patches 
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
 2015-05-11 02:45:38 +02:00
Charles Strahan
ba186ec4b9 mesos service: only pass --zk if quorum > 0 
The ZooKeeper URL is not necessary when using in-memory slave
registration.
 2015-05-10 19:36:20 -04:00
Charles Strahan
760169663e mesos: fix indentation in service definition 2015-05-10 17:23:33 -04:00
Jascha Geerds
19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise"" 
This reverts commit 48e65cec4e.
 2015-05-10 20:47:50 +02:00
Jascha Geerds
652d06207d cups: Rename "browsing" config option to "advertise" 2015-05-10 13:46:32 +02:00
Jascha Geerds
6f69dd46d7 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 13:46:32 +02:00
Jascha Geerds
f4d9c9043c cups: Remove deprecated config options from cupsd.conf 2015-05-10 13:46:32 +02:00
Jascha Geerds
e9cf6cd34f cups: Use systemd files provided by CUPS 2015-05-10 13:46:32 +02:00
Jascha Geerds
48e65cec4e cups: Rename "browsing" config option to "advertise" 2015-05-10 12:41:21 +02:00
Jascha Geerds
2cc8d15653 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 12:41:21 +02:00
Jascha Geerds
3710dbec05 cups: Remove deprecated config options from cupsd.conf 2015-05-10 12:41:20 +02:00
Jascha Geerds
4ac95ab328 cups: Use systemd files provided by CUPS 2015-05-10 12:41:20 +02:00
Lluís Batlle i Rossell
21dd114f82 Revert "Making nixos keep a ref to its stdenv" 
This reverts commit d170c98d13.

niksnut argues that we need smaller system closures, not bigger.

So users facing the trouble of getting gcc rebuilds after nix-collect-garbage
for any minimal nixos configuration change should use other means of
not losing the stdenv output.

One way is to keep one somewhere: nix-build -A stdenv -o stdenv '<nixpkgs>'.
Another may be to use nix.conf options like gc-keep-outputs, gc-keep-derivations
or env-keep-derivations.
 2015-05-09 21:11:49 +00:00
Lluís Batlle i Rossell
d170c98d13 Making nixos keep a ref to its stdenv 
This will help a lot on ARM, where nix-collect-garbage erases gcc; then, any
change to a small system config file requires rebuilding gcc again.

I don't know why it does not happen on x86. Maybe it just pulls the gcc from
hydra, if garbage is collected.
 2015-05-09 20:19:34 +00:00
Lluís Batlle i Rossell
d8a2bb86c0 Raspberry Pi 2 changes to make it boot. 
It boots, but some things still don't work:
1) Installation of DTBs
2) Boot of initrd

Booting still needs a proper config.txt in /boot, which could probably be
managed by NixOS.
 2015-05-09 17:05:24 +00:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
Rob Vermaas
650d3f8fc4 Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared. 
(cherry picked from commit ccf672ca6b)
 2015-05-07 08:51:38 +00:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Joachim Schiele
7aed6ddbb4 Merge pull request #7482 from qknight/mysql_socket_permissions 
/run/mysqld now 0755 (instead 0700)
 2015-05-07 01:55:00 +02:00
Joachim Schiele
db79335c07 mysql: /run/mysql now 0755 (instead 0700) 
see https://github.com/NixOS/nixpkgs/pull/7482
 2015-05-07 01:51:05 +02:00
Pascal Wittmann
40b9e938b6 postfix service: description enhancement 
closes #7651
 2015-05-06 21:53:39 +02:00
Stephen Weinberg
a6ebccfbb8 Sane default configuration for sabnzbd module 
Added option to set user. Use unpriviledged user by default. Add sane
default for configuration location.
 2015-05-05 00:18:22 -04:00
Aristid Breitkreuz
5ccbfb2dcc tarsnap: fix up permissions of existing cache directories 2015-05-04 18:58:35 +00:00
Eelco Dolstra
4239e276ea fetch-ec2-data: Don't restart 
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
 2015-05-04 16:56:46 +02:00
Eelco Dolstra
28e49dcb41 Style fix 2015-05-04 14:18:14 +02:00
Eelco Dolstra
c2bf9c3ee3 Typo 2015-05-04 14:16:19 +02:00
lethalman
f2870bd77d Merge pull request #7601 from cstrahan/iso-name-fix 
nixos: fix infinite recursion in isoImage.isoName
 2015-05-04 10:24:38 +02:00
Thomas Tuegel
2325791c2b plasma53: patch upstream startkde 
Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
 2015-05-03 17:09:50 -05:00
Philip Potter
2216728979 add support for pam_u2f to nixos pam module 
This adds support for authenticating using a U2F device such as a
yubikey neo.
 2015-05-03 19:22:00 +01:00
Steven Shaw
2a8577d7fe Correct spelling 2015-05-03 19:15:03 +10:00
Domen Kožar
00ef77f426 Merge pull request #7565 from offlinehacker/nixos/confd/module 
nixos: add confd module
 2015-05-02 14:43:02 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Charles Strahan
ba50d48400 mbpfan: service improvements 
* add verbosity setting
* don't set mbpfan as a setuid program
 2015-05-01 17:11:55 -04:00
Charles Strahan
d83399dcd9 mgpfan: new service 2015-04-30 21:21:15 -04:00
Jascha Geerds
6823b5e657 Merge pull request #7636 from bramd/brltty 
Added BRLTTY package
 2015-05-01 00:21:49 +02:00
aszlig
4cdb4a4fef
networkd: Fix evaluation of systemd.network units. 
During the refactor of the networkd stuff in f8dbe5f, a lot of the
options are now needed by systemd.nix as well as networkd.nix but
weren't moved by that commit as well.

For now, this fixes all networkd VM tests except for the macvlan one and
thus it should fix #7505 for at least DHCP-based configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-04-30 06:49:10 +02:00
aszlig
49fa00cded
networkd: Fix disabled networkd units. 
In f8dbe5f, the default value for networking unit "enabled" option
suddenly flipped to false. I have no idea of whether this happened by
accident, but I'm setting it to true again, because it essentially
breaks systemd networking support and we have systemd.network.enable to
have a "turn the world off" switch.

And of course, because the mentioned commit obviously wasn't done with
even a run of the simplest run of one of the network VM tests, we now
get an evaluation error if we switch useNetworkd to true.

Fixes the core issue of #7505.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-04-30 06:49:10 +02:00
Bram Duvigneau
9a535b9023 Added BRLTTY package 2015-04-29 23:02:09 +02:00
Domen Kožar
ff88f4bcda nixos-install: correctly detect stdin 2015-04-29 18:48:21 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Rob Vermaas
ad0bd73775 Work around infinite recursion issue in nixops. 2015-04-29 09:55:20 +00:00
Arseniy Seroka
8150cf11b0 Merge pull request #7605 from ip1981/wiki 
Mediawiki updates
 2015-04-28 19:00:27 +03:00
Ricardo M. Correia
f5e7190572 nixos.system_tarball_pc: Fix evaluation 
It was broken due to 57b05765c9.

ZFS requires `networking.hostId` to be set.
 2015-04-28 17:15:02 +02:00