mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 10:00:56 +00:00
Code Issues Wiki Activity
223393 commits 270 branches 125 tags 5.4 GiB
Commit graph

16955 commits

Author SHA1 Message Date
adisbladis 0dc3e485a1
Merge pull request #85822 from zowoq/cni-collision 
nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages
 2020-04-23 11:22:01 +02:00
Florian Klink 04e308a496
Merge pull request #85815 from arianvp/fix-85800 
Fix networkd not restarting on unit changes
 2020-04-23 10:36:57 +02:00
Arian van Putten f332109ebf nixos/datadog-agent: Fix restartTriggers 
Fixes #85800

1d61efb7f1 accidentially changed the
restartTriggers of `datadog-agent.service` to point to the attribute
name (in this case, a location relative to `/etc`), instead of the
location of the config files in the nix store.

This caused datadog to not get restarted on activation of new
config, if the file name hasn't changed.

Fix this, by pointing this back to the location in the nix store.
 2020-04-23 09:58:18 +02:00
Arian van Putten 14395cc687 nixos/networkd: Fix restartTriggers 
1d61efb7f1 accidentially changed the
restartTriggers of systemd-networkd.service` to point to the attribute
name (in this case, a location relative to `/etc`), instead of the
location of the network-related unit files in the nix store.

This caused systemd-networkd to not get restarted on activation of new
networking config, if the file name hasn't changed.

Fix this, by pointing this back to the location in the nix store.
 2020-04-23 09:53:44 +02:00
Frederik Rietdijk cff0669a48 Merge master into staging-next 2020-04-23 08:11:16 +02:00
John Axel Eriksson 41a95b1b7d
The systemd unit for k3s should differ between agents and servers 2020-04-23 07:55:23 +02:00
Benjamin Staffin f09b8be73d installer test: Fix grub extraConfig syntax 
It looks like `terminal_output.serial` is incorrect, according to the
grub documentation:

https://www.gnu.org/software/grub/manual/grub/html_node/Serial-terminal.html

Related PR: #79406
 2020-04-22 20:30:19 -04:00
zowoq 4102db2127 nixos/podman: remove cni-plugins from environment.systemPackages 2020-04-23 10:29:17 +10:00
zowoq 54b59dd6c0 nixos/cri-o: remove cni-plugins from environment.systemPackages 2020-04-23 10:29:11 +10:00
Niklas Hambüchen 811411db6e journald service: Add helpful comments about the journal getting full 2020-04-23 02:24:50 +02:00
Florian Klink 32516e4fee
Merge pull request #80103 from tfc/port-systemd-confinement-test 
nixosTests.systemd-confinement: Port to Python
 2020-04-23 01:00:51 +02:00
Piotr Bogdan 830733db24 nixos/manual: fix build 2020-04-22 16:56:44 +01:00
Frederik Rietdijk 8374a2a0ee Merge master into staging-next 2020-04-22 17:20:20 +02:00
Julian Stecklina a33ce7e4fb spike: add test to nixosTests 2020-04-22 14:45:12 +02:00
Bas van Dijk 784aa2913a
Merge pull request #79840 from knl/update-oauth2_proxy-to-5.0.0 
oauth2_proxy: 3.2.0 -> 5.1.0
 2020-04-22 12:15:07 +02:00
Jörg Thalheim 6eb1020cbf
Merge pull request #85746 from iblech/patch-11 2020-04-22 10:47:28 +01:00
Jacek Galowicz 0b1bef70a9 nixosTests.redmine: Port to python 2020-04-22 08:36:27 +02:00
Elis Hirwing 9be2cbf27b
nixosTests.php: Add maintainer team as maintainers 2020-04-22 06:48:06 +02:00
Ingo Blechschmidt 2e2da182fe
nixos-containers: add docs about nested containers 2020-04-22 05:30:48 +02:00
Jan Tojnar b231ac2101
Merge pull request #85402 from jtojnar/httpd-php 2020-04-22 04:23:24 +02:00
Aaron Andersen 7bc9f24fb6 nixos/httpd: update release notes 2020-04-21 20:34:55 -04:00
Aaron Andersen d0de970279 nixos/httpd: some mod_php cleanup 2020-04-21 20:33:18 -04:00
Aaron Andersen ee030b121b nixos/httpd: set modern default values for mpm and http2 2020-04-21 20:33:18 -04:00
Aaron Andersen 20f37a4430 nixos/httpd: run as non root user 2020-04-21 20:33:18 -04:00
Alexandre Esteves 4cc383dd9a
Fix typos (#85693) 2020-04-22 01:02:11 +02:00
worldofpeace af2009a800
Merge pull request #85710 from worldofpeace/gnome-iso-wayland-default 
installation-cd-graphical-gnome: don't run xorg default
 2020-04-21 18:19:44 -04:00
davidak 6a7e0562de
Update link in /etc/os-release (#85723) 2020-04-22 00:16:22 +02:00
Ismaël Bouya 3dbd3f2651 rl-2003: Update the release documentation 
It currently says that everything will be backward compatible between lego and simp-le certificates, but it’s not.

(cherry picked from commit 21c4a33cee)
 2020-04-21 23:51:12 +02:00
adisbladis 2d91da909e
Merge pull request #85604 from adisbladis/podman-module 
nixos/virtualisation.podman: Init module
 2020-04-21 23:48:48 +02:00
Florian Klink c1a6e60335
Merge pull request #85598 from danderson/tailscale-fix-cachedir 
nixos/tailscale: set a CacheDir in the systemd unit.
 2020-04-21 22:38:32 +02:00
Florian Klink 6ba4ef6580
Merge pull request #85708 from Beskhue/fix-documentation 
nixos/phpfpm: fix erroneous pools example
 2020-04-21 22:16:15 +02:00
Florian Klink cece19e0d8
Merge pull request #73505 from tomfitzhenry/networkd-dhcp-server-test 
systemd-networkd: add DHCPServer test
 2020-04-21 21:49:47 +02:00
worldofpeace 873f20f63e rl-2009: GNOME ISO 2020-04-21 15:46:20 -04:00
worldofpeace 6464d8f4af nixos/release: add GNOME ISO 2020-04-21 15:44:09 -04:00
worldofpeace 37e146c255 nixos/manual: fix build 2020-04-21 15:43:20 -04:00
worldofpeace 1f12a07179 installation-cd-graphical-gnome: don't run xorg default 
If for some reason the Wayland session fails to start
it will just start the Xorg session.
 2020-04-21 15:26:25 -04:00
Florian Klink 91e3358f62
Merge pull request #85692 from nh2/systemd-update-default-rate-limit 
journald service: Increase default rate limit 1000 -> 10000.
 2020-04-21 21:06:48 +02:00
Thomas Churchman 8880957042 nixos/phpfpm: fix erroneous pools example 2020-04-21 20:59:52 +02:00
Frederik Rietdijk 23be4a8b4d Merge master into staging-next 2020-04-21 19:59:56 +02:00
worldofpeace 9b20a24d4d
Merge pull request #85643 from petabyteboy/feature/generate-config 
nixos/tools: adapt for renamed console options
 2020-04-21 12:50:55 -04:00
Niklas Hambüchen d16d34732c journald service: Increase default rate limit 1000 -> 10000. 
Follows the upstream change of this default:

https://github.com/systemd/systemd/pull/8660
 2020-04-21 18:29:03 +02:00
Domen Kožar a85868fee9
Merge pull request #85685 from nh2/remove-unused-allSupportedNixpkgs 
release-combined: Remove unused value `allSupportedNixpkgs`
 2020-04-21 17:01:30 +02:00
Niklas Hambüchen 1da6613de1 release-combined: Remove unused value allSupportedNixpkgs. 
It was made obsolete by commit

    2de3caf0 -  nixos/release-combined.nix: List constituents of the 'tested' job by name

see also f996744fd3 (r38642487).
 2020-04-21 16:41:41 +02:00
Tom Fitzhenry 0a49d329cb systemd-networkd: add DHCPServer test 2020-04-22 00:12:00 +10:00
adisbladis 43f383c464
nixos.virtualisation.containers: Init common /etc/containers configuration module 
What's happening now is that both cri-o and podman are creating
/etc/containers/policy.json.

By splitting out the creation of configuration files we can make the
podman module leaner & compose better with other container software.
 2020-04-21 10:38:39 +01:00
adisbladis 650df709fb
nixos.virtualisation: Move containers.nix to nixos-containers.nix 
In anticipation of the new containers module.
 2020-04-21 10:36:56 +01:00
adisbladis f0a92ef1d9
nixos/podman: Add maintainer team & add myself to podman team 2020-04-21 10:03:22 +01:00
adisbladis b512a788a4
nixos/virtualisation.podman: Init module 2020-04-21 10:03:18 +01:00
Dominik Xaver Hörl 0412bde942 treewide: add bool type to enable options, or make use of mkEnableOption 
Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate.
 2020-04-21 08:55:36 +02:00
Frederik Rietdijk 803b3d296c Merge staging-next into staging 2020-04-21 08:29:51 +02:00
Milan Pässler d19089e1e7 nixos/tools: adapt for renamed console options 2020-04-21 02:07:53 +02:00
David Anderson cee5ddbb28 nixos/tailscale: set a CacheDir in the systemd unit. 
Fixes a bug where tailscaled drops some files into / when CacheDir
is unset.

Signed-off-by: David Anderson <dave@natulte.net>
 2020-04-20 15:35:55 -07:00
Marek Mahut 60100a7c92
Merge pull request #83769 from dadada/nixos/dokuwiki-multi-server 
nixos/dokuwiki: add support for multi-site, additional plugins and templates
 2020-04-20 19:39:48 +02:00
worldofpeace e9e9582986
Merge pull request #85186 from worldofpeace/20.03-readme 
README.md: 20.03 release
 2020-04-20 11:57:45 -04:00
worldofpeace 6380be302a rl-2003: release date 2020-04-20 11:52:57 -04:00
Eelco Dolstra f76d7b5e41
Merge pull request #85620 from matthewbauer/use-modulesPath-for-nixos-generate-config 
nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs>
 2020-04-20 17:25:17 +02:00
Matthew Bauer c45295d47e nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs> 
For imports, it is better to use ‘modulesPath’ than rely on <nixpkgs>
being correctly set. Some users may not have <nixpkgs> set correctly.
In addition, when ‘pure-eval=true’, <nixpkgs> is unset.
 2020-04-20 09:57:17 -05:00
Léo Gaspard 203955fa0c
Merge pull request #82714 from delroth/s3tc 
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options
 2020-04-20 13:41:47 +02:00
Jörg Thalheim 2f0ee4bd0b
Merge pull request #85371 from Mic92/tmpfiles 2020-04-20 10:32:58 +01:00
Nikola Knezevic 3c551848be oauth2_proxy: Update NixOS module 
Update to match the current flags and apply fixes to all breaking changes.
 2020-04-20 10:11:46 +02:00
adisbladis ab37d7e7ea
nixos-containers: Add support for custom nixpkgs argument 2020-04-20 07:33:46 +01:00
Pierre Bourdon 1b89bffcf4
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options 
Context: discussion in https://github.com/NixOS/nixpkgs/pull/82630

Mesa has been supporting S3TC natively without requiring these libraries
since the S3TC patent expired in December 2017.
 2020-04-20 03:19:41 +02:00
Emily bfffee9364 nixos/tests/acme: set maintainers to acme team 2020-04-20 01:39:31 +01:00
Emily ef7e6eeaf4 nixos/acme: set maintainers to acme team 2020-04-20 01:39:31 +01:00
Florian Klink ab0da25762
Merge pull request #85503 from emilazy/acme-test-cleanups 
ACME test cleanups
 2020-04-19 23:57:03 +02:00
Florian Klink a88d17bc69
Merge pull request #83301 from evils/tuptime 
Tuptime: Init Package, Module and Test
 2020-04-19 23:38:53 +02:00
worldofpeace f882896cc8
Merge pull request #73934 from flokli/nixos-test-port-cockroachdb 
nixosTests.cockroachdb: port to python
 2020-04-19 16:30:45 -04:00
Yegor Timoshenko 4f7e4a6b59 nixos/release-small: drop latestKernel.login 
This partially reverts e133e396df.
 2020-04-19 22:20:07 +03:00
Yegor Timoshenko 6f1165a0cb
Merge pull request #84522 from emilazy/add-linux-hardened-patches 
linux_*_hardened: use linux-hardened patch set
 2020-04-19 20:01:35 +03:00
Michael Weiss 0e4417f118
Revert "nixos: Introduce nix.buildLocation option" 
This reverts commit 5291925fd2.
Reason: This started to cause severe regressions, see:
- https://github.com/NixOS/nixpkgs/issues/85552
- https://github.com/NixOS/nixpkgs/pull/83166#pullrequestreview-395960588
Fixes #85552.
 2020-04-19 15:16:08 +02:00
dadada 2d86cca35e
nixos/dokuwiki: change default of aclFile and usersFile 
`aclFile` and `usersFile` will be set to a default value if `aclUse` is
specified and aclFile is not overriden by `acl`.
 2020-04-18 23:37:19 +02:00
dadada 9460fb5788
nixos/dokuwiki: modify usersFile and aclFile 
Use types.str instead of types.path to exclude private information from
the derivation.
Add a warinig about the contents of acl beeing included in the nix
store.
 2020-04-18 23:37:19 +02:00
dadada 2b67a89f29
nixos/dokuwiki: dokuwiki user 2020-04-18 23:37:19 +02:00
dadada 2e699f1db1
nixos/dokuwiki: add option disableActions 2020-04-18 23:37:18 +02:00
dadada a58dc30d34
nixos/dokuwiki: set default value for usersFile 
If usersFile is not set, a file is created along the stateDir that can
hold the users and supports dynamically adding users using the web GUI.
 2020-04-18 23:37:18 +02:00
dadada 0228046eec
nixos/dokuwiki: add assertion for usersFile 2020-04-18 23:37:18 +02:00
dadada af6a7a0486
nixos/dokuwiki: add plugins and templates options 
Adds support for additional plugins and templates similarly to how
wordpress.nix does it.

Plugins and templates need to be packaged as in the example.
 2020-04-18 23:37:18 +02:00
dadada 71baf4801c
nixos/dokuwiki: refactor 2020-04-18 23:37:18 +02:00
dadada dc7ed06615
nixos/dokuwiki: add <name?> option 
Enables multi-site configurations.

This break compatibility with prior configurations that expect options
for a single dokuwiki instance in `services.dokuwiki`.
 2020-04-18 23:37:18 +02:00
Vladimír Čunát e233a9d4dd
Merge #84442: staging-next branch 2020-04-18 23:11:00 +02:00
John Ericson 1ea80c2cc3 Merge remote-tracking branch 'upstream/master' into staging 2020-04-18 15:40:49 -04:00
Jan Tojnar 09c4736405
Merge pull request #83755 from jtojnar/jcat-0.1 2020-04-18 20:38:24 +02:00
Jörg Thalheim 35eb7793a3
Merge pull request #83166 from avnik/nix-build-location 2020-04-18 18:37:15 +01:00
Alexander V. Nikolaev 5291925fd2 nixos: Introduce nix.buildLocation option 
Allow to specify where package build will happens.
It helps big packages (like browsers) not to overflow tmpfs.
 2020-04-18 20:31:04 +03:00
worldofpeace 996ae856b6
Merge pull request #85365 from immae/fix_acme_postrun 
nixos/acme: Fix postRun in acme certificate being ran at every run
 2020-04-18 13:16:16 -04:00
Alyssa Ross 1b0d8015fe nixos/rss2email: globally install rss2email 
For man pages.
 2020-04-18 14:16:00 +00:00
Pavol Rusnak fadcfc3ea4
treewide: per RFC45, remove more unquoted URLs 2020-04-18 14:04:37 +02:00
Edmund Wu 4727e95eb6
manual/rl-2009.xml: fix build (#85478) 
16a4332d60 (diff-43de86228df91216c5cfc9446cb041feL249)
 2020-04-18 07:51:06 +02:00
Vladimír Čunát d96487b9ca
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1582510
 2020-04-18 07:42:26 +02:00
Emily 21f183a3fe nixos/tests/common/acme: don't set nameservers for client 
The resolver is mainly useful for the ACME server, and acme.nix uses its
own DNS server to test DNS-01 challenges.
 2020-04-18 05:15:47 +01:00
Emily e6d5e83cf1 nixos/tests/common/acme: enable Pebble strict mode 
This lets us get early warning about any bugs or backwards-compatibility
hazards in lego.

Pebble will default to this in the future, but doesn't currently;
see https://github.com/letsencrypt/pebble/blob/v2.3.0/README.md#strict-mode.
 2020-04-18 05:15:47 +01:00
Emily 695fd78ac4 nixos/tests/acme: use CAP_NET_BIND_SERVICE 2020-04-18 05:15:47 +01:00
Emily d0f04c1623 nixos/tests/acme: use *.test domains 
Shimming out the Let's Encrypt domain name to reuse client configuration
doesn't work properly (Pebble uses different endpoint URL formats), is
recommended against by upstream,[1] and is unnecessary now that the ACME
module supports specifying an ACME server. This commit changes the tests
to use the domain name acme.test instead, and renames the letsencrypt
node to acme to reflect that it has nothing to do with the ACME server
that Let's Encrypt runs. The imports are renamed for clarity:

* nixos/tests/common/{letsencrypt => acme}/{common.nix => client}
* nixos/tests/common/{letsencrypt => acme}/{default.nix => server}

The test's other domain names are also adjusted to use *.test for
consistency (and to avoid misuse of non-reserved domain names such
as standalone.com).

[1] https://github.com/letsencrypt/pebble/issues/283#issuecomment-545123242

Co-authored-by: Yegor Timoshenko <yegortimoshenko@riseup.net>
 2020-04-18 05:15:47 +01:00
Emily 352e30df8a nixos/tests/acme: don't restrict to x86_64 
This was added in aade4e577b, but the
implementation of the ACME module has been entirely rewritten since
then, and the test seems to run fine on AArch64.
 2020-04-18 05:15:47 +01:00
John Ericson e3d50e5cb0 Merge branch 'master' of github.com:NixOS/nixpkgs into staging 2020-04-18 00:10:08 -04:00
Milan Pässler 16a4332d60 nixos/deluge: support 2.x 2020-04-18 02:00:04 +02:00
John Ericson 33c2a76c5e Merge remote-tracking branch 'upstream/master' into staging 2020-04-17 18:40:51 -04:00
Ismaël Bouya 8e88b8dce2
nixos/acme: Fix postRun in acme certificate being ran at every run 2020-04-17 22:16:50 +02:00
worldofpeace 40f3faedbd nixos/manual: 19.09 -> 20.03 2020-04-17 12:41:24 -04:00
Emily 2e31fb407e nixos/release-combined: add {,latestKernel.}hardened 
These now depend on an external patch set; add them to the release tests
to ensure that the build doesn't break silently as new kernel updates
are merged.
 2020-04-17 16:13:39 +01:00