alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
120914 commits 217 branches 121 tags 4.5 GiB
Commit graph

8747 commits

Author SHA1 Message Date
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
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
Orivej Desh b62ad4f22b
Merge pull request #31526 from srhb/fix-php-external-pcre 
php: Fix php pcre by using external lib
 2017-11-13 20:15:37 +00:00
Tom Smeets 81295c479d fractalart service: init, Generate wallpapers (#23231) 
* Add a service for generating wallpapers
This service will generate a new wallpaper using the "FractalArt" haskell package.
 2017-11-13 19:56:08 +01:00
Matt McHenry 292715ce23 smartd: fix 'cat: command not found' error 2017-11-13 12:52:24 -05:00
Orivej Desh 470a7752d8 make-disk-image: fix eval 2017-11-13 14:56:30 +00:00
Samuel Leathers e0483a59cc
Merge pull request #31532 from romildo/upd.enlightenment 
enlightenment: 0.21.10 -> 0.22.0
 2017-11-12 21:44:54 -05:00
José Romildo Malaquias c42a0fbf09 enlightenment: 0.21.10 -> 0.22.0 
- Update to version 0.22.0
- Switch build tools from autotools to meson
- Change handling of setuid programs
 2017-11-13 00:22:01 -02:00
Orivej Desh 27f5cc959b make-disk-image: embed compression switch into the format name 2017-11-12 18:39:36 +00:00
Orivej Desh 608de48fe4 make-disk-image: add compressed option to compress qcow2 images 2017-11-12 18:28:06 +00:00
Orivej Desh a2d3ee77b8 make-disk-image: clean up 2017-11-12 18:24:26 +00:00
Orivej Desh f7bb8d2dfa
Merge pull request #31537 from orivej/lkl 
lkl: 2017-10-18 -> 2017-11-10, make-disk-image: do not fake time for cptofs
 2017-11-12 18:09:34 +00:00
Sarah Brofeldt 88195b9863 php: pcre test blocks -small channels as well 2017-11-12 11:03:54 +01:00
Sarah Brofeldt 58d07e2d6b php: Add nixos test to ensure php-pcre works in httpd 2017-11-12 08:05:27 +01:00
rnhmjoj ebbe165860
docs: document networking.wireless changes 2017-11-12 00:39:17 +01:00
rnhmjoj 2918f6a3f0
nixos/wireless: add manual network configuration 2017-11-11 23:11:46 +01:00
Renaud 1503409aac
Merge pull request #30943 from csingley/nzbget 
nzbget.service override nzbget.conf broken paths with current derivation
 2017-11-11 22:04:29 +01:00
Orivej Desh a84ce72fdc make-disk-image: do not use faketime 
Since https://github.com/lkl/linux/pull/394 cptofs preserves the source time,
which is 1970-01-01T00:00:01Z for /nix/store and recent for other files.

This reverts commit f5b3f2c5a7.
 2017-11-11 20:57:14 +00:00
Orivej Desh f218ef647c make-disk-image: clean up 2017-11-11 20:24:26 +00:00
Orivej Desh 2dd9588834
Merge pull request #31071 from yegortimoshenko/nixos-install/mkdir-or-chmod 
nixos-prepare-root: chmod if dir already exists, fixes #22413
 2017-11-11 01:04:14 +00:00
Orivej Desh 30cbba9061
Merge pull request #31390 from Ma27/fix-buildphase-expressions 
treewide: get rid of invalid `buildPhases` argument
 2017-11-11 00:04:37 +00:00
Benjamin Staffin 64a9f5f0eb
fonts: fix fontconfig.localConf when used with penultimate 
Fixes #31500
 2017-11-10 16:57:45 -05:00
Jörg Thalheim b72e2ecfe4
Merge pull request #31476 from florianjacob/network-interfaces-assertion-messages 
nixos/network-interfaces: Add " around network interface names
 2017-11-10 11:12:49 +00:00
Andreas Rammhold 5feed06535
babeld module: updated example config 
Previosuly the example config did feature the deprecated `wired`
paramter. Wired can now be configured using the `type` parameter.
 2017-11-10 11:54:21 +01:00
Andreas Rammhold 5d9073747a
babeld module: support non-boolean default arguments 
Previosuly only boolean values would be rendered properly. All other
values would cause an error. Even the example configuration did fail.
 2017-11-10 11:54:15 +01:00
Andreas Rammhold 236a7c5452
babeld module: separate default options by space 
In the previous version multiple default values would generate an
invalid babeld config file since all options would be concatenated
without any separator.
 2017-11-10 11:54:08 +01:00
Dan Peebles f5b3f2c5a7 make-disk-iamge: use faketime to get a consistent timestamp 
This fixes #28768 because during an image build, Nix sees bad store
timestamps and attempts to fix them, but can't fix them on a running
system (due to being inside a builder). Since timestamps on the store
are supposed to be 1 anyway, if we fix this, that fixes image building
inside booted images made this way.

Note that this adds quite a bit of noise to the output, because running
`cptofs` under `faketime` causes a bunch of seemingly spurious error
messages and my attempts to suppress them all failed. We'll fix it when
`cptofs` gets a native timestamp preservation feature.
 2017-11-10 05:15:37 +00:00
aszlig 0e790b9f66
nixos/atlassian: Fix eval error in jrePackage 
The error got introduced by 4f3d971ef5,
which removed the *Text attributes from the option.

This in turn leads to an evaluation error while building the
manual/manpage, because oraclejre8 is marked unfree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jbgi, @orivej, @globin
 2017-11-09 20:31:41 +01:00
Florian Jacob fe3751df8a nixos/network-interfaces: Add " around network interface names 
in assertion messages to avoid misinterpretations when the interface name contains a dot.
 2017-11-09 20:27:33 +01:00
Eelco Dolstra 54da9cc944
Amazon image: Add NVMe support to the initrd 
This is required by the new c5.* instance types.

Note that this changes disk names from /dev/xvd* to
/dev/nvme0n*. Amazon Linux has a udev rule that calls a Python script
named "ec2nvme-nsid" to create compatibility symlinks. We could use
that, but it would mean adding Python to the AMI closure...
 2017-11-09 17:53:26 +01:00
Jean-Baptiste Giraudeau 4f3d971ef5 Atlassian apps: remove misleading JRE switch logic 
Only the Oracle JRE is supported by Atlassian appsAtlassian apps
 (see https://jira.atlassian.com/browse/JRASERVER-46152)
 Plus Atlassian apps are non free so the switch logic always chose
 Oracle JRE anyway.
 Option is kept in case someone want to patch apps to support openjdk.
 2017-11-09 12:56:11 +01:00
Jean-Baptiste Giraudeau 3c06d9f0b0 Fix atlassian services (optional attr. and systemd) 
- Properly handle optional configuration.
 - Use ExecStart/ExecStop instead of script/stopScript.
 2017-11-09 12:56:11 +01:00
Maximilian Bosch 161e80e3fd
treewide: get rid of invalid buildPhases argument 
I don't know where this comes from (I accidentally did that as well
once), but some derivations seem to use `buildPhases` rather than
`phases` in their derivations.

This kills all improper usages as the lack of a `phases` argument
didn't break the build, so this can be safely removed.
 2017-11-08 21:38:06 +01:00
Jörg Thalheim 8d145da64a
Merge pull request #30127 from florianjacob/limit_interface_name_length 
nixos/network-interfaces: assertion for too long interface names
 2017-11-08 20:35:08 +00:00
Jörg Thalheim 999bcd098d
Merge pull request #31296 from ryantm/mattermost43 
mattermost, nixos/mattermost: update to 4.3.0
 2017-11-08 17:45:42 +00:00
Joerg Thalheim 00344162a7 Revert "nixos/test-instrumentation: softcode DISPLAY" 
This reverts commit 4531ec5955.

This broke waitForX: b11ac5d29d (commitcomment-25486347)

cc @Lassulus
 2017-11-08 17:04:39 +00:00
Jörg Thalheim b11ac5d29d
Merge pull request #31198 from Lassulus/test-display 
nixos/test-instrumentation: take DISPLAY from system-config
 2017-11-08 14:44:16 +00:00
Renaud 792dc7a859
Merge pull request #31252 from shaunren/compton 
compton: change extraOptions type to types.lines
 2017-11-07 23:10:41 +01:00
lassulus 4531ec5955 nixos/test-instrumentation: softcode DISPLAY 2017-11-07 23:01:59 +01:00
Maximilian Bosch 410f0f0db2
services.xserver: fix apply of default DM/WM 
This is needed to pick the first enabled DM/WM
if the default is `none`
 2017-11-07 12:18:24 +01:00
Raphael Das Gupta 27c8fd24e5 nixos/mysql: fix typo in description of mysql.bind option 2017-11-07 11:09:40 +01:00
Sarah Brofeldt 294bb6daea nixos/tests/gitlab.nix: Unbreak config, still times out 2017-11-06 14:52:33 +01:00
Vaibhav Sagar eece8755d1 ihaskell: re-enable 2017-11-06 09:58:28 +01:00
Orivej Desh 4435bb8ba8
Merge pull request #30665 from michaelpj/imp/plymouth-themes 
plymouth: fix breeze-plymouth (and other themes)
 2017-11-06 06:18:38 +00:00
Orivej Desh 30bd994724
Merge pull request #31161 from nocent/master 
networkmanager: add power saving and mac address randomization options for wifi devices
 2017-11-06 06:17:16 +00:00
Orivej Desh 9431da5396
Merge pull request #30966 from csingley/plexpy 
Add plexpy user id
 2017-11-06 06:16:00 +00:00
Christopher Singley 1a38312dae plexpy: add user id 2017-11-06 06:15:28 +00:00
Ryan Mulligan e8c8370425 nixos/mattermost: fix for webapp being renamed to client 2017-11-05 13:53:50 -08:00
Markus Mueller 4874862732
babeld module: init 2017-11-05 21:15:23 +01:00
Franz Pletz 711303952e
wireguard module: add device name environment var 
This makes the interface name available as an environment variable for
the pre/post hooks.
 2017-11-05 16:42:25 +01:00
Profpatsch 462c048c77 lib/types: add ints.positive. 
For values that are positive, but cannot be 0.
 2017-11-05 15:56:32 +01:00
Profpatsch c85f085062 lib/types: update docs to match the new type names 2017-11-05 15:56:32 +01:00
Profpatsch 3e3bfc66f7 lib/types: nixos manual documentation for signed/unsinged int 
Synchronize the manual for the new types.
 2017-11-05 15:56:32 +01:00
Profpatsch c53d874277 lib/types: add intBetween 
An int type that checks the value range.
 2017-11-05 15:56:32 +01:00
Shaun Ren eca212741e compton: change extraOptions type to types.lines 2017-11-05 20:23:44 +09:00
Frederik Rietdijk dd851a8d75
Merge pull request #31254 from LumiGuide/graphite-python-overrides 
graphite: override django and django_tagging
 2017-11-05 09:40:59 +01:00
Maximilian Bosch 5b70c1855b
Revert "Revert "services.xserver: assert that either desktop- or window manager is not "none""" 
This reverts commit e64dc25434.
 2017-11-05 07:32:56 +01:00
Herwig Hochleitner e64dc25434 Revert "services.xserver: assert that either desktop- or window manager is not "none"" 
This reverts commit 93c54acf97.
This reopens #30517 @nbp @Ma27

Breaking people's config for this is hardly reasonable as is. If it
absolutely cannot be avoided, at the very least, we need to provide
clear instructions on what people need to upgrade in their config. I
actually had to bisect to the commit, to even find out what property I
should change or define, as the error message was useless. It didn't
even mention a property name.

Discussion on the PR seems to be ongoing, so I'm reverting this, so we
don't break people's systems on unstable.
 2017-11-05 01:51:13 +01:00
Guillaume Maudoux 7325ad9ab7 graphite: override django and django_tagging 
instead of depending on specific versions in the django_tagging_0_4_3
and graphite_web derivations.

This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088

This was joint work of @basvandijk and @layus at NixCon 2017.
 2017-11-04 17:53:35 +01:00
Yegor Timoshenko 2c9e195eed nixos-prepare-root: chmod if dir already exists 2017-11-04 15:07:36 +00:00
Tim Steinbach 97f172a1d5
Merge pull request #31146 from NeQuissimus/kafka_updates 
Kafka: Update + Tests
 2017-11-04 11:06:32 -04:00
Maximilian Bosch 93c54acf97 services.xserver: assert that either desktop- or window manager is not "none" 
resolves #11064
 2017-11-04 15:30:20 +01:00
Frederik Rietdijk ae23084237
Merge pull request #30107 from danbst/patch-13 
declarative containers: improve example config
 2017-11-04 09:59:09 +01:00
Tim Steinbach 5925aebc03
Merge pull request #31201 from gnidorah/sway 
sway module: setcap binary, not wrapper
 2017-11-03 17:34:58 -04:00
Benjamin Staffin 600f393bc7
keybase service: Turn off debug logging 
Keybase is _extremely_ verbose with its debug output when run with -d.
 2017-11-03 14:45:08 -04:00
gnidorah 194d7852f7 sway module: setcap binary, not wrapper 2017-11-03 21:00:46 +03:00
Daiderd Jordan 9a1534496a
Merge pull request #31149 from LumiGuide/pgmanage-10.0.2 
postage: replaced by pgmanage-10.0.2
 2017-11-03 12:32:29 +01:00
Joerg Thalheim 2e6daff704 nixos/unbound: correct indented interface/access lists 2017-11-03 08:37:02 +00:00
Bas van Dijk c894327215 postage: replaced by pgmanage-10.0.2 
postage is no longer maintained and has been replaced by the identical pgmanage. See:

https://github.com/workflowproducts/postage#postage-has-been-replaced-with-pgmanage

The following error is raised when a user enables the deprecated `services.postage.enable` option:

Failed assertions:
- services.postage is deprecated in favor of pgmanage. They have the same options so just substitute postage for pgmanage.
 2017-11-03 00:14:00 +01:00
nocent af13b05dda networkmanager: add power saving and mac address randomization options for wifi devices 2017-11-02 21:57:25 +00:00
Tim Steinbach beefaff2c1
kafka: Add tests 2017-11-02 15:10:33 -04:00
Tim Steinbach d27cf320cf
zookeeper: Add simple test 2017-11-02 14:09:56 -04:00
Andrew Dunham 7f921735e7
strongswan: allow configuring enabled plugins 2017-11-02 14:39:14 +01:00
José Romildo Malaquias 62204a59c7
Merge branch 'master' into upd.lxqt 2017-11-02 10:27:39 -02:00
zimbatm c34c737172
Merge pull request #31100 from zimbatm/hashcat4 
Hashcat4
 2017-11-02 11:23:07 +00:00
Pierre-Etienne Meunier 538acd9060 ACME module: add server option (#31122) 2017-11-02 11:10:47 +01:00
José Romildo Malaquias c07835a11b
Merge branch 'master' into upd.lxqt 2017-11-02 00:29:12 -02:00
José Romildo Malaquias b6d27b7271 lxqt: remove lxqt-common 2017-11-02 00:14:46 -02:00
Sarah Brofeldt 2ddcdcce26 nixos/postfix: support alternate smtp ports when relaying (#30685) 
* postfix: support alternate smtp ports when relaying

* fix missing ; after merge
 2017-11-01 19:06:27 +01:00
zimbatm 309373ea68 intel-ocl: r4.0-59481 -> 5.0-63503 2017-11-01 17:59:49 +00:00
Danylo Hlynskyi 398705ba86
containers: autoStart doc typo 2017-11-01 10:25:26 +02:00
Orivej Desh efea96ddca
Merge pull request #31007 from yegortimoshenko/nixos-generate-config/umask 
nixos-generate-config: enforce umask 0022, fixes #30954
 2017-11-01 01:58:34 +00:00
Sander van der Burg 6d1317ab31
Merge pull request #31058 from rnhmjoj/dnschain 
DNSChain: move expression to new nodePackages
 2017-10-31 23:44:02 +01:00
Graham Christensen 2d583f7275
Merge pull request #31039 from LumiGuide/fix-graphite-api 
graphite: fix the graphiteApi service
 2017-10-31 17:53:02 -04:00
Graham Christensen e5a44f3034
Merge pull request #31044 from LumiGuide/fix-apache-httpd 
apache-httpd: fix nix evaluation error
 2017-10-31 17:50:57 -04:00
Graham Christensen 486c125dc3
Merge pull request #31050 from pbogdan/wordpress-disable-autoupdates 
apache-httpd/wordpress: disable built-in WordPress autoupdater
 2017-10-31 17:50:02 -04:00
rnhmjoj ea8714ecb1
nixos/dnschain: use nodePackages.dnschain 2017-10-31 22:03:38 +01:00
mingchuan e0318379ae nixos/ssh: fix example 2017-11-01 02:54:38 +08:00
Piotr Bogdan 3165c56db9 apache-httpd/wordpress: disable built-in WordPress autoupdater 2017-10-31 17:37:11 +00:00
Bas van Dijk 527781ebc4 apache-httpd: fix nix evaluation error 
This only sets the timezone when it's not null to prevent:

  error: cannot coerce null to a string, at
  nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix:676:7
 2017-10-31 17:33:54 +01:00
Bas van Dijk 04b2460eb6 graphite: fix the graphiteApi service 2017-10-31 15:49:59 +01:00
Yegor Timoshenko f2621d4ba8 nixos-generate-config: enforce umask 0022, fixes #30954 2017-10-30 21:59:37 +00:00
lassulus 440178d729 gdm: don't start getty@tty1 if enabled 2017-10-30 21:43:10 +01:00
Bas van Dijk 07e0c0e0a2 network-interfaces-scripted: fix NixOS/nixops#640 
Reverse the PartOf dependency between network-setup and network-addresses-*

This was joint work of: @nh2, @domenkozar, @fpletz, @aszlig and @basvandijk
at the NixCon 2017 hackathon.
 2017-10-30 20:45:32 +01:00
Chris Martin 0581038e8e nixos/acme: remove doc note about restarting nginx 
Discussion from #30945 indicates that it is no longer true that you have
to restart nginx.
 2017-10-30 13:51:35 -04:00
Márton Boros c556c72a2e nixos/gitlab: fix secret generation 
This line previously produced an error and an empty secret file.
 2017-10-30 12:49:27 +01:00
Márton Boros 00c03e9003 nixos/gitlab: fix preStart script 2017-10-30 12:49:27 +01:00
Márton Boros 29e80bde40 nixos/gitlab: fix hard-coded database name 2017-10-30 12:49:27 +01:00
Christopher Singley b2c2944998 nzbget.service override nzbget.conf broken paths with current derivation 2017-10-29 19:37:56 -05:00
Christopher Singley 95dc36235c PlexPy service 2017-10-29 19:29:25 -05:00