mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Code Issues Wiki Activity
253615 commits 288 branches 124 tags 6.2 GiB
Commit graph

19204 commits

Author SHA1 Message Date
Kai Wohlfahrt d05061c5cd nixos/openldap: Pick some PR nits 2020-11-21 15:39:20 +00:00
Kai Wohlfahrt 9528faf182 nixos/openldap: Allow declarativeContents for multiple databases 2020-11-21 15:39:19 +00:00
Kai Wohlfahrt 057cb570be nixos/openldap: Add delcarativeConfig by suffix 
Adding by index could be an issue if the user wanted the data to be
added to a DB other than the first.
 2020-11-21 15:39:19 +00:00
Kai Wohlfahrt 1fde3c3561 nixos/openldap: switch to slapd.d configuration 
The old slapd.conf is deprecated. Replace with slapd.d, and use this
opportunity to write some structured settings.

Incidentally, this fixes the fact that openldap is reported up before
any checks have completed, by using forking mode.
 2020-11-21 15:39:19 +00:00
Joachim F 547d660f64
Merge pull request #104052 from TredwellGit/nixos/malloc 
nixos/malloc: fix Scudo
 2020-11-21 14:31:58 +00:00
Frederik Rietdijk f36b838e2a nixos test-driver: fix single line docstrings, fixes #104467 
Single line docstrings should have the """ on a single line according to PEP 8.
It seems support for this landed in the latest version of Black.
 2020-11-21 09:51:31 +01:00
Frederik Rietdijk 1ffd7cf0d6 Merge master into staging-next 2020-11-21 08:43:10 +01:00
Guillaume Girol 01083f116d
Merge pull request #102235 from symphorien/paperwork2 
Paperwork 2.0
 2020-11-20 21:30:08 +00:00
Graham Christensen 75d7828724
Merge pull request #98544 from Mic92/unfuck-update-user-group 
nixos/update-user-groups: Fix encoding issues + atomic writes
 2020-11-20 10:28:52 -05:00
adisbladis da3516f694
Merge pull request #104374 from adisbladis/dockertools-cross-aarch64 
dockerTools: Always cross compile for another arch in the cross example
 2020-11-20 14:57:26 +01:00
Eelco Dolstra 80097e57c9
nix: 2.3.8 -> 2.3.9 2020-11-20 13:03:04 +01:00
adisbladis b7b22c5814
dockerTools: Always cross compile for another arch in the cross example 
The example fails to build on aarch64, so lets cross build for gnu64.
 2020-11-20 12:57:58 +01:00
Frederik Rietdijk 553b7a8bf0 Merge master into staging-next 2020-11-20 08:12:06 +01:00
Jan Tojnar f6105d21e3
Merge branch 'master' into staging-next 2020-11-20 01:38:32 +01:00
Graham Christensen b339462460
nixos: release-combined: only build the amazon image for x86_64,aarch64-linux -- exclude i686 2020-11-19 19:34:23 -05:00
Graham Christensen 1115df837e
Merge pull request #104322 from grahamc/amazon-image 
nixos/release-small: add amazonImage
 2020-11-19 18:45:07 -05:00
Graham Christensen 1ef139f3b0
nixos/release-small: add amazonImage 
fixup breakage from #104193
 2020-11-19 17:45:40 -05:00
Graham Christensen 7fa7bf2fda
Merge pull request #104193 from grahamc/ec2-metadata-imdsv2 
NixOS EC2 AMI: Support IMDSv2
 2020-11-19 16:11:32 -05:00
Robert Hensing c68e739300
Merge pull request #104271 from adisbladis/dockertools-cross 
dockerTools.buildLayeredImage: Fix cross compilation
 2020-11-19 20:41:53 +01:00
Frederik Rietdijk ea7b8978ef Merge master into staging-next 2020-11-19 20:08:15 +01:00
Graham Christensen 0d87ce610e
nixos: release: add amazonImage as a channel blocker 2020-11-19 13:56:55 -05:00
Graham Christensen f2cfecdec3
nixos ami: preflight the imds token 
According to Freenode's ##AWS, the metadata server can sometimes
take a few moments to get its shoes on, and the very first boot
of a machine can see failed requests for a few moments.
 2020-11-19 13:56:44 -05:00
Graham Christensen 83ea88e03f
nixos: ec2 ami: support IMDSv2 
AWS's metadata service has two versions. Version 1 allowed plain HTTP
requests to get metadata. However, this was frequently abused when a
user could trick an AWS-hosted server in to proxying requests to the
metadata service. Since the metadata service is frequently used to
generate AWS access keys, this is pretty gnarly. Version two is
identical except it requires the caller to request a token and provide
it on each request.

Today, starting a NixOS AMI in EC2 where the metadata service is
configured to only allow v2 requests fails: the user's SSH key is not
placed, and configuration provided by the user-data is not applied.
The server is useless. This patch addresses that.

Note the dependency on curl is not a joyful one, and it expand the
initrd by 30M. However, see the added comment for more information
about why this is needed. Note the idea of using `echo` and `nc` are
laughable. Don't do that.
 2020-11-19 13:00:56 -05:00
adisbladis 11367b2db1
dockerTools: Add cross compilation test 2020-11-19 18:13:22 +01:00
Jörg Thalheim 2bf5899d6a
Merge pull request #104105 from spacefrogg/openafs-1.9 2020-11-19 14:42:17 +01:00
Robert Hensing c790ed8c4e
Merge pull request #96371 from asdf8dfafjk/fcitx_commit 
fcitx: Add test (Unicode input, table input, m17n)
 2020-11-19 11:05:36 +01:00
Silvan Mosberger 3307adf755
Merge pull request #98980 from JustinLovinger/idmapd 
nixos/nfs: add idmapd.settings option
 2020-11-18 22:46:48 +01:00
Jörg Thalheim 58bf9ed18b
nixos/telegraf: fix test 2020-11-18 21:42:01 +01:00
Jörg Thalheim 0f84e08fcd
nixos/telegraf: make example a bit more compact 2020-11-18 21:41:58 +01:00
Jörg Thalheim 69caedcc42
nixos/telegraf: null value for environmentFiles is invalid 
it's also not needed given that empty list covers all use cases.
 2020-11-18 21:41:55 +01:00
Graham Christensen 21339b41bf
nixos: openstack: have its own metadata fetcher expression 
These two APIs have diverged over time and are no longer compatible.
 2020-11-18 11:42:32 -05:00
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00
Emery Hemingway 7e25b71132 nixos: use nativeBuildInputs in make- iso9660-image and system-tarball 
The tools used to create iso9660 images and tarballs are independent of
the platform of the closure contained within.
 2020-11-18 14:05:30 +01:00
Janne Heß e5e9887e38
nixos/dbus: Add AppArmor support 2020-11-18 10:10:36 +01:00
Michael Raitza 1f323ec2b4 openafs: remove 1.6; point to openafs_1_8 2020-11-17 21:31:59 +01:00
Vladimír Čunát bdcd2d82ee
Merge #103633: kresd service: switch .listenDoH 
... to new implementation - and a couple other improvements.
 2020-11-17 20:06:55 +01:00
Vladimír Čunát e61ef63e4e
kresd service: switch .listenDoH to new implementation 
Beware: extraFeatures are not needed *for this* anymore,
but their removal may still cause a regression in some configs
(example: prefill module).
 2020-11-17 20:04:56 +01:00
Tim Steinbach 08e6c4d001
Merge pull request #104018 from NeQuissimus/xterm_update 
xterm: 353 -> 362, add test, add update script
 2020-11-17 12:15:19 -05:00
Tim Steinbach 0984125676
Merge pull request #103988 from NeQuissimus/nano_update 
nano: Update script, test
 2020-11-17 12:14:51 -05:00
TredwellGit fc6948cd47 nixos/malloc: fix Scudo 
Fixes segmentation faults.
https://github.com/NixOS/nixpkgs/issues/100799
 2020-11-17 09:11:31 -05:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
Tim Steinbach 61e56265c2
xterm: Add test 2020-11-16 22:13:13 -05:00
Tim Steinbach 0338f728c0
nano: Add test 2020-11-16 14:00:34 -05:00
Jörg Thalheim e54cd0ef25
Merge pull request #103876 from Mic92/lvm-generator-fix 
nixos/lvm2-activation-generator: fix warnings on activation
 2020-11-16 18:37:36 +01:00
Florian Klink 462c5b26c5
Merge pull request #103966 from flokli/kernel-enable-ipv6 
kernel config: explicitly enable CONFIG_IPV6
 2020-11-16 16:32:50 +01:00
Frederik Rietdijk 36b27ccf77
Merge pull request #103462 from NixOS/staging-next 
Staging next
 2020-11-16 15:23:47 +01:00
Maximilian Bosch 9fc484c373
Merge pull request #103717 from WilliButz/codimd/add-package-option 
nixos/codimd: add package option, refactor prettyJSON
 2020-11-16 13:46:17 +01:00
Florian Klink 13be37662d kernel config: explicitly enable CONFIG_IPV6 
We currently build CONFIG_IPV6=m.

This seems to be not really well-supported in mainline kernels - see
https://lore.kernel.org/netdev/20201115224509.2020651-1-flokli@flokli.de/T/#u

Compiling it as a module doesn't give too much benefit - even for people
who did explicitly set `enableIPv6` to false, the `ipv6` module was
still loaded, as soon as another module was loaded that requires it
(bridge,br_netfilter,wireguard,ip6table_mangle,sctp,…).

By compiling it in, we only loose the possibility to not add it to
`boot.kernelModules` anymore (as it's part of the kernel directly). The
space savings are negligible.

People wanting to disable IPv6 still get the appropriate sysctls and
options set (while having the kernel code loaded), nothing is really
changing here.
 2020-11-16 13:07:49 +01:00
Andreas Rammhold ad37c2c445
Merge pull request #102916 from andir/nixos-help 
nixos-help: fixup .desktop file & smaller refactoring
 2020-11-16 12:17:28 +01:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00